Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add keys button goes to directly to qr scan | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 |
| | |||||
* | UI stuff | Dominik Schürmann | 2014-10-05 | 1 | -4/+9 |
| | |||||
* | New add keys activity | Dominik Schürmann | 2014-10-04 | 1 | -1/+1 |
| | |||||
* | Remove file menu items from text activity | Dominik Schürmann | 2014-09-06 | 2 | -4/+19 |
| | |||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 1 | -0/+0 |
| | |||||
* | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -0/+6 |
| | |||||
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 2 | -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 buttons | Vincent Breitmoser | 2014-07-31 | 1 | -17/+0 |
| | | |||||
| * | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -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 key | Dominik Schürmann | 2014-07-16 | 1 | -5/+0 |
| | | |||||
| * | New first time screen | Dominik Schürmann | 2014-07-16 | 1 | -0/+6 |
| | | |||||
* | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 1 | -0/+7 |
|/ | | | | | - Multi file - Reworked UI | ||||
* | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 1 | -0/+6 |
| | |||||
* | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 1 | -0/+6 |
| | |||||
* | Design fixes for certification activity | Dominik Schürmann | 2014-05-07 | 1 | -9/+0 |
| | |||||
* | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 1 | -49/+2 |
| | |||||
* | add debug backup/restore options to main menu | Vincent Breitmoser | 2014-04-14 | 1 | -0/+12 |
| | | | | Closes #543 | ||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 6 | -0/+172 |