Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 198 | -5145/+4618 |
|\ | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| * | ModernPGP infos | Dominik Schürmann | 2014-08-06 | 1 | -1/+1 |
| | | |||||
| * | Update changelog and about | Dominik Schürmann | 2014-08-06 | 2 | -89/+104 |
| | | |||||
| * | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 8 | -32/+32 |
| | | |||||
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 41 | -66/+64 |
| | | |||||
| * | Increase maximum custom RSA size | Dominik Schürmann | 2014-08-05 | 2 | -2/+2 |
| | | |||||
| * | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 6 | -17/+28 |
| | | |||||
| * | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 10 | -78/+102 |
| | | | | | | | | selection for adding new subkeys | ||||
| * | More work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 3 | -7/+15 |
| | | |||||
| * | Work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 5 | -86/+127 |
| | | |||||
| * | Better handling of user id revocation in UI code | Dominik Schürmann | 2014-08-05 | 4 | -19/+75 |
| | | |||||
| * | Create key: make single user id primary user id, other cleanup | Dominik Schürmann | 2014-08-05 | 3 | -6/+7 |
| | | |||||
| * | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 7 | -227/+308 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-05 | 2 | -3/+7 |
| |\ | |||||
| | * | Use size of input uris for progress bar in encrypt/decrypt | mar-v-in | 2014-08-04 | 2 | -3/+7 |
| | | | |||||
| * | | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 10 | -35/+56 |
| |/ | |||||
| * | Add license headers | Dominik Schürmann | 2014-08-04 | 19 | -0/+323 |
| | | |||||
| * | Fix nullpointer, remove unused window feature | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-08-04 | 43 | -1143/+1131 |
| | | |||||
| * | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 38 | -93/+19 |
| | | |||||
| * | More cleanup | Dominik Schürmann | 2014-08-04 | 1 | -3/+4 |
| | | |||||
| * | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 2 | -12/+24 |
| | | |||||
| * | Remove support for IO_FILE, this is no longer used and was never a good ↵ | Dominik Schürmann | 2014-08-04 | 1 | -29/+2 |
| | | | | | | | | practice, use IO_URI on Android! | ||||
| * | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 7 | -25/+98 |
| | | |||||
| * | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 4 | -30/+24 |
| | | |||||
| * | Remove old edit key stuff | Dominik Schürmann | 2014-08-04 | 6 | -1375/+0 |
| | | |||||
| * | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 14 | -561/+259 |
| | | |||||
| * | button language in encrypt | Dominik Schürmann | 2014-08-04 | 2 | -3/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-04 | 1 | -102/+0 |
| |\ | |||||
| | * | delete unused PgpConversionHelper | Vincent Breitmoser | 2014-08-04 | 1 | -102/+0 |
| | | | |||||
| * | | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 7 | -56/+59 |
| |/ | |||||
| * | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 52 | -1349/+2049 |
| |\ | | | | | | | Improve file encrypt | ||||
| | * | Minor cleanup | mar-v-in | 2014-08-02 | 4 | -3/+3 |
| | | | |||||
| | * | Fix focusing with To field | mar-v-in | 2014-08-02 | 3 | -3/+20 |
| | | | |||||
| | * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 6 | -35/+75 |
| | | | |||||
| | * | Cache input file thumbnail. | mar-v-in | 2014-08-01 | 1 | -3/+20 |
| | | | |||||
| | * | Cache contact photos to make UI more fluid | mar-v-in | 2014-08-01 | 1 | -0/+10 |
| | | | |||||
| | * | Fix first key is not used erroneously | mar-v-in | 2014-08-01 | 1 | -1/+0 |
| | | | |||||
| | * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 2 | -9/+15 |
| | |\ | |||||
| | * | | Fixes after merge | mar-v-in | 2014-08-01 | 1 | -2/+5 |
| | | | | |||||
| | * | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 25 | -206/+299 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | ||||
| | * | | | Fix string resources | mar-v-in | 2014-07-31 | 3 | -6/+7 |
| | | | | | |||||
| | * | | | Fix merge | mar-v-in | 2014-07-31 | 4 | -37/+21 |
| | | | | | |||||
| | * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 212 | -3361/+4240 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 15 | -126/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring | ||||
| | * | | | | Make DecryptFragment abstract, as it should be | mar-v-in | 2014-07-25 | 1 | -4/+2 |
| | | | | | | |||||
| | * | | | | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 11 | -578/+597 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 70 | -1927/+3537 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 36 | -346/+898 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI | ||||
| | * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 |
| | | | | | | |