aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
...
| * added class sourcesAdithya Abraham Philip2015-07-032-1/+9
| * added licenseAdithya Abraham Philip2015-07-032-3/+66
| * added proxy/tor preferencesAdithya Abraham Philip2015-07-038-1/+750
* | In NfcOperationsActivity, show NFC errors inline, in others show as NotifyDominik Schürmann2015-07-064-96/+157
|/
* Subtle design improvements to yubikey dialogDominik Schürmann2015-07-03114-28/+61
* New NFC dialog design with indeterminate progress, do NFC stuff in backgroundDominik Schürmann2015-07-0311-96/+254
* Fix caching of empty passphrase before moving keys to cardDominik Schürmann2015-07-033-14/+24
* Better keyboard layout for PINsDominik Schürmann2015-07-021-4/+4
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-0213-19/+56
|\
| * Merge pull request #1387 from ishit/masterDominik Schürmann2015-07-0210-15/+43
| |\
| | * Change PassphraseEditAgain status icons.Ishit2015-07-0210-4/+4
| | * Fix for #1357Ishit2015-07-011-13/+41
| * | prevent deletion of last keyserver in preferenceAdithya Abraham Philip2015-07-022-3/+8
| * | correct keyserver preference retrievalAdithya Abraham Philip2015-07-022-2/+6
* | | Disable move to card from edit screenDominik Schürmann2015-07-022-39/+45
* | | Change PIN and Admin PIN after move to key operationDominik Schürmann2015-07-0213-80/+172
|/ /
* | kill lagging search threadsAdithya Abraham Philip2015-07-021-3/+10
* | fix CryptoOperationFragment infinite recursionAdithya Abraham Philip2015-07-021-1/+1
* | Remove old keyserver preference classesDominik Schürmann2015-07-012-112/+0
* | reworked keyserver preferences with recyclerviewAdithya Abraham Philip2015-07-0224-306/+917
* | Add missing fragments for YubiKey PINsDominik Schürmann2015-07-014-0/+499
* | Add create key fragments for YubiKey PINsDominik Schürmann2015-07-0110-26/+67
* | Merge logs in create keyDominik Schürmann2015-07-011-9/+9
* | Use operation helper for move to cardDominik Schürmann2015-07-011-37/+64
* | Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-30131-1895/+5138
|\ \
| * \ Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-06-302-7/+13
| |\ \
| | * | 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-301-2/+4
| * | 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
| * | Update from transifexDominik Schürmann2015-06-3099-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-2916-69/+296
| |/
| * instrument: add tests for adv key share fragmentVincent Breitmoser2015-06-291-2/+6
| * cleanup share fragment, fix sharing of fingerprintVincent Breitmoser2015-06-293-167/+121
| * 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