Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Remove old keyserver preference classes | Dominik Schürmann | 2015-07-01 | 2 | -112/+0 | |
| | | ||||||
* | | reworked keyserver preferences with recyclerview | Adithya Abraham Philip | 2015-07-02 | 9 | -217/+806 | |
| | | ||||||
* | | Add missing fragments for YubiKey PINs | Dominik Schürmann | 2015-07-01 | 2 | -0/+280 | |
| | | ||||||
* | | Add create key fragments for YubiKey PINs | Dominik Schürmann | 2015-07-01 | 7 | -23/+60 | |
| | | ||||||
* | | Merge logs in create key | Dominik Schürmann | 2015-07-01 | 1 | -9/+9 | |
| | | ||||||
* | | Use operation helper for move to card | Dominik Schürmann | 2015-07-01 | 1 | -37/+64 | |
| | | ||||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Adithya Abraham Philip | 2015-06-30 | 13 | -286/+425 | |
|\ \ | ||||||
| * | | Better settings workarounds | Dominik Schürmann | 2015-06-30 | 1 | -3/+4 | |
| | | | ||||||
| * | | Cleanup preference code | Dominik Schürmann | 2015-06-30 | 1 | -41/+3 | |
| | | | ||||||
| * | | instrument: add test for empty clipboard, fix empty clipboard error | Vincent Breitmoser | 2015-06-30 | 1 | -2/+4 | |
| | | | ||||||
| * | | earlier error on empty clipboard | Vincent Breitmoser | 2015-06-30 | 1 | -3/+19 | |
| | | | ||||||
| * | | fail more gracefully on empty clipboard in DecryptActivity | Vincent Breitmoser | 2015-06-30 | 1 | -0/+7 | |
| | | | ||||||
| * | | Revert "Disable YubiKey key creation for release" | Dominik Schürmann | 2015-06-30 | 1 | -14/+5 | |
| | | | | | | | | | | | | This reverts commit 340f2e442a93e4b3ab2c223fc4ab679f09f75ecd. | |||||
| * | | Disable YubiKey key creation for release | Dominik Schürmann | 2015-06-30 | 1 | -5/+14 | |
| | | | ||||||
| * | | Connect YubiKey URL to OpenKeychain | Dominik Schürmann | 2015-06-29 | 2 | -6/+26 | |
| | | | ||||||
| * | | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 8 | -50/+202 | |
| |/ | ||||||
| * | cleanup share fragment, fix sharing of fingerprint | Vincent Breitmoser | 2015-06-29 | 2 | -166/+120 | |
| | | ||||||
* | | made CryptoOperationFragment implement OperationHelper.Callback | Adithya Abraham Philip | 2015-06-30 | 11 | -59/+33 | |
| | | ||||||
* | | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 15 | -228/+94 | |
| | | ||||||
* | | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+3 | |
| | | ||||||
* | | fixed package import | Adithya Abraham Philip | 2015-06-27 | 1 | -1/+1 | |
| | | ||||||
* | | renamed KeychainNewService to KeychainService | Adithya Abraham Philip | 2015-06-27 | 3 | -10/+10 | |
| | | ||||||
* | | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 3 | -9/+7 | |
| | | ||||||
* | | fixed Certify op | Adithya Abraham Philip | 2015-06-27 | 2 | -2/+2 | |
| | | ||||||
* | | deleted KeychainService | Adithya Abraham Philip | 2015-06-27 | 14 | -62/+229 | |
| | | ||||||
* | | migrated Keybase verification | Adithya Abraham Philip | 2015-06-27 | 1 | -100/+125 | |
| | | ||||||
* | | migrated consolidation | Adithya Abraham Philip | 2015-06-27 | 2 | -96/+72 | |
| | | ||||||
* | | migrated promote op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -39/+19 | |
| | | ||||||
* | | migrated delete op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 2 | -43/+71 | |
| | | ||||||
* | | migrated key creation to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 2 | -71/+52 | |
| | | ||||||
* | | added export and upload to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 2 | -84/+90 | |
| | | ||||||
* | | allow progress message to be set later | Adithya Abraham Philip | 2015-06-27 | 3 | -47/+17 | |
| | | ||||||
* | | migrated import to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 5 | -248/+218 | |
| | | ||||||
* | | introduced OpHelper for import in DecryptFragment | Adithya Abraham Philip | 2015-06-27 | 1 | -40/+44 | |
| | | ||||||
* | | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 3 | -221/+404 | |
|/ | ||||||
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 2 | -2/+94 | |
|\ | ||||||
| * | use KeyAdapter for AllowedKeysListFragment | Vincent Breitmoser | 2015-06-26 | 2 | -2/+94 | |
| | | ||||||
* | | fix: save file | Vincent Breitmoser | 2015-06-23 | 1 | -5/+5 | |
| | | ||||||
* | | fix original file deletion (and instrumentation) | Vincent Breitmoser | 2015-06-23 | 1 | -6/+21 | |
| | | ||||||
* | | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 1 | -4/+17 | |
| | | ||||||
* | | implement saving of files | Vincent Breitmoser | 2015-06-23 | 1 | -2/+23 | |
| | | ||||||
* | | instrument: adapt to new decrypt file dialog, and some minor fixes | Vincent Breitmoser | 2015-06-23 | 3 | -8/+6 | |
| | | ||||||
* | | move select file logic into EncryptDecryptOverviewFragment | Vincent Breitmoser | 2015-06-22 | 3 | -195/+50 | |
| | | ||||||
* | | don't expose dataset for FileAdapter in encrypt view, small improvements to ↵ | Vincent Breitmoser | 2015-06-22 | 2 | -27/+35 | |
| | | | | | | | | error handling | |||||
* | | multi-decrypt: use indeterminate progress only | Vincent Breitmoser | 2015-06-22 | 1 | -4/+3 | |
| | | ||||||
* | | instrument: some updates to asymmetric decrypt tests | Vincent Breitmoser | 2015-06-22 | 2 | -7/+7 | |
| | | ||||||
* | | add failure state to DecryptListFragment | Vincent Breitmoser | 2015-06-22 | 1 | -56/+91 | |
| | | ||||||
* | | add extra for initial fragment in MainActivity | Vincent Breitmoser | 2015-06-22 | 1 | -6/+20 | |
| | | ||||||
* | | update keychain intents submodule (for travis) | Vincent Breitmoser | 2015-06-20 | 1 | -1/+1 | |
| | | ||||||
* | | don't show "delete original file" for non-file input uris | Vincent Breitmoser | 2015-06-20 | 1 | -6/+4 | |
| | |