aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Reject subkeys with no key flags and no primary key binding certificateVincent Breitmoser2014-09-281-27/+35
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-265-45/+112
|\
| * Fix bug where Keybase extraData gets lost when SKS wins the search race.Tim Bray2014-09-251-0/+10
| * Fixes for new app listDominik Schürmann2014-09-242-43/+86
| * 3.0 beta1Dominik Schürmann2014-09-242-2/+16
* | nfc: use proper hex encoding for pin lengthVincent Breitmoser2014-09-261-1/+1
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-2438-213/+948
|\
| * Pull from transifexDominik Schürmann2014-09-2438-213/+948
* | disable pull to refresh (for now)Vincent Breitmoser2014-09-241-2/+6
* | fix save button when no file is selectedVincent Breitmoser2014-09-242-0/+5
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-244-35/+155
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-241-5/+6
| |\
| * | propose apps in apps listDominik Schürmann2014-09-244-35/+155
* | | show message about saving multiple files rather than hide the buttonVincent Breitmoser2014-09-242-23/+9
* | | move more stuff into EncryptActivity superclassVincent Breitmoser2014-09-243-226/+147
* | | use correct pin for nfc in EncryptActivityVincent Breitmoser2014-09-244-3/+15
* | | allow 1024 bit key signaturesVincent Breitmoser2014-09-241-3/+2
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-242-27/+38
|\|
| * Fix logging in NFcActivityDominik Schürmann2014-09-242-27/+38
* | fix Le fields in APDUsVincent Breitmoser2014-09-241-5/+6
|/
* Fix yubikey pin lengths other than 6Vincent Breitmoser2014-09-241-1/+1
* add subtle attention seeker to decryptactivity with available clipboard dataVincent Breitmoser2014-09-243-0/+139
* Fix strings reported by yahoe.001Dominik Schürmann2014-09-242-3/+3
* Fix NfcActivity typoDominik Schürmann2014-09-241-1/+1
* Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ...Dominik Schürmann2014-09-2410-8/+951
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-245-32/+62
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-2418-200/+331
| |\
| * | fix signing in OK with yubikeysVincent Breitmoser2014-09-243-15/+37
| * | fix signatures produced by yubikeyVincent Breitmoser2014-09-241-12/+15
| * | fix nullpointer in previous swipetorefresh fixVincent Breitmoser2014-09-231-5/+9
* | | DecryptFiles: Reset state for new file decrytionDominik Schürmann2014-09-241-1/+3
| |/ |/|
* | Fix new decrypt buttonDominik Schürmann2014-09-241-3/+0
* | cleanupDominik Schürmann2014-09-241-28/+0
* | Button text for decryptDominik Schürmann2014-09-242-13/+79
* | Fix yubikey file decryptionDominik Schürmann2014-09-244-25/+17
* | Yubikey text decryption workingDominik Schürmann2014-09-245-11/+12
* | Yubikey decryptionDominik Schürmann2014-09-248-92/+50
* | DecryptFilesActivityDominik Schürmann2014-09-243-14/+21
* | Implement buttons in DecryptTextFragmentDominik Schürmann2014-09-237-68/+155
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-231-0/+3
|\|
| * missed a secondary preference initializationVincent Breitmoser2014-09-231-0/+3
* | DecryptTextActivity reworkDominik Schürmann2014-09-2310-62/+112
|/
* fix nullpointer ImportKeysListEntry (from pulltorefresh)Vincent Breitmoser2014-09-231-2/+5
* disable pull to refresh in upper right cornerVincent Breitmoser2014-09-232-1/+26
* be more precise on importresult overall errorVincent Breitmoser2014-09-232-4/+7
* take failed keys into account in importkeyresult notificationVincent Breitmoser2014-09-232-1/+16
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-2313-154/+208
* reject keys with duplicate subkeys altogetherVincent Breitmoser2014-09-233-1/+17
* add test case for duplicate keys in keyring (#870)Vincent Breitmoser2014-09-232-4/+4
* log "unspecified" flags differentlyVincent Breitmoser2014-09-223-2/+14
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 18:29:11 +0000