aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
| * added proxy support to KeybaseLibAdithya Abraham Philip2015-07-034-14/+37
| * added proxy support to keyserver verificationAdithya Abraham Philip2015-07-031-1/+1
| * modify ImportKeysActivity to match new patternAdithya Abraham Philip2015-07-031-18/+4
| * added proxy to all import operations using KeychainServiceAdithya Abraham Philip2015-07-038-21/+122
| * added OperationResult support to upload to keyserverAdithya Abraham Philip2015-07-033-9/+23
| * orbot dialog fragments addedAdithya Abraham Philip2015-07-0311-504/+738
| * removed NetCipher submodule, copied classesAdithya Abraham Philip2015-07-033-3/+358
| * fixed Proxy generation, proxy working for for cloud importAdithya Abraham Philip2015-07-037-42/+46
| * added placeholder proxy to AddKeyServerAdithya Abraham Philip2015-07-032-7/+23
| * fixed certificate pinningAdithya Abraham Philip2015-07-032-14/+41
| * fixed prefsAdithya Abraham Philip2015-07-032-1/+13
| * added proxy support, silent right nowAdithya Abraham Philip2015-07-0315-55/+250
| * added ProxyPrefsAdithya Abraham Philip2015-07-032-3/+50
| * added NetCipher as submoduleAdithya Abraham Philip2015-07-035-439/+4
| * added proxy typeAdithya Abraham Philip2015-07-036-15/+75
| * 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
* | Exclude more files to satisfy proguardDominik Schürmann2015-07-061-0/+3
|/
* 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-0225-318/+928
* | 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-30139-1935/+5301
|\ \
| * \ 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