aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
|\ \ \
| * \ \ Merge pull request #713 from da-kid/masterDominik 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
|/ /
| * test: use random string as passphraseVincent Breitmoser2014-07-132-20/+37
| * test: add UncachedKeyringTest, stubVincent Breitmoser2014-07-131-0/+105
| * test: work on KeyringTestingHelper methodsVincent Breitmoser2014-07-131-11/+117
| * modifyKey: error out on integrity check failsVincent Breitmoser2014-07-122-10/+18
| * test: more tests for different revocation casesVincent Breitmoser2014-07-121-1/+41
| * test: add test for bad key sanity checkVincent Breitmoser2014-07-121-1/+67
| * createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-123-44/+66
| * test: add algorithm choice testsVincent Breitmoser2014-07-123-3/+77
| * Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-119-76/+296
| |\ | |/ |/|
* | Merge pull request #710 from mar-v-in/patch-1Vincent2014-07-091-8/+8
|\ \
| * | 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
| | * test: make testing optional in buildVincent Breitmoser2014-07-112-3/+3
| | * tests: set maxParallelForks = 1, maybe this fixes travis non-deterministic buildVincent Breitmoser2014-07-111-0/+6
| | * travis: try running tests separately with info outputVincent Breitmoser2014-07-111-1/+3
| | * travis: get rid of lintVincent Breitmoser2014-07-111-1/+1
| | * tests: stronger subkey revocation test including re-certificationVincent Breitmoser2014-07-111-16/+69
| | * modifyKey: proper expiry check during SubkeyAddVincent Breitmoser2014-07-111-2/+2
| | * test: stronger SubkeyCreate testsVincent Breitmoser2014-07-111-3/+39
| | * modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-114-27/+64
| | * test: add SubkeyChange testsVincent Breitmoser2014-07-111-3/+94
| | * test: onlyX vars are lists now, use them as suchVincent Breitmoser2014-07-111-12/+8
| | * (whoops)Vincent Breitmoser2014-07-111-1/+1
| | * SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-119-86/+83
| | * test: get rid of some SaveKeyringParcel boilerplateVincent Breitmoser2014-07-112-33/+21
| | * get rid of some inspection warningsVincent Breitmoser2014-07-114-11/+7
| | * modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-113-0/+12
| | * test: add more user id testsVincent Breitmoser2014-07-111-2/+85
| | * test: put more stuff in helper method for neater testsVincent Breitmoser2014-07-112-36/+36
| | * fix bug in canonicalization regarding subkey revocationVincent Breitmoser2014-07-111-1/+1
| | * test: test subkey revocationVincent Breitmoser2014-07-111-0/+35
| | * modifyKey: couple more fixes from testsVincent Breitmoser2014-07-112-4/+34
| | * some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-113-18/+67
| | * modifyKey: preserve master key flagsVincent Breitmoser2014-07-111-5/+22
| | * add come createKey stringsVincent Breitmoser2014-07-113-3/+19
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 20:15:45 +0000