Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 1 | -0/+1 |
| | |||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 1 | -4/+9 |
| | | | | selection for adding new subkeys | ||||
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -12/+24 |
| | |||||
* | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -0/+10 |
| | |||||
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 1 | -13/+23 |
| | |||||
* | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 1 | -46/+81 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | ||||
| * | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 1 | -46/+81 |
|/ | |||||
* | fix nullpointer, cleanup | Dominik Schürmann | 2014-07-02 | 1 | -3/+2 |
| | |||||
* | remove init methods from adapter | Dominik Schürmann | 2014-07-02 | 1 | -51/+30 |
| | |||||
* | Rename adapter | Dominik Schürmann | 2014-06-22 | 1 | -0/+211 |