aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Prepare API for OpenPgpSignatureResult extensionsDominik Schürmann2014-08-315-12/+20
* Version 2.9Dominik Schürmann2014-08-311-2/+2
* Changelog 2.9Dominik Schürmann2014-08-313-1/+12
* prevent nullpointer in ImportKeysServerFragment, return empty lists instead o...Dominik Schürmann2014-08-311-2/+2
* Cleanup keyspinner layout, key id typeface monospaceDominik Schürmann2014-08-312-42/+45
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-3121-127/+259
|\
| * add cancel prevention mechanism, improve cancellation for key importVincent Breitmoser2014-08-315-21/+67
| * don't make our service stickyVincent Breitmoser2014-08-311-1/+1
| * add cancel support to edit key actionVincent Breitmoser2014-08-3113-33/+92
| * get rid of some last bootstrapbutton referencesVincent Breitmoser2014-08-312-3/+1
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-08-312-8/+15
| |\
| * | Add cancelable mechanism and support in key importVincent Breitmoser2014-08-319-90/+119
* | | Better leyout for account settingsDominik Schürmann2014-08-316-94/+112
* | | Move date picker to left because of width constraints inside the dialogDominik Schürmann2014-08-311-6/+1
| |/ |/|
* | Hide keyserver spinner under advanced options in certify activityDominik Schürmann2014-08-312-8/+15
|/
* remember "show advanced tabs" settingVincent Breitmoser2014-08-313-4/+18
* if there is only one private key, use it fo certification by defaultVincent Breitmoser2014-08-314-28/+37
* use LoaderFragment for CertifyActivityVincent Breitmoser2014-08-317-554/+630
* ditch NullProgressableVincent Breitmoser2014-08-304-40/+8
* fix one log levelVincent Breitmoser2014-08-301-1/+1
* get rid of a deprecated method useVincent Breitmoser2014-08-301-1/+2
* Merge remote-tracking branch 'dakid/master'Vincent Breitmoser2014-08-301-1/+1
|\
| * Encrypted message is not being spellchecked anymoreDaniel Albert2014-08-301-1/+1
* | canonicalize: add check for algorithm typeVincent Breitmoser2014-08-308-16/+50
|/
* show bitsizes in import key list againVincent Breitmoser2014-08-301-4/+4
* Update TokenAutoCompleteDominik Schürmann2014-08-291-0/+0
* Fix possible nullpointer in PreferencesDominik Schürmann2014-08-291-0/+3
* Mardown compatible changelogDominik Schürmann2014-08-281-189/+189
* Fix crash in PgpKeyHelperDominik Schürmann2014-08-281-1/+1
* Update nfc libDominik Schürmann2014-08-281-0/+0
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-28171-2095/+9423
|\
| * Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-2829-216/+531
| |\
| | * add ecc supportVincent Breitmoser2014-08-2426-191/+524
| | * update to tidy spongy-masterVincent Breitmoser2014-08-231-0/+0
| | * Add ECDH and ECDSA valuesDominik Schürmann2014-08-212-0/+6
| | * Fixing build with Spongy Castle 1.51Dominik Schürmann2014-08-213-30/+5
| | * Update spongy castle, not building...Dominik Schürmann2014-08-211-0/+0
| * | Fix NullPointerException in ImportKeysActivityDominik Schürmann2014-08-281-1/+3
| * | Fix RuntimeException in KeyListActivity on tabletsDominik Schürmann2014-08-286-53/+47
| * | Travis should use gradle wrapper scriptDominik Schürmann2014-08-281-2/+2
| * | 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
| * | Function graphicDominik Schürmann2014-08-262-0/+4042
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-231-0/+1
| |\ \
| | * | tests: fix non-deterministic testMasterModifyVincent Breitmoser2014-08-231-0/+1
| * | | API: Fix re-seletion of keys on default accountDominik Schürmann2014-08-232-9/+16
| |/ /