aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update libDominik Schürmann2014-07-221-0/+0
* Remove support for V3 signaturesDominik Schürmann2014-07-229-162/+17
* CleanupDominik Schürmann2014-07-221-12/+7
* Add values for NFC supportDominik Schürmann2014-07-221-0/+0
* Reuse signature creation timestamp for synchronous signingDominik Schürmann2014-07-224-33/+44
* Fix testDominik Schürmann2014-07-211-2/+1
* Merge branch 'master' into yubikeyDominik Schürmann2014-07-2117-145/+319
|\
| * forgot to move test classpath out of root projectVincent Breitmoser2014-07-214-7/+15
| * Update README.mdDominik Schürmann2014-07-191-2/+2
| * Update README.mdDominik Schürmann2014-07-191-4/+1
| * 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
* | update nfc libDominik Schürmann2014-07-211-0/+0
* | NFC Yubikey: only pass through hash of message and not whole contentDominik Schürmann2014-07-217-53/+119
* | Merge branch 'master' into yubikeyDominik Schürmann2014-07-186-2/+43
|\|
| * 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
* | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 17:23:01 +0000