aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-2824-178/+501
|\
| * add ecc supportVincent Breitmoser2014-08-2422-153/+494
| * Add ECDH and ECDSA valuesDominik Schürmann2014-08-212-0/+6
| * Fixing build with Spongy Castle 1.51Dominik Schürmann2014-08-212-30/+5
* | Fix NullPointerException in ImportKeysActivityDominik Schürmann2014-08-281-1/+3
* | Fix RuntimeException in KeyListActivity on tabletsDominik Schürmann2014-08-286-53/+47
* | v2.8Dominik Schürmann2014-08-271-2/+2
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-278-23/+25
|\ \
| * | small language fixes for previous commitVincent Breitmoser2014-08-278-24/+25
* | | Strip out duplicate user idsDominik Schürmann2014-08-277-8/+20
|/ /
* | Abort import of pubkeys where secret keys exist but new pubkey has more subke...Dominik Schürmann2014-08-273-9/+34
* | Cleanup FoldableLinearLayoutDominik Schürmann2014-08-275-18/+9
* | API: Fix re-seletion of keys on default accountDominik Schürmann2014-08-232-9/+16
* | Pull from transifexDominik Schürmann2014-08-2219-13/+100
* | v2.8 beta4Dominik Schürmann2014-08-221-2/+2
* | Fix contact syncDominik Schürmann2014-08-221-5/+5
* | Revert "No need for setSyncAutomatically, this is only for network tickles"Dominik Schürmann2014-08-221-0/+1
* | Add info about device with intent chooser bugDominik Schürmann2014-08-211-1/+1
|/
* 2.8 beta3Dominik Schürmann2014-08-211-2/+2
* Disable custom intent chooserDominik Schürmann2014-08-211-53/+54
* 2.8 beta2Dominik Schürmann2014-08-211-2/+2
* Fix nullpointer when revoking keysDominik Schürmann2014-08-211-1/+2
* Add account only on jelly bean and aboveDominik Schürmann2014-08-212-8/+15
* No need for setSyncAutomatically, this is only for network ticklesDominik Schürmann2014-08-211-3/+5
* Add sync propertiesDominik Schürmann2014-08-212-2/+7
* Change account typeDominik Schürmann2014-08-216-9/+12
* XML cleanupDominik Schürmann2014-08-217-79/+11
* v2.8 beta1Dominik Schürmann2014-08-211-2/+2
* Pull from transifexDominik Schürmann2014-08-216-42/+22
* cleanupDominik Schürmann2014-08-211-71/+0
* Fix result handling in account settingsDominik Schürmann2014-08-212-16/+13
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-215-41/+70
|\
| * Comment extra in requestSyncDominik Schürmann2014-08-201-0/+1
| * Sync in KeychainIntentService on delete, import, saveDominik Schürmann2014-08-202-0/+21
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-208-51/+133
| |\
| * | Enable sync adapter, changelogDominik Schürmann2014-08-203-2/+8
| * | Disable key import in sync adapterDominik Schürmann2014-08-201-38/+39
| * | improve certs_textDominik Schürmann2014-08-201-1/+1
* | | Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-2131-2/+31
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-204-13/+8
|\|
| * Upload key workingDominik Schürmann2014-08-204-13/+8
* | small change to make android studio recognize a honeycomb-only blockVincent Breitmoser2014-08-201-2/+4
* | move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-204-40/+104
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-207-33/+49
|\|
| * Upload key workingDominik Schürmann2014-08-201-0/+3
| * Fix key sharingDominik Schürmann2014-08-201-3/+1
| * Work on upload keyDominik Schürmann2014-08-201-14/+24
| * Notify duration, cleanupDominik Schürmann2014-08-202-9/+4
| * Fix nullpointer in first time activityDominik Schürmann2014-08-201-1/+3
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-202-3/+3
| |\