aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into yubikeyDominik Schürmann2014-07-1896-5/+49
|\
| * Removed OpenPGP-haskell submoduleDominik Schürmann2014-07-182-4/+1
| * Add OpenPGP-Haskell test files directlyDominik Schürmann2014-07-1895-1/+48
* | Update libDominik Schürmann2014-07-171-0/+0
* | Update libsDominik Schürmann2014-07-172-0/+0
* | FixesDominik Schürmann2014-07-177-24/+132
* | add lib dependency, update libDominik Schürmann2014-07-163-1/+2
* | Add nfc libDominik Schürmann2014-07-162-0/+3
|/
* 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
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 02:32:25 +0000