| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | | | UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings | Vincent Breitmoser | 2014-07-26 | 1 | -12/+9 |
| * | | | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 2 | -15/+18 |
| * | | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 3 | -0/+7 |
| |/ / |
|
| * | | forgot to move test classpath out of root project | Vincent Breitmoser | 2014-07-21 | 1 | -1/+0 |
| * | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 5 | -5/+11 |
| * | | Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-... | Dominik Schürmann | 2014-07-18 | 6 | -2/+43 |
| |\ \ |
|
| | * | | Fixed another unescaped apostrophe. | Daniel Albert | 2014-07-17 | 1 | -1/+1 |
| | * | | Fixed unescaped apostrophe | Daniel Albert | 2014-07-17 | 1 | -1/+1 |
| | * | | Added description to Setting, Changed title to suggested one | Daniel Albert | 2014-07-17 | 2 | -3/+5 |
| | * | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 51 | -1302/+866 |
| | |\ \
| |/ /
|/| | |
|
| | * | | Final Commit for #662 | Daniel Albert | 2014-07-16 | 1 | -1/+6 |
| | * | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 4 | -10/+225 |
| | |\ \ |
|
| | * | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 5 | -0/+34 |
| * | | | | Temporary program flow fixes | Dominik Schürmann | 2014-07-16 | 1 | -0/+3 |
| * | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -1/+0 |
| * | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 3 | -51/+57 |
| * | | | | New first time screen | Dominik Schürmann | 2014-07-16 | 15 | -681/+362 |
| * | | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 11 | -13/+34 |
| * | | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 9 | -22/+21 |
| * | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | signatures: a revocation reason does NOT determine if a cert is a revocation ... | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 4 | -3/+9 |
| |\| | | | |
|
| | * | | | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 4 | -3/+9 |
| * | | | | | some fixes for edit | Dominik Schürmann | 2014-07-15 | 2 | -4/+5 |
| |/ / / / |
|
| * | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 6 | -23/+380 |
| |\ \ \ \
| | |/ /
| |/| | |
|
| | * | | | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 |
| | * | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 4 | -16/+158 |
| | |\ \ \ |
|
| | | * | | | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
| | | |/ / |
|
| | | * | | Wello there, That's Java, not C^^ | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
| | | * | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 3 | -14/+15 |
| | | * | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 2 | -6/+12 |
| | | * | | Added Purging for Android < 4.1 | Daniel Albert | 2014-07-12 | 1 | -28/+51 |
| | | * | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 3 | -7/+83 |
| | | * | | new PassphraseCache, storing UserIDs as well | Daniel Albert | 2014-07-12 | 1 | -11/+47 |
| | * | | | more work on edit key | Dominik Schürmann | 2014-07-12 | 2 | -7/+222 |
| | |/ / |
|
| * | | | modifyKey: error out on integrity check fails | Vincent Breitmoser | 2014-07-12 | 2 | -10/+18 |
| * | | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 3 | -44/+66 |
| * | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 9 | -76/+296 |
| |\| | |
|
| | * | | Fix OperationResultParcel | mar-v-in | 2014-07-09 | 1 | -8/+8 |
| | * | | Fix nullpointer in API, fix #693 | Dominik Schürmann | 2014-07-08 | 1 | -1/+7 |
| | * | | cleanup | Dominik Schürmann | 2014-07-08 | 1 | -30/+0 |
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-08 | 2 | -6/+27 |
| | |\ \ |
|
| | * | | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 8 | -66/+310 |
| | | |/
| |/| |
|
| * | | | travis: get rid of lint | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 |
| * | | | modifyKey: proper expiry check during SubkeyAdd | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 |
| * | | | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 4 | -27/+64 |
| * | | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 8 | -69/+66 |
| * | | | test: get rid of some SaveKeyringParcel boilerplate | Vincent Breitmoser | 2014-07-11 | 1 | -5/+11 |
| * | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 3 | -5/+2 |
| * | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 3 | -0/+12 |
