Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -13/+20 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | don't keep an activity reference in CreateKeyFinalFragment | Vincent Breitmoser | 2015-05-28 | 1 | -25/+19 |
| | | |||||
| * | create keys with fixed timestamp | Vincent Breitmoser | 2015-05-28 | 1 | -6/+8 |
| | | |||||
| * | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 2 | -0/+22 |
| | | |||||
| * | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 4 | -27/+42 |
| | | | | | | | | PgpDecryptVerify changes | ||||
| * | correctly preserve state in EncryptTextFragment | Vincent Breitmoser | 2015-05-28 | 1 | -3/+15 |
| | | |||||
| * | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-28 | 2 | -7/+38 |
| | | |||||
| * | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-28 | 3 | -15/+33 |
| | | |||||
| * | preserve state in KeySpinner, and some lint fixes | Vincent Breitmoser | 2015-05-28 | 5 | -22/+48 |
| | | |||||
| * | rewrite EncryptActivity data flow | Vincent Breitmoser | 2015-05-28 | 10 | -477/+346 |
| | | |||||
| * | fix nullpointer in encrypttextactivity. fixes #1267 | Vincent Breitmoser | 2015-05-28 | 1 | -24/+18 |
| | | |||||
| * | highlight currently selected item in navigation drawer | Yoshi64Bit | 2015-05-28 | 1 | -10/+19 |
| | | |||||
| * | AssertionError instead of RuntimeException | Dominik Schürmann | 2015-05-28 | 1 | -1/+1 |
| | | |||||
| * | Change convertFingerprintToHex to use RuntimeException | Dominik Schürmann | 2015-05-28 | 1 | -7/+4 |
| | | |||||
| * | Improve strings | Dominik Schürmann | 2015-05-28 | 2 | -6/+3 |
| | | |||||
| * | do nfc dispatching in MainActivity | Vincent Breitmoser | 2015-05-28 | 4 | -9/+15 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-05-21 | 1 | -13/+20 |
| |\ | |||||
| | * | add user id flags to UserAttribute self signatures | Vincent Breitmoser | 2015-05-20 | 1 | -13/+20 |
| | | | |||||
| * | | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 2 | -2/+2 |
| |/ | |||||
| * | Fix fingerprint length check in QR Code import | Dominik Schürmann | 2015-05-19 | 1 | -1/+1 |
| | | |||||
| * | Use Mode.ALPHANUMERIC for QR codes to save space | Dominik Schürmann | 2015-05-19 | 4 | -9/+24 |
| | | |||||
| * | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 2 | -13/+26 |
| | | | | | | | | Fixes #1281 | ||||
| * | open ViewKeyActivity by subkey in NfcBaseActivity | Vincent Breitmoser | 2015-05-17 | 1 | -3/+4 |
| | | |||||
| * | simplify MainActivity and fix backstack issues | Vincent Breitmoser | 2015-05-17 | 1 | -60/+33 |
| | | |||||
| * | re-parcel log in LogDisplayFragment | Vincent Breitmoser | 2015-05-17 | 1 | -6/+20 |
| | | |||||
| * | fingerprints are 20 bytes, not 40. duh. | Vincent Breitmoser | 2015-05-17 | 1 | -1/+1 |
| | | |||||
| * | load yubikey fragment after mMasterKeyId is available | Vincent Breitmoser | 2015-05-17 | 1 | -17/+33 |
| | | |||||
| * | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 6 | -9/+66 |
| | | |||||
| * | pass masterKeyId to yubikey fragment | Vincent Breitmoser | 2015-05-17 | 2 | -6/+9 |
| | | |||||
| * | allow state loss when yubikey fragment is loaded | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 |
| | | |||||
| * | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-17 | 2 | -41/+53 |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-17 | 1 | -28/+12 |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | | don't keep an activity reference in CreateKeyFinalFragment | Vincent Breitmoser | 2015-05-28 | 1 | -26/+20 |
| | | |||||
* | | create keys with fixed timestamp | Vincent Breitmoser | 2015-05-28 | 1 | -5/+7 |
| | | |||||
* | | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 2 | -0/+22 |
| | | |||||
* | | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 4 | -27/+42 |
| | | | | | | | | PgpDecryptVerify changes | ||||
* | | correctly preserve state in EncryptTextFragment | Vincent Breitmoser | 2015-05-27 | 1 | -3/+15 |
| | | |||||
* | | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-27 | 2 | -7/+38 |
| | | |||||
* | | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-27 | 3 | -15/+33 |
| | | |||||
* | | preserve state in KeySpinner, and some lint fixes | Vincent Breitmoser | 2015-05-27 | 5 | -22/+48 |
| | | |||||
* | | rewrite EncryptActivity data flow | Vincent Breitmoser | 2015-05-27 | 10 | -477/+346 |
| | | |||||
* | | fix nullpointer in encrypttextactivity. fixes #1267 | Vincent Breitmoser | 2015-05-27 | 1 | -24/+18 |
| | | |||||
* | | highlight currently selected item in navigation drawer | Yoshi64Bit | 2015-05-23 | 1 | -10/+19 |
| | | |||||
* | | AssertionError instead of RuntimeException | Dominik Schürmann | 2015-05-21 | 1 | -1/+1 |
| | | |||||
* | | Change convertFingerprintToHex to use RuntimeException | Dominik Schürmann | 2015-05-21 | 1 | -7/+4 |
| | | |||||
* | | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 2 | -2/+2 |
| | | |||||
* | | Fix fingerprint length check in QR Code import | Dominik Schürmann | 2015-05-19 | 1 | -1/+1 |
| | | |||||
* | | Use Mode.ALPHANUMERIC for QR codes to save space | Dominik Schürmann | 2015-05-19 | 4 | -9/+24 |
| | | |||||
* | | Improve strings | Dominik Schürmann | 2015-05-19 | 2 | -6/+3 |
| | | |||||
* | | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 2 | -13/+26 |
| | | | | | | | | Fixes #1281 |