aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ /
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 19:32:09 +0000