Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | | ||||||
| * | use QueueingCryptoOperationFragment in all other places | Vincent Breitmoser | 2015-07-07 | 5 | -22/+38 | |
| | | ||||||
| * | introduce QueueingCryptoOperationFragment to queue result handling in ↵ | Vincent Breitmoser | 2015-07-07 | 5 | -13/+87 | |
| | | | | | | | | detached state | |||||
| * | try cache in certify operation (fixes #1242) | Vincent Breitmoser | 2015-07-07 | 5 | -74/+61 | |
| | | ||||||
| * | move queued action handling from prev commit into onActivityCreated | Vincent Breitmoser | 2015-07-07 | 1 | -31/+27 | |
| | | ||||||
* | | Temporary fix for multi export | Dominik Schürmann | 2015-07-08 | 2 | -24/+31 | |
| | | ||||||
* | | Clarifications in remote API code | Dominik Schürmann | 2015-07-07 | 3 | -21/+21 | |
|/ | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-07 | 1 | -37/+90 | |
|\ | ||||||
| * | handle getActivity() by queueing results in CreateKeyFinalFragment | Vincent Breitmoser | 2015-07-07 | 1 | -37/+90 | |
| | | ||||||
* | | Package cert not sig | Dominik Schürmann | 2015-07-07 | 22 | -40/+40 | |
|/ | ||||||
* | Merge pull request #1416 from open-keychain/proxy-settings | Dominik Schürmann | 2015-07-07 | 1 | -7/+22 | |
|\ | | | | | Linked normal proxy settings to normal proxy checkbox | |||||
| * | linked proxy settings to other proxy checkbox | Adithya Abraham Philip | 2015-07-07 | 1 | -7/+22 | |
|/ | ||||||
* | fix passphrase->deletion ui flow for secret keys, and disregard cache | Vincent Breitmoser | 2015-07-07 | 1 | -38/+24 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-07 | 11 | -79/+181 | |
|\ | ||||||
| * | fix some nullpointers from proxy implementation | Vincent Breitmoser | 2015-07-07 | 2 | -3/+8 | |
| | | ||||||
| * | fix handling of progress dialog creation in CryptoOperationFragment (fixes ↵ | Vincent Breitmoser | 2015-07-07 | 6 | -64/+52 | |
| | | | | | | | | #1407) | |||||
| * | tests: make sure encryption happens to all enc-capable subkeys | Vincent Breitmoser | 2015-07-07 | 3 | -12/+121 | |
| | | ||||||
* | | strings: digits instead of numbers | Dominik Schürmann | 2015-07-07 | 1 | -1/+1 | |
| | | ||||||
* | | Simplify getLineSeparator in PgpDecryptVerify | Dominik Schürmann | 2015-07-07 | 1 | -7/+1 | |
|/ | ||||||
* | Ignore lint errors in keybase lib | Dominik Schürmann | 2015-07-06 | 1 | -0/+0 | |
| | ||||||
* | Version 3.4 | Dominik Schürmann | 2015-07-06 | 1 | -2/+2 | |
| | ||||||
* | actually disable non-enabled items in keyspinner (in keyadapter) (fixes #1366) | Vincent Breitmoser | 2015-07-06 | 3 | -15/+34 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2015-07-06 | 57 | -220/+759 | |
| | ||||||
* | Changelog 3.4 | Dominik Schürmann | 2015-07-06 | 1 | -0/+5 | |
| | ||||||
* | Disable YubiKey creation | Dominik Schürmann | 2015-07-06 | 1 | -6/+15 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-06 | 1 | -2/+3 | |
|\ | ||||||
| * | also catch DecoderException in decryptverify | Vincent Breitmoser | 2015-07-06 | 1 | -2/+3 | |
| | | ||||||
* | | Better error string for too short PIN | Dominik Schürmann | 2015-07-06 | 1 | -9/+9 | |
|/ |