aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2660-1462/+1696
|\
| * canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
| * generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-264-43/+48
| |\
| | * Program flow fixesDominik Schürmann2014-07-254-43/+48
| * | UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
| * | fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-262-15/+18
| * | test and fix: adding an empty user id should failVincent Breitmoser2014-07-263-0/+7
| |/
| * forgot to move test classpath out of root projectVincent Breitmoser2014-07-211-1/+0
| * canonicalize: fix for testsVincent Breitmoser2014-07-195-5/+11
| * Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-...Dominik Schürmann2014-07-186-2/+43
| |\
| | * Fixed another unescaped apostrophe.Daniel Albert2014-07-171-1/+1
| | * Fixed unescaped apostropheDaniel Albert2014-07-171-1/+1
| | * Added description to Setting, Changed title to suggested oneDaniel Albert2014-07-172-3/+5
| | * Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1651-1302/+866
| | |\ | | |/ | |/|
| | * Final Commit for #662Daniel Albert2014-07-161-1/+6
| | * Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-134-10/+225
| | |\
| | * | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-125-0/+34
| * | | Temporary program flow fixesDominik Schürmann2014-07-161-0/+3
| * | | Simple create keyDominik Schürmann2014-07-161-1/+0
| * | | Simple create keyDominik Schürmann2014-07-163-51/+57
| * | | New first time screenDominik Schürmann2014-07-1615-681/+362
| * | | Fallback if no primary user id existsDominik Schürmann2014-07-1611-13/+34
| * | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-159-22/+21
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-151-1/+1
| |\ \ \
| | * | | signatures: a revocation reason does NOT determine if a cert is a revocation ...Vincent Breitmoser2014-07-151-1/+1
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-154-3/+9
| |\| | |
| | * | | merge: different msg if nothing was mergedVincent Breitmoser2014-07-154-3/+9
| * | | | some fixes for editDominik Schürmann2014-07-152-4/+5
| |/ / /
| * | | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-156-23/+380
| |\ \ \ | | | |/ | | |/|
| | * | Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| | * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-124-16/+158
| | |\ \
| | | * | Fixed misplaced bracketDaniel Albert2014-07-121-1/+1
| | | |/
| | | * Wello there, That's Java, not C^^Daniel Albert2014-07-121-1/+1
| | | * Fixed issues discussed in #713Daniel Albert2014-07-123-14/+15
| | | * Put text into strings.xml, for internationalizationDaniel Albert2014-07-122-6/+12
| | | * Added Purging for Android < 4.1Daniel Albert2014-07-121-28/+51
| | | * Implemented Notification, no fallback yetDaniel Albert2014-07-123-7/+83
| | | * new PassphraseCache, storing UserIDs as wellDaniel Albert2014-07-121-11/+47
| | * | more work on edit keyDominik Schürmann2014-07-122-7/+222
| | |/
| * | modifyKey: error out on integrity check failsVincent Breitmoser2014-07-122-10/+18
| * | createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-123-44/+66
| * | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-119-76/+296
| |\|
| | * Fix OperationResultParcelmar-v-in2014-07-091-8/+8
| | * Fix nullpointer in API, fix #693Dominik Schürmann2014-07-081-1/+7
| | * cleanupDominik Schürmann2014-07-081-30/+0
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-082-6/+27
| | |\
| | * | Work on subkeys adapterDominik Schürmann2014-07-088-66/+310
| * | | travis: get rid of lintVincent Breitmoser2014-07-111-1/+1
| * | | modifyKey: proper expiry check during SubkeyAddVincent Breitmoser2014-07-111-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 05:53:56 +0000