aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
| * introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-279-511/+778
|/
* Language: Remember instead of cachingDominik Schürmann2015-06-261-8/+8
* Merge pull request #1324 from open-keychain/v/multi-decryptVincent2015-06-2687-1625/+3819
|\
| * instrument: small fix and up to date coverage.ecVincent Breitmoser2015-06-262-3/+0
| * Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-265-15/+17
| |\ | |/ |/|
* | disable automatic accept for own uid in RemoteService, and fix some warningsVincent Breitmoser2015-06-261-15/+8
* | Merge pull request #1373 from thialfihar/feature/add-debug-app-nameDominik Schürmann2015-06-264-0/+9
|\ \
| * | Make app name reflect debug buildsThialfihar2015-06-261-0/+4
| * | Import R and BuildConfig explicitlyThialfihar2015-06-263-0/+5
|/ /
| * instrument: stash away bitmapmatcher for laterVincent Breitmoser2015-06-261-0/+63
| * Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-2623-197/+460
| |\ | |/ |/|