Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -2/+74 |
| | |||||
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Minor cleanup | mar-v-in | 2014-08-02 | 1 | -1/+0 |
| | |||||
* | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 1 | -2/+1 |
| | |||||
* | Fix string resources | mar-v-in | 2014-07-31 | 1 | -1/+1 |
| | |||||
* | Fix merge | mar-v-in | 2014-07-31 | 1 | -13/+17 |
| | |||||
* | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 1 | -10/+12 |
| | | | | | - UI fixes - refactoring | ||||
* | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 1 | -34/+272 |
| | |||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml | ||||
| * | Remove unnecessary error logs | Dominik Schürmann | 2014-07-02 | 1 | -1/+1 |
| | | |||||
* | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 1 | -9/+68 |
| | | | | | | | | | | - Multi file - Reworked UI | ||||
* | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 1 | -0/+11 |
| | | |||||
* | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -25/+4 |
|/ | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion) | ||||
* | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 1 | -14/+16 |
| | |||||
* | More code cleanup | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 |
| | |||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -2/+1 |
| | |||||
* | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 1 | -9/+10 |
| | |||||
* | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 1 | -1/+1 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+256 |