| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | | | | | fix verification of android support lib (broken in b59be903) | Vincent Breitmoser | 2015-07-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-07-14 | 16 | -37/+15 | |
| |\| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Remove unused icon | Dominik Schürmann | 2015-07-13 | 5 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Use support.v7.app.AlertDialog | Dominik Schürmann | 2015-07-13 | 10 | -37/+11 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge pull request #1438 from open-keychain/upload-error | Dominik Schürmann | 2015-07-13 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check upload response code and throw AddKeyException | |||||
| | | * | | | | | | | | | | | | | | | | check response code for upload error | Adithya Abraham Philip | 2015-07-10 | 1 | -0/+4 | |
| | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | update snackbar with new animation flow | Vincent Breitmoser | 2015-07-14 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Revert "Use snackbar lib from maven repo" | Vincent Breitmoser | 2015-07-14 | 4 | -12/+16 | |
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bfc57aefa5d9fd435e93589ea8a37c9747cb7814. Conflicts: OpenKeychain/build.gradle settings.gradle | |||||
| * | | | | | | | | | | | | | | | | Version 3.4.1 | Dominik Schürmann | 2015-07-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Tests not working anymore on travis after using new annotation parameter | Dominik Schürmann | 2015-07-09 | 14 | -57/+84 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0" This reverts commit 85a47d22f9bb1e4aaf5770c67416a5532977658e. | |||||
| * | | | | | | | | | | | | | | | | Fix strings nitpicks from transifex | Dominik Schürmann | 2015-07-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Get rid of robolectric workaround by using new annotation in robolectric 3.0 | Dominik Schürmann | 2015-07-09 | 14 | -84/+57 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Update robolectric, Workaround still needed | Dominik Schürmann | 2015-07-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 14 | -68/+44 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | run queued operations in onViewStateRestored, *after* onActivityCreated | Vincent Breitmoser | 2015-07-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | cryptoophelper: requested code must be saved between instances! | Vincent Breitmoser | 2015-07-09 | 2 | -1/+27 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | multi-decrypt: save currentInputUri state | Vincent Breitmoser | 2015-07-09 | 2 | -4/+16 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | backup: only ask for passphrase for secret keys which have one | Vincent Breitmoser | 2015-07-09 | 1 | -40/+78 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | use onResumeFragments instead of onResume for fragment initialization | Vincent Breitmoser | 2015-07-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | change wording of export dialog, remove "export secret" checkbox | Vincent Breitmoser | 2015-07-08 | 17 | -72/+53 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-07-08 | 3 | -9/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1429 from open-keychain/qr-fix | Dominik Schürmann | 2015-07-08 | 3 | -9/+14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed QR code import and serialKeyImport progress | |||||
| | | * | | | | | | | | | | | | | | | | fixed progress dialog not shown after enable orbot dialog | Adithya Abraham Philip | 2015-07-08 | 2 | -8/+11 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | fixed QR code scan and serialKeyImport progress | Adithya Abraham Philip | 2015-07-08 | 2 | -2/+4 | |
| | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | keylist: show delete as icon in multi-select | Vincent Breitmoser | 2015-07-08 | 7 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | hide keyboard before operations, too | Vincent Breitmoser | 2015-07-08 | 2 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | grey out text color of key creation date for disabled items | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | change title on backstack change in MainActivity | Vincent Breitmoser | 2015-07-08 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | hide keyboard on crypto error/success | Vincent Breitmoser | 2015-07-08 | 5 | -6/+27 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | cleanup KeyListFragment, remove export all keys | Vincent Breitmoser | 2015-07-08 | 3 | -33/+14 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Fix YubiKey import | Dominik Schürmann | 2015-07-08 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Do not ask for passphrase on delete | Dominik Schürmann | 2015-07-08 | 1 | -9/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Rudimentary backup feature | Dominik Schürmann | 2015-07-08 | 12 | -96/+288 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #1424 from open-keychain/import-proxy | Dominik Schürmann | 2015-07-08 | 9 | -67/+126 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shifted proxy logic to ImportKeysListCloudLoader | |||||
| | * | | | | | | | | | | | | | | | | shifted proxy checking to ImportKeysListCloudLoader | Adithya Abraham Philip | 2015-07-08 | 9 | -67/+126 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | multi-decrypt: add retry mechanism | Vincent Breitmoser | 2015-07-08 | 2 | -15/+63 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | multi-decrypt: add cancelled state | Vincent Breitmoser | 2015-07-08 | 2 | -2/+69 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fix symmetric passphrase caching (fixes #1401) | Vincent Breitmoser | 2015-07-08 | 5 | -16/+42 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | comment for database fix | Vincent Breitmoser | 2015-07-08 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | put encryptdecrypt overview into a scrollview | Vincent Breitmoser | 2015-07-08 | 1 | -100/+107 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Simplifications for expiry dialog | Dominik Schürmann | 2015-07-08 | 1 | -6/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-08 | 28 | -220/+357 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | apply database fix for bogus rows introduced by issue #1402 | Vincent Breitmoser | 2015-07-08 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | fix expiry check in edit key ui | Vincent Breitmoser | 2015-07-08 | 2 | -8/+17 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | no progress dialog for bind action in view key / yubikey fragment | Vincent Breitmoser | 2015-07-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | some cleanup and fix for back button in ImportKeysActivity (fixes #1372) | Vincent Breitmoser | 2015-07-08 | 7 | -30/+21 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | fix result type for divert-to-card new subkey error | Vincent Breitmoser | 2015-07-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | addition of subkeys for divert-to-card primary keys is not supported | Vincent Breitmoser | 2015-07-08 | 3 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | better handling of divert-to-card keys for subkey modifications | Vincent Breitmoser | 2015-07-08 | 5 | -35/+81 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | (missed a couple files in last commit) | Vincent Breitmoser | 2015-07-08 | 2 | -6/+10 | |
| | | | | | | | | | | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |