aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/menu
Commit message (Collapse)AuthorAgeFilesLines
* Smaller UI fixesDominik Schürmann2014-08-041-1/+1
|
* Merge branch 'master' into improve-file-moremar-v-in2014-08-012-18/+6
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| * move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-311-17/+0
| |
| * Create key: design fixesDominik Schürmann2014-07-311-1/+6
| |
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-311-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * Simple create keyDominik Schürmann2014-07-161-5/+0
| |
| * New first time screenDominik Schürmann2014-07-161-0/+6
| |
* | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+7
|/ | | | | - Multi file - Reworked UI
* Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-061-0/+6
|
* Start app menu item for registered appsDominik Schürmann2014-05-071-0/+6
|
* Design fixes for certification activityDominik Schürmann2014-05-071-9/+0
|
* New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-051-49/+2
|
* add debug backup/restore options to main menuVincent Breitmoser2014-04-141-0/+12
| | | | Closes #543
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-066-0/+172