Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | 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 | |
| | | | | | | | | ||||||
| * | | | | | | | Prettify buttons | Dominik Schürmann | 2014-07-27 | 2 | -41/+76 | |
| | | | | | | | | ||||||
| * | | | | | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 10 | -107/+215 | |
| | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 2 | -18/+30 | |
| | | | | | | | ||||||
| * | | | | | | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-26 | 4 | -43/+48 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 | 2 | -15/+18 | |
| | | | | | | | | ||||||
| * | | | | | | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 3 | -0/+7 | |
| |/ / / / / / | ||||||
* | | | | | | | Remove support for V3 signatures | Dominik Schürmann | 2014-07-22 | 9 | -162/+17 | |
| | | | | | | | ||||||
* | | | | | | | Cleanup | Dominik Schürmann | 2014-07-22 | 1 | -12/+7 | |
| | | | | | | | ||||||
* | | | | | | | Reuse signature creation timestamp for synchronous signing | Dominik Schürmann | 2014-07-22 | 3 | -33/+44 | |
| | | | | | | | ||||||
* | | | | | | | Fix test | Dominik Schürmann | 2014-07-21 | 1 | -2/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-21 | 5 | -5/+11 | |
|\| | | | | | | ||||||
| * | | | | | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 5 | -5/+11 | |
| | | | | | | | ||||||
* | | | | | | | NFC Yubikey: only pass through hash of message and not whole content | Dominik Schürmann | 2014-07-21 | 5 | -53/+119 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' into yubikey | 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 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 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 50 | -1294/+865 | |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 5 | -0/+34 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Fixes | Dominik Schürmann | 2014-07-17 | 6 | -24/+132 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Temporary program flow fixes | Dominik Schürmann | 2014-07-16 | 1 | -0/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -1/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 3 | -51/+57 | |
| | | | | | | | | ||||||
* | | | | | | | | New first time screen | Dominik Schürmann | 2014-07-16 | 15 | -681/+362 | |
| | | | | | | | | ||||||
* | | | | | | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 11 | -13/+34 | |
| | | | | | | | | ||||||
* | | | | | | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 9 | -22/+21 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | signatures: a revocation reason does NOT determine if a cert is a revocation ↵ | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type | |||||
* | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 4 | -3/+9 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 4 | -3/+9 | |
| | | | | | | | | | ||||||
* | | | | | | | | | some fixes for edit | Dominik Schürmann | 2014-07-15 | 2 | -4/+5 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 6 | -23/+380 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | | | | | | | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 4 | -16/+158 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Wello there, That's Java, not C^^ | Daniel Albert | 2014-07-12 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 3 | -14/+15 | |
| | | | | | | | | ||||||
| | * | | | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 2 | -6/+12 | |
| | | | | | | | | ||||||
| | * | | | | | | Added Purging for Android < 4.1 | Daniel Albert | 2014-07-12 | 1 | -28/+51 | |
| | | | | | | | | ||||||
| | * | | | | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 3 | -7/+83 | |
| | | | | | | | | ||||||
| | * | | | | | | new PassphraseCache, storing UserIDs as well | Daniel Albert | 2014-07-12 | 1 | -11/+47 | |
| | | | | | | | | ||||||
| * | | | | | | | more work on edit key | Dominik Schürmann | 2014-07-12 | 2 | -7/+222 | |
| |/ / / / / / |