aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #1362 from open-keychain/operation-migrationDominik Schürmann2015-06-3046-2172/+2622
|\ \
| * \ Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-30140-1935/+5314
| |\ \ | |/ / |/| |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-06-303-34/+19
|\ \ \
| * | | instrument: add filesize check to text encryption testVincent Breitmoser2015-06-301-27/+6
| * | | small layout fix in EncryptTextFragmentVincent Breitmoser2015-06-301-3/+4
| * | | make timeout method in PassphraseCacheService more robust against nullpointersVincent Breitmoser2015-06-301-4/+9
* | | | Better settings workaroundsDominik Schürmann2015-06-303-5/+134
|/ / /
* | | Cleanup preference codeDominik Schürmann2015-06-301-41/+3
* | | instrument: add test for empty clipboard, fix empty clipboard errorVincent Breitmoser2015-06-302-2/+19
* | | earlier error on empty clipboardVincent Breitmoser2015-06-302-3/+20
* | | fail more gracefully on empty clipboard in DecryptActivityVincent Breitmoser2015-06-301-0/+7
* | | Revert "Disable YubiKey key creation for release"Dominik Schürmann2015-06-301-14/+5
* | | Version 3.3Dominik Schürmann2015-06-301-2/+2
* | | Update from transifexDominik Schürmann2015-06-30100-1517/+4347
* | | Update changelog for 3.3Dominik Schürmann2015-06-301-0/+7
* | | Disable YubiKey key creation for releaseDominik Schürmann2015-06-301-5/+14
* | | Use proper length and mod time for cleartext signature metadataDominik Schürmann2015-06-291-2/+2
* | | Return metadata for cleartext sigsDominik Schürmann2015-06-291-0/+7
* | | Connect YubiKey URL to OpenKeychainDominik Schürmann2015-06-293-15/+35
* | | Create key wizard for blank YubiKeyDominik Schürmann2015-06-2919-74/+313
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-06-296-169/+255
|\ \
| * | instrument: add tests for adv key share fragmentVincent Breitmoser2015-06-293-2/+134
| * | cleanup share fragment, fix sharing of fingerprintVincent Breitmoser2015-06-293-167/+121
* | | Update support libsDominik Schürmann2015-06-291-6/+8
|/ /
* | Remove html element in help_aboutDominik Schürmann2015-06-291-1/+1
* | Force db upgrade on app startDominik Schürmann2015-06-291-2/+9
* | Use signature-level signature for TemporaryStorageProvider and describe the s...Dominik Schürmann2015-06-292-18/+50
* | Add brackets in KeychainProviderDominik Schürmann2015-06-291-30/+43
* | Use application/octet-stream as default type in TemporaryStorageProviderDominik Schürmann2015-06-291-1/+1
* | Guess mime type like support libs FileProviderDominik Schürmann2015-06-291-7/+1
* | Fix strings for transifexDominik Schürmann2015-06-291-2/+2
| * made CryptoOperationFragment implement OperationHelper.CallbackAdithya Abraham Philip2015-06-3011-59/+33
| * changed to work with multi-decryptAdithya Abraham Philip2015-06-2716-228/+99
| * split import and export opsAdithya Abraham Philip2015-06-2710-396/+396
| * fixed package importAdithya Abraham Philip2015-06-272-3/+2
| * renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-275-13/+13
| * removed debug logs, added licensesAdithya Abraham Philip2015-06-2713-19/+191
| * fixed Certify opAdithya Abraham Philip2015-06-273-4/+4
| * deleted KeychainServiceAdithya Abraham Philip2015-06-2719-262/+236
| * migrated Keybase verificationAdithya Abraham Philip2015-06-279-285/+403
| * migrated consolidationAdithya Abraham Philip2015-06-276-115/+142
| * fixed promote key testsAdithya Abraham Philip2015-06-271-0/+5
| * migrated promote op to KeychainNewServiceAdithya Abraham Philip2015-06-275-70/+80
| * migrated delete op to KeychainNewServiceAdithya Abraham Philip2015-06-276-70/+131
| * migrated key creation to KeychainNewServiceAdithya Abraham Philip2015-06-273-92/+52
| * added export and upload to KeychainNewServiceAdithya Abraham Philip2015-06-279-225/+263
| * allow progress message to be set laterAdithya Abraham Philip2015-06-273-47/+17
| * made EmailKeyHelper work with CryptoOperationHelperAdithya Abraham Philip2015-06-271-24/+29
| * migrated import to KeychainNewServiceAdithya Abraham Philip2015-06-275-248/+218
| * introduced OpHelper for import in DecryptFragmentAdithya Abraham Philip2015-06-271-40/+44