| Commit message (Expand) | Author | Age | Files | Lines |
* | Add nfc lib | Dominik Schürmann | 2014-07-16 | 2 | -0/+3 |
* | 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 | 17 | -681/+713 |
* | 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 remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 1 | -2/+4 |
| |\ |
|
| * | | 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 |
| |/
|/| |
|
* | | Update README with build instructions for build | Dominik Schürmann | 2014-07-15 | 1 | -2/+4 |
* | | Merge pull request #711 from open-keychain/external-test | Vincent | 2014-07-15 | 43 | -327/+2507 |
|\| |
|
| * | 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 |
|\ \ |
|
| * \ | Merge pull request #713 from da-kid/master | 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 |
|/ / |
|
| * | test: use random string as passphrase | Vincent Breitmoser | 2014-07-13 | 2 | -20/+37 |
| * | test: add UncachedKeyringTest, stub | Vincent Breitmoser | 2014-07-13 | 1 | -0/+105 |
| * | test: work on KeyringTestingHelper methods | Vincent Breitmoser | 2014-07-13 | 1 | -11/+117 |
| * | modifyKey: error out on integrity check fails | Vincent Breitmoser | 2014-07-12 | 2 | -10/+18 |
| * | test: more tests for different revocation cases | Vincent Breitmoser | 2014-07-12 | 1 | -1/+41 |
| * | test: add test for bad key sanity check | Vincent Breitmoser | 2014-07-12 | 1 | -1/+67 |
| * | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 3 | -44/+66 |
| * | test: add algorithm choice tests | Vincent Breitmoser | 2014-07-12 | 3 | -3/+77 |
| * | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 9 | -76/+296 |
| |\
| |/
|/| |
|
* | | Merge pull request #710 from mar-v-in/patch-1 | Vincent | 2014-07-09 | 1 | -8/+8 |
|\ \ |
|
| * | | 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 |
| | * | test: make testing optional in build | Vincent Breitmoser | 2014-07-11 | 2 | -3/+3 |
| | * | tests: set maxParallelForks = 1, maybe this fixes travis non-deterministic build | Vincent Breitmoser | 2014-07-11 | 1 | -0/+6 |
| | * | travis: try running tests separately with info output | Vincent Breitmoser | 2014-07-11 | 1 | -1/+3 |
| | * | travis: get rid of lint | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 |
| | * | tests: stronger subkey revocation test including re-certification | Vincent Breitmoser | 2014-07-11 | 1 | -16/+69 |
| | * | modifyKey: proper expiry check during SubkeyAdd | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 |
| | * | test: stronger SubkeyCreate tests | Vincent Breitmoser | 2014-07-11 | 1 | -3/+39 |
| | * | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 4 | -27/+64 |