Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 3 | -3/+8 | |
| |\| | | ||||||
| | * | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 3 | -3/+8 | |
| * | | | 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 | 5 | -23/+373 | |
| |\ \ | ||||||
| * | | | 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 | 2 | -44/+61 | |
| * | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 6 | -62/+262 | |
| |\ \ \ | ||||||
| * | | | | 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 | 2 | -4/+1 | |
| * | | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 2 | -0/+11 | |
| * | | | | fix bug in canonicalization regarding subkey revocation | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| * | | | | modifyKey: couple more fixes from tests | Vincent Breitmoser | 2014-07-11 | 2 | -4/+34 | |
| * | | | | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 3 | -18/+67 | |
| * | | | | modifyKey: preserve master key flags | Vincent Breitmoser | 2014-07-11 | 1 | -5/+22 | |
| * | | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 2 | -2/+11 | |
| * | | | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 2 | -0/+5 | |
| * | | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-bads... | Vincent Breitmoser | 2014-07-09 | 8 | -830/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | actually provide a tostring | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | * | | | | prevent odd ambiguous method toString error | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | * | | | | (c) headers, tidy imports | Art O Cathain | 2014-07-07 | 6 | -7/+100 | |
| | * | | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 | |
| | * | | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| | * | | | | Actually test canonicalize | Art O Cathain | 2014-07-06 | 2 | -75/+160 | |
| | * | | | | data fixes | Art O Cathain | 2014-07-06 | 1 | -13/+14 | |
| | * | | | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 | |
| | * | | | | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 | |
| | * | | | | work in progress | Art O Cathain | 2014-07-06 | 3 | -1/+511 | |
| * | | | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 | |
| * | | | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| * | | | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 4 | -1/+530 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 | |
| | * | | | | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 | |
| | * | | | | work in progress | Art O Cathain | 2014-07-06 | 3 | -1/+511 | |
| | | |_|/ | | |/| | | ||||||
* | | | | | 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 | 3 | -8/+223 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 3 | -16/+151 | |
| |\ \ \ \ | ||||||
| | * | | | | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 | |
| * | | | | | more work on edit key | Dominik Schürmann | 2014-07-12 | 2 | -7/+222 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 3 | -0/+28 | |
| |/ / / |/| | | | ||||||
* | | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 2 | -12/+12 | |
* | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -6/+6 | |
* | | | | 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 | |
|/ / / | ||||||
* | | | 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 | |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-08 | 2 | -6/+27 | |
|\| | |