aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-151-7/+35
|\ | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * more work on edit keyDominik Schürmann2014-07-121-7/+35
| |
* | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-111-2/+51
|\| | | | | | | | | | | | | 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 adapterDominik Schürmann2014-07-081-1/+50
| |
* | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-111-11/+11
|/
* cleanup, debug for passphrase setDominik Schürmann2014-07-031-5/+4
|
* Cache passphrase for editDominik Schürmann2014-07-031-2/+2
|
* Cache passphrase for editDominik Schürmann2014-07-031-10/+13
|
* cleanupDominik Schürmann2014-07-031-0/+4
|
* edit key: subkey adapterDominik Schürmann2014-07-031-1/+1
|
* Work on editDominik Schürmann2014-07-031-4/+26
|
* fix nullpointer, cleanupDominik Schürmann2014-07-021-6/+6
|
* remove init methods from adapterDominik Schürmann2014-07-021-8/+8
|
* edit key: work on savingDominik Schürmann2014-07-021-6/+11
|
* Edit key: adding user idsDominik Schürmann2014-07-021-36/+11
|
* edit key: part 3Dominik Schürmann2014-07-011-31/+34
|
* work on edit keyDominik Schürmann2014-06-301-14/+75
|
* new edit key: first version to add user idsDominik Schürmann2014-06-241-2/+16
|
* new edit key: change passphraseDominik Schürmann2014-06-221-63/+107
|
* new edit key: diff for existing user idsDominik Schürmann2014-06-221-15/+121
|
* Rename adapterDominik Schürmann2014-06-221-9/+8
|
* Start new designed activityDominik Schürmann2014-06-211-0/+200