moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity
2,396 Commits 12 Branches 24 Tags 116 MiB
Commit Graph

2396 Commits

Author SHA1 Message Date
Dominik Schürmann 4eceb5bde1 Merge pull request #720 from artbristol/skip-bc-tests-externally 
Skip spongycastle tests in root project
 2014-07-27 18:13:02 +02:00
Dominik Schürmann 0403cbf11a Prettify buttons 2014-07-27 18:12:14 +02:00
Dominik Schürmann dab540e121 Work on first time wizard design 2014-07-27 17:56:52 +02:00
Art O Cathain 2291fef7c1 Skip spongycastle tests in root project 
This will make moving back to a pure SC/BC upstream easier since
we don't need to change their source code
 2014-07-27 15:40:22 +01:00
Vincent Breitmoser 45722d7cfb canonicalize: couple of fixes 2014-07-26 22:16:33 +02:00
Vincent Breitmoser 13bfa3b487 test: add tons of tests and fuzzing for UncachedKeyRing.canonicalize 2014-07-26 22:15:49 +02:00
Vincent Breitmoser 236a502ea7 generic UncachedKeyRing fixes 2014-07-26 15:51:35 +02:00
Vincent Breitmoser cf6e4254c7 test: add misc UncachedKeyRing tests 2014-07-26 15:51:21 +02:00
Vincent Breitmoser 1c00227c41 test: small code cleanup 2014-07-26 14:16:44 +02:00
Vincent Breitmoser d849b6d8a8 test: don't need commutativity parameter here after all 2014-07-26 04:38:30 +02:00
Vincent Breitmoser eab4c4ba8e test: (almost) full coverage for UncachedKeyRing.merge 2014-07-26 04:35:38 +02:00
Vincent Breitmoser 043ed600e6 Merge remote-tracking branch 'origin/master' 2014-07-26 03:59:12 +02:00
Vincent Breitmoser 7296ac4849 UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings 2014-07-26 03:57:54 +02:00
Vincent Breitmoser 7fe1b00080 fixes for extractPublicKeyRing, update SpongyCastle 2014-07-26 03:56:28 +02:00
Vincent Breitmoser a1c163e993 tests: add a couple of UncachedKeyRing.merge tests 2014-07-26 03:48:13 +02:00
Vincent Breitmoser ab2b90342e test and fix: adding an empty user id should fail 2014-07-26 03:47:29 +02:00
Dominik Schürmann 9ea5148550 Update libs 2014-07-25 01:34:57 +02:00
Dominik Schürmann 5eb414a22b Program flow fixes 2014-07-25 01:34:29 +02:00
Vincent Breitmoser f560bc9317 forgot to move test classpath out of root project 2014-07-21 03:59:28 +02:00
Dominik Schürmann 527c3e93f8 Update README.md 2014-07-19 15:16:45 +02:00
Dominik Schürmann 207870af1d Update README.md 2014-07-19 15:15:31 +02:00
Dominik Schürmann 8385c9c9dd Update README 2014-07-19 15:14:20 +02:00
Vincent Breitmoser cd1511a4e6 canonicalize: fix for tests 2014-07-19 02:19:15 +02:00
Vincent Breitmoser 299570f1b9 test: start with UncachedKeyRing.canonicalize tests 2014-07-19 02:12:04 +02:00
Vincent Breitmoser 19dc49153d use jacoco for test coverage 2014-07-19 01:31:34 +02:00
Vincent Breitmoser 6d9eaaabb2 work on test prepare script, make the whole thing optional 2014-07-18 19:05:38 +02:00
Dominik Schürmann 94e56a4542 Merge branch 'da-kid-master' 2014-07-18 09:49:51 +02:00
Dominik Schürmann b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master 
Conflicts:
	OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
 2014-07-18 09:49:20 +02:00
Dominik Schürmann 306bea5ee9 Removed OpenPGP-haskell submodule 2014-07-18 09:39:36 +02:00
Dominik Schürmann 3d74a9c11c Add OpenPGP-Haskell test files directly 2014-07-18 09:34:54 +02:00
Daniel Albert cc63b0e72c Fixed gitmodules 2014-07-17 22:00:24 +02:00
Daniel Albert db002bde7c Fixed another unescaped apostrophe. 2014-07-17 21:17:39 +02:00
Daniel Albert 8a8d8c5a68 Fixed unescaped apostrophe 2014-07-17 20:53:10 +02:00
Daniel Albert 01046fc0e7 Added description to Setting, Changed title to suggested one 2014-07-17 20:01:53 +02:00
Daniel Albert f15df98ab5 Hopefully fixes Travis build errors 2014-07-16 19:59:55 +02:00
Daniel Albert d63534d655 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
 2014-07-16 18:49:16 +02:00
Daniel Albert e375cde7e1 Final Commit for #662 2014-07-16 18:17:46 +02:00
Dominik Schürmann 82af9672fd Temporary program flow fixes 2014-07-16 10:07:50 +02:00
Dominik Schürmann 77d04a915b Simple create key 2014-07-16 10:05:00 +02:00
Dominik Schürmann 57f5a788fd Simple create key 2014-07-16 10:04:48 +02:00
Dominik Schürmann c1c831e52b New first time screen 2014-07-16 09:49:37 +02:00
Dominik Schürmann d3c54d5f12 Fallback if no primary user id exists 2014-07-16 00:22:45 +02:00
Vincent Breitmoser 64b87f75be move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) 2014-07-15 19:47:52 +02:00
Dominik Schürmann 848043a481 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:34:01 +02:00
Vincent Breitmoser 501d4b887a signatures: a revocation reason does NOT determine if a cert is a revocation type 2014-07-15 19:31:27 +02:00
Dominik Schürmann 503b146a14 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:22:44 +02:00
Dominik Schürmann 72237a0892 some fixes for edit 2014-07-15 19:22:40 +02:00
Vincent Breitmoser 2f35e07c9e Merge remote-tracking branch 'origin/master' into external-test 2014-07-15 19:17:43 +02:00
Vincent Breitmoser 29145e49c9 merge: different msg if nothing was merged 2014-07-15 19:17:08 +02:00
Dominik Schürmann e1d505a291 Update README with build instructions for build 2014-07-15 17:51:31 +02:00