Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Set visibility at last | Dominik Schürmann | 2014-07-28 | 2 | -6/+6 |
| | |||||
* | Use icons in key view | Dominik Schürmann | 2014-07-28 | 5 | -43/+64 |
| | |||||
* | Use new status icons in key list | Dominik Schürmann | 2014-07-28 | 2 | -44/+29 |
| | |||||
* | Smaller status images, green test | Dominik Schürmann | 2014-07-28 | 62 | -5/+5 |
| | |||||
* | Fix resource names, add small test | Dominik Schürmann | 2014-07-28 | 77 | -7/+12 |
| | |||||
* | Add icons from ModernPGP project | Dominik Schürmann | 2014-07-28 | 172 | -0/+491 |
| | |||||
* | Fix background color of notify area | Dominik Schürmann | 2014-07-27 | 1 | -2/+0 |
| | |||||
* | cleanup left-overs | Dominik Schürmann | 2014-07-27 | 1 | -2/+0 |
| | |||||
* | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 8 | -134/+170 |
| | |||||
* | Load QR Code asynchronously and with a fade in animation | Dominik Schürmann | 2014-07-27 | 1 | -5/+41 |
| | |||||
* | Open keyboard on passphrase dialog, this should now work on all Android ↵ | Dominik Schürmann | 2014-07-27 | 4 | -44/+109 |
| | | | | versions... hopefully | ||||
* | Make PassphraseCacheService a foreground service | Dominik Schürmann | 2014-07-27 | 1 | -72/+67 |
| | |||||
* | Update gradle plugin to 0.12.2 | Dominik Schürmann | 2014-07-27 | 3 | -1/+1 |
| | |||||
* | Update spongycastle | Dominik Schürmann | 2014-07-27 | 1 | -0/+0 |
| | |||||
* | Merge pull request #720 from artbristol/skip-bc-tests-externally | Dominik Schürmann | 2014-07-27 | 1 | -0/+9 |
|\ | | | | | Skip spongycastle tests in root project | ||||
| * | Skip spongycastle tests in root project | Art O Cathain | 2014-07-27 | 1 | -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 buttons | Dominik Schürmann | 2014-07-27 | 2 | -41/+76 |
| | | |||||
* | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 11 | -107/+215 |
|/ | |||||
* | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 2 | -18/+30 |
| | |||||
* | test: add tons of tests and fuzzing for UncachedKeyRing.canonicalize | Vincent Breitmoser | 2014-07-26 | 1 | -37/+453 |
| | |||||
* | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 |
| | |||||
* | test: add misc UncachedKeyRing tests | Vincent Breitmoser | 2014-07-26 | 4 | -8/+132 |
| | |||||
* | test: small code cleanup | Vincent Breitmoser | 2014-07-26 | 1 | -14/+4 |
| | |||||
* | test: don't need commutativity parameter here after all | Vincent Breitmoser | 2014-07-26 | 1 | -18/+6 |
| | |||||
* | test: (almost) full coverage for UncachedKeyRing.merge | Vincent Breitmoser | 2014-07-26 | 2 | -17/+64 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-26 | 5 | -43/+48 |
|\ | |||||
| * | Update libs | Dominik Schürmann | 2014-07-25 | 2 | -0/+0 |
| | | |||||
| * | Program flow fixes | Dominik Schürmann | 2014-07-25 | 4 | -43/+48 |
| | | |||||
* | | UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings | Vincent Breitmoser | 2014-07-26 | 1 | -12/+9 |
| | | |||||
* | | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 3 | -15/+18 |
| | | |||||
* | | tests: add a couple of UncachedKeyRing.merge tests | Vincent Breitmoser | 2014-07-26 | 1 | -0/+375 |
| | | |||||
* | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 4 | -1/+20 |
|/ | |||||
* | forgot to move test classpath out of root project | Vincent Breitmoser | 2014-07-21 | 4 | -7/+15 |
| | |||||
* | Update README.md | Dominik Schürmann | 2014-07-19 | 1 | -2/+2 |
| | |||||
* | Update README.md | Dominik Schürmann | 2014-07-19 | 1 | -4/+1 |
| | |||||
* | Update README | Dominik Schürmann | 2014-07-19 | 1 | -4/+7 |
| | |||||
* | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 6 | -5/+11 |
| | |||||
* | test: start with UncachedKeyRing.canonicalize tests | Vincent Breitmoser | 2014-07-19 | 2 | -8/+127 |
| | |||||
* | use jacoco for test coverage | Vincent Breitmoser | 2014-07-19 | 1 | -0/+24 |
| | |||||
* | work on test prepare script, make the whole thing optional | Vincent Breitmoser | 2014-07-18 | 5 | -17/+34 |
| | |||||
* | Merge branch 'da-kid-master' | Dominik Schürmann | 2014-07-18 | 6 | -2/+43 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/da-kid/open-keychain into ↵ | Dominik Schürmann | 2014-07-18 | 6 | -2/+43 |
|/| | | | | | | | | | | | | | da-kid-master Conflicts: OpenKeychain/src/test/resources/extern/OpenPGP-Haskell | ||||
| * | Fixed gitmodules | Daniel Albert | 2014-07-17 | 1 | -2/+2 |
| | | |||||
| * | Fixed another unescaped apostrophe. | Daniel Albert | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Fixed unescaped apostrophe | Daniel Albert | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Added description to Setting, Changed title to suggested one | Daniel Albert | 2014-07-17 | 2 | -3/+5 |
| | | |||||
| * | Hopefully fixes Travis build errors | Daniel Albert | 2014-07-16 | 1 | -2/+2 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 68 | -1093/+3342 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | ||||
| * | | Final Commit for #662 | Daniel Albert | 2014-07-16 | 1 | -1/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 4 | -10/+225 |
| |\ \ |