Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -6/+7 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | ||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 1 | -10/+11 |
| | | |||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -11/+1 |
|/ | |||||
* | minor code style correction | Adithya Abraham Philip | 2015-03-07 | 1 | -1/+7 |
| | |||||
* | cleaned up code | Adithya Abraham Philip | 2015-03-06 | 1 | -9/+1 |
| | |||||
* | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 1 | -5/+3 |
| | |||||
* | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 1 | -2/+8 |
| | |||||
* | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 1 | -1/+0 |
| | |||||
* | fix hideKeyboard() in other activities as well, just to be safe | Vincent Breitmoser | 2014-10-02 | 1 | -0/+3 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+0 |
| | |||||
* | Open keyboard on passphrase dialog, this should now work on all Android ↵ | Dominik Schürmann | 2014-07-27 | 1 | -6/+40 |
| | | | | versions... hopefully | ||||
* | fix no passphrase check | Dominik Schürmann | 2014-07-03 | 1 | -1/+3 |
| | |||||
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 1 | -19/+46 |
| | |||||
* | ui: purplize dialog headers (huge hack inside) | Vincent Breitmoser | 2014-05-08 | 1 | -2/+2 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 1 | -0/+1 |
| | |||||
* | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 1 | -1/+1 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+186 |