| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | 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 | |||||
| | * | | | | | | | | Remve cacheing of keyrings (cleanup of #726) | Dominik Schürmann | 2014-08-01 | 1 | -5/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 3 | -15/+72 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge pull request #726 from mar-v-in/fix-import-from-server | Dominik Schürmann | 2014-08-01 | 1 | -3/+14 | |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix import from server | |||||
| | | | * | | | | | | | | Undo import changes | mar-v-in | 2014-08-01 | 1 | -3/+27 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | Fix import from server | mar-v-in | 2014-08-01 | 1 | -30/+17 | |
| | | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was broken since 7bbe869c88c445b087e32a75572cf18efa2165b6 This also keeps the ACTION_IMPORT_KEYRING action stable | |||||
| | | * | | | | | | | | Fix CachedPublicKeyring | mar-v-in | 2014-08-01 | 2 | -12/+58 | |
| | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | I had this code already in my git, but it was in between the load of other things in there, just pulled it out. | |||||
| | * / | | | | | | | identity instead of credentials | Dominik Schürmann | 2014-08-01 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 3 | -23/+26 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 2 | -7/+7 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Remove runtime check to fix passphrase service | Dominik Schürmann | 2014-08-01 | 1 | -6/+0 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Use darker colors | Dominik Schürmann | 2014-08-01 | 3 | -9/+9 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Show file tab only for import of existing keys | Dominik Schürmann | 2014-08-01 | 1 | -15/+42 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 8 | -53/+92 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | lowercase all key ids from keyserver | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 7 | -51/+90 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Show revoked and expired for private keys | Dominik Schürmann | 2014-07-31 | 1 | -29/+28 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Fix update from keyserver | Dominik Schürmann | 2014-07-31 | 1 | -0/+5 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Remove private/secret key language from strings | Dominik Schürmann | 2014-07-31 | 1 | -9/+5 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fixes for upload | Dominik Schürmann | 2014-07-31 | 4 | -15/+20 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 5 | -46/+43 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | fix bug in UploadKeyActivity, minor work on uri handling | Vincent Breitmoser | 2014-07-31 | 3 | -25/+21 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | more fixes on canonicalization and progress | Vincent Breitmoser | 2014-07-31 | 2 | -21/+22 | |
| | | |/ / / / / / | ||||||
| | * / / / / / / | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 9 | -23/+52 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 5 | -47/+31 | |
| | | | | | | | | ||||||
| | * | | | | | | Add notify layouts to some activities | Dominik Schürmann | 2014-07-31 | 4 | -80/+104 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 4 | -19/+99 | |
| | |\ \ \ \ \ \ | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |