aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update READMEDominik Schürmann2014-07-191-4/+7
* canonicalize: fix for testsVincent Breitmoser2014-07-196-5/+11
* test: start with UncachedKeyRing.canonicalize testsVincent Breitmoser2014-07-192-8/+127
* use jacoco for test coverageVincent Breitmoser2014-07-191-0/+24
* work on test prepare script, make the whole thing optionalVincent Breitmoser2014-07-185-17/+34
* Merge branch 'da-kid-master'Dominik Schürmann2014-07-186-2/+43
|\
| * Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-...Dominik Schürmann2014-07-186-2/+43
|/|
| * Fixed gitmodulesDaniel Albert2014-07-171-2/+2
| * 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
| * Hopefully fixes Travis build errorsDaniel Albert2014-07-161-2/+2
| * Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1668-1093/+3342
| |\
| * | 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
* | | | Removed OpenPGP-haskell submoduleDominik Schürmann2014-07-182-4/+1
* | | | Add OpenPGP-Haskell test files directlyDominik Schürmann2014-07-1895-1/+48
| |_|/ |/| |
* | | 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-1617-681/+713
* | | 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 remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-151-2/+4
| |\ \ \
| * | | | merge: different msg if nothing was mergedVincent Breitmoser2014-07-154-3/+9
* | | | | some fixes for editDominik Schürmann2014-07-152-4/+5
| |/ / / |/| | |
* | | | Update README with build instructions for buildDominik Schürmann2014-07-151-2/+4
* | | | Merge pull request #711 from open-keychain/external-testVincent2014-07-1543-327/+2507
|\| | | | |_|/ |/| |
| * | 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