aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update spongycastleDominik Schürmann2014-07-271-0/+0
|
* Merge pull request #720 from artbristol/skip-bc-tests-externallyDominik Schürmann2014-07-271-0/+9
|\ | | | | Skip spongycastle tests in root project
| * Skip spongycastle tests in root projectArt O Cathain2014-07-271-0/+9
| | | | | | | | | | This will make moving back to a pure SC/BC upstream easier since we don't need to change their source code
* | Prettify buttonsDominik Schürmann2014-07-272-41/+76
| |
* | Work on first time wizard designDominik Schürmann2014-07-2711-107/+215
|/
* canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
|
* test: add tons of tests and fuzzing for UncachedKeyRing.canonicalizeVincent Breitmoser2014-07-261-37/+453
|
* generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
|
* test: add misc UncachedKeyRing testsVincent Breitmoser2014-07-264-8/+132
|
* test: small code cleanupVincent Breitmoser2014-07-261-14/+4
|
* test: don't need commutativity parameter here after allVincent Breitmoser2014-07-261-18/+6
|
* test: (almost) full coverage for UncachedKeyRing.mergeVincent Breitmoser2014-07-262-17/+64
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-265-43/+48
|\
| * Update libsDominik Schürmann2014-07-252-0/+0
| |
| * Program flow fixesDominik Schürmann2014-07-254-43/+48
| |
* | UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
| |
* | fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-263-15/+18
| |
* | tests: add a couple of UncachedKeyRing.merge testsVincent Breitmoser2014-07-261-0/+375
| |
* | test and fix: adding an empty user id should failVincent Breitmoser2014-07-264-1/+20
|/
* 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
|
* Merge branch 'da-kid-master'Dominik Schürmann2014-07-186-2/+43
|\
| * Merge branch 'master' of https://github.com/da-kid/open-keychain into ↵Dominik Schürmann2014-07-186-2/+43
|/| | | | | | | | | | | | | da-kid-master Conflicts: OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
| * 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
| |\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
| * | 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
| | | | | | | | | | | | | | | | type
* | | | 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
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 11:39:59 +0000