| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 | |
| | | ||||||
| * | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 3 | -1/+10 | |
| | | ||||||
| * | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 16 | -941/+1220 | |
| |\ | | | | | Improve file encrypt | |||||
| | * | Minor cleanup | mar-v-in | 2014-08-02 | 2 | -2/+1 | |
| | | | ||||||
| | * | Fix focusing with To field | mar-v-in | 2014-08-02 | 2 | -3/+18 | |
| | | | ||||||
| | * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 4 | -21/+40 | |
| | | | ||||||
| | * | Cache input file thumbnail. | mar-v-in | 2014-08-01 | 1 | -3/+20 | |
| | | | ||||||
| | * | Fix first key is not used erroneously | mar-v-in | 2014-08-01 | 1 | -1/+0 | |
| | | | ||||||
| | * | 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 | 11 | -132/+171 | |
| | |\ | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fix merge | mar-v-in | 2014-07-31 | 3 | -37/+19 | |
| | | | | ||||||
| | * | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 31 | -1706/+1688 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -86/+95 | |
| | | | | | | | | | | | | | | | | | | | | | - 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 | 7 | -557/+541 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 23 | -1314/+1608 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -98/+524 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI | |||||
| | * | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 7 | -66/+99 | |
| | | | | | | ||||||
| | * | | | | 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 | 28 | -260/+907 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -54/+461 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵ | mar-v-in | 2014-06-22 | 15 | -79/+495 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more | |||||
| | * | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 9 | -379/+162 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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) | |||||
| * | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -2/+2 | |
| | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * / | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 7 | -155/+366 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 1 | -13/+17 | |
| | | | | | | | | ||||||
| * | | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -7/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | 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 | 3 | -32/+43 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 3 | -32/+43 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Show revoked and expired for private keys | Dominik Schürmann | 2014-07-31 | 1 | -29/+28 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Fixes for upload | Dominik Schürmann | 2014-07-31 | 3 | -15/+19 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 2 | -25/+15 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | fix bug in UploadKeyActivity, minor work on uri handling | Vincent Breitmoser | 2014-07-31 | 2 | -25/+15 | |
| | | |_|_|_|_|/ | |/| | | | | | ||||||
| * / | | | | | | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 1 | -1/+7 | |
| |/ / / / / / | ||||||
| * | | | | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 3 | -22/+18 | |
| | | | | | | | ||||||
| * | | | | | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 5 | -17/+16 | |
| | | | | | | | ||||||
| * | | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ↵ | Dominik Schürmann | 2014-07-31 | 1 | -9/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | file, fix #592 | |||||
| * | | | | | | Handle result in create key | Dominik Schürmann | 2014-07-31 | 1 | -2/+7 | |
| | | | | | | | ||||||
| * | | | | | | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -2/+4 | |
| | | | | | | | ||||||
| * | | | | | | reduce memory usage while parsing multiple keyrings from a stream | Vincent Breitmoser | 2014-07-31 | 1 | -4/+6 | |
| | | | | | | | ||||||
| * | | | | | | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+0 | |
| | | | | | | | ||||||
| * | | | | | | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 4 | -18/+19 | |
| | | | | | | | ||||||
| * | | | | | | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 2 | -36/+16 | |
| | | | | | | | ||||||
| * | | | | | | More file association hacks for AndroidManifest and key import | Dominik Schürmann | 2014-07-31 | 2 | -14/+24 | |
| | | | | | | | ||||||
| * | | | | | | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 4 | -10/+14 | |
| | | | | | | | ||||||
| * | | | | | | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 2 | -7/+32 | |
| | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |