| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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 | 37 | -92/+18 | |
| | | | ||||||
| | * | 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 | 51 | -1349/+2048 | |
| | |\ | | | | | | | 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 | 211 | -3352/+4239 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 35 | -345/+897 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI | |||||
| | | * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 | |
| | | | | | | | | ||||||
| | | * | | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 12 | -152/+216 | |
| | | | | | | | | ||||||
| | | * | | | | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 5 | -0/+201 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned. | |||||
| | | * | | | | | Missing import after merge | mar-v-in | 2014-07-01 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 112 | -620/+2177 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java | |||||
| | | * \ \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 15 | -79/+576 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵ | mar-v-in | 2014-06-22 | 42 | -495/+982 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more | |||||
| | | * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 15 | -496/+291 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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) | |||||
| | * | | | | | | | | | small fix for MSG_MF_UID_ADD log entry | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 22 | -336/+647 | |
| |\| | | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 7 | -108/+192 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | fix dumb mistake in modifySecretKey | Vincent Breitmoser | 2014-08-01 | 2 | -6/+2 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | remove debug output about security providers (cleaner unit tests) | Vincent Breitmoser | 2014-08-01 | 1 | -0/+2 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 3 | -31/+35 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 2 | -97/+179 | |
| | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| | * / | | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 15 | -228/+455 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 191 | -2525/+3325 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |