aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* added proxy support, silent right nowAdithya Abraham Philip2015-07-034-8/+46
* added NetCipher as submoduleAdithya Abraham Philip2015-07-031-1/+1
* added proxy typeAdithya Abraham Philip2015-07-031-2/+20
* added proxy/tor preferencesAdithya Abraham Philip2015-07-031-1/+284
* New NFC dialog design with indeterminate progress, do NFC stuff in backgroundDominik Schürmann2015-07-036-73/+172
* Fix caching of empty passphrase before moving keys to cardDominik Schürmann2015-07-032-7/+8
* Better keyboard layout for PINsDominik Schürmann2015-07-021-4/+4
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-023-17/+49
|\
| * Merge pull request #1387 from ishit/masterDominik Schürmann2015-07-022-15/+43
| |\
| | * Change PassphraseEditAgain status icons.Ishit2015-07-022-4/+4
| | * Fix for #1357Ishit2015-07-011-13/+41
| * | prevent deletion of last keyserver in preferenceAdithya Abraham Philip2015-07-021-2/+6
| * | correct keyserver preference retrievalAdithya Abraham Philip2015-07-021-1/+1
* | | 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-027-47/+73
|/ /
* | 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-029-217/+806
* | Add missing fragments for YubiKey PINsDominik Schürmann2015-07-012-0/+280
* | Add create key fragments for YubiKey PINsDominik Schürmann2015-07-017-23/+60
* | 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-3013-286/+425
|\ \
| * | Better settings workaroundsDominik Schürmann2015-06-301-3/+4
| * | 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-301-3/+19
| * | 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
| * | Disable YubiKey key creation for releaseDominik Schürmann2015-06-301-5/+14
| * | Connect YubiKey URL to OpenKeychainDominik Schürmann2015-06-292-6/+26
| * | Create key wizard for blank YubiKeyDominik Schürmann2015-06-298-50/+202
| |/
| * cleanup share fragment, fix sharing of fingerprintVincent Breitmoser2015-06-292-166/+120
* | made CryptoOperationFragment implement OperationHelper.CallbackAdithya Abraham Philip2015-06-3011-59/+33
* | changed to work with multi-decryptAdithya Abraham Philip2015-06-2715-228/+94
* | split import and export opsAdithya Abraham Philip2015-06-271-2/+3
* | fixed package importAdithya Abraham Philip2015-06-271-1/+1
* | renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-273-10/+10
* | removed debug logs, added licensesAdithya Abraham Philip2015-06-273-9/+7
* | fixed Certify opAdithya Abraham Philip2015-06-272-2/+2
* | deleted KeychainServiceAdithya Abraham Philip2015-06-2714-62/+229
* | migrated Keybase verificationAdithya Abraham Philip2015-06-271-100/+125
* | migrated consolidationAdithya Abraham Philip2015-06-272-96/+72
* | migrated promote op to KeychainNewServiceAdithya Abraham Philip2015-06-271-39/+19
* | migrated delete op to KeychainNewServiceAdithya Abraham Philip2015-06-272-43/+71
* | migrated key creation to KeychainNewServiceAdithya Abraham Philip2015-06-272-71/+52
* | added export and upload to KeychainNewServiceAdithya Abraham Philip2015-06-272-84/+90
* | allow progress message to be set laterAdithya Abraham Philip2015-06-273-47/+17
* | migrated import to KeychainNewServiceAdithya Abraham Philip2015-06-275-248/+218
* | introduced OpHelper for import in DecryptFragmentAdithya Abraham Philip2015-06-271-40/+44