aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| |\ | |/ |/|
* | instrument: first couple of tests for OpenPGP APIVincent Breitmoser2015-06-263-1/+188
* | use KeyAdapter for AllowedKeysListFragmentVincent Breitmoser2015-06-264-135/+135
* | fix warnings in PassphraseCacheServiceVincent Breitmoser2015-06-261-13/+25
* | Merge pull request #1367 from open-keychain/fingerprint-mismatchDominik Schürmann2015-06-251-1/+1
|\ \
| * | fixed fingerprint mismatch issueAdithya Abraham Philip2015-06-251-1/+1
|/ /
* | Notification: follow design guidelines, fix #1313Dominik Schürmann2015-06-242-51/+37
* | New notify iconDominik Schürmann2015-06-2414-35/+40
* | Merge pull request #1360 from moparisthebest/masterDominik Schürmann2015-06-2413-5/+78
|\ \
| * | New all-white status bar icon to fix issue #1356moparisthebest2015-06-2213-5/+78
|/ /
| * fix: save fileVincent Breitmoser2015-06-231-5/+5
| * instrument: save fileVincent Breitmoser2015-06-231-2/+43
| * fix original file deletion (and instrumentation)Vincent Breitmoser2015-06-234-11/+29
| * instrument: delete file and inline preference testsVincent Breitmoser2015-06-235-50/+180
| * implement deletion of filesVincent Breitmoser2015-06-2321-28/+45
| * implement saving of filesVincent Breitmoser2015-06-233-2/+56
| * instrument: adapt to new decrypt file dialog, and some minor fixesVincent Breitmoser2015-06-236-14/+35
| * move select file logic into EncryptDecryptOverviewFragmentVincent Breitmoser2015-06-226-227/+63
| * small fix and some cleanup in ServiceProgressFragmentVincent Breitmoser2015-06-221-12/+32
| * instrument: some cleanupVincent Breitmoser2015-06-224-91/+14
| * update instrumentation coverage fileVincent Breitmoser2015-06-221-0/+0
| * instrument: test error handling in asymmetric operationsVincent Breitmoser2015-06-221-0/+45
| * don't expose dataset for FileAdapter in encrypt view, small improvements to e...Vincent Breitmoser2015-06-2220-45/+54
| * order menu items for encrypt operationsVincent Breitmoser2015-06-223-6/+18
| * multi-decrypt: use indeterminate progress onlyVincent Breitmoser2015-06-223-54/+49