aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * added proxy logging, removed test function in KeybaseLibAdithya Abraham Philip2015-07-032-1/+2
| | * code cleanupAdithya Abraham Philip2015-07-033-5/+2
| | * added proxy support to YubiKey searchAdithya Abraham Philip2015-07-031-4/+28
| | * ensuring code style is preservedAdithya Abraham Philip2015-07-0323-146/+112
| | * removed openkeychain-test from settings.gradleAdithya Abraham Philip2015-07-031-1/+0
| | * added keyserver/proxy support to certify operationAdithya Abraham Philip2015-07-033-1/+14
| | * added proxy support to KeybaseLibAdithya Abraham Philip2015-07-035-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-034-6/+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-037-439/+8
| | * 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-03115-28/+64
* 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
| * | Merge pull request #1400 from open-keychain/keyserver-preferenceDominik Schürmann2015-07-023-4/+13
| |\ \
| | * | 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
|/ /
* | Merge pull request #1399 from open-keychain/thread-cleanupDominik Schürmann2015-07-021-3/+10
|\ \
| * | kill lagging search threadsAdithya Abraham Philip2015-07-021-3/+10
|/ /
* | Merge pull request #1396 from open-keychain/fix-certifyDominik Schürmann2015-07-021-1/+1
|\ \
| * | fix CryptoOperationFragment infinite recursionAdithya Abraham Philip2015-07-021-1/+1
|/ /
* | Remove old keyserver preference classesDominik Schürmann2015-07-012-112/+0
* | Merge pull request #1395 from open-keychain/keyserver-reworkDominik Schürmann2015-07-0125-318/+928
|\ \
| * | 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