Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-24 | 38 | -213/+948 |
|\ | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-09-24 | 38 | -213/+948 |
* | | disable pull to refresh (for now) | Vincent Breitmoser | 2014-09-24 | 1 | -2/+6 |
* | | fix save button when no file is selected | Vincent Breitmoser | 2014-09-24 | 2 | -0/+5 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-24 | 5 | -35/+166 |
|\ | |||||
| * | Changelog | Dominik Schürmann | 2014-09-24 | 1 | -0/+11 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-24 | 1 | -5/+6 |
| |\ | |||||
| * | | propose apps in apps list | Dominik Schürmann | 2014-09-24 | 4 | -35/+155 |
* | | | show message about saving multiple files rather than hide the button | Vincent Breitmoser | 2014-09-24 | 2 | -23/+9 |
* | | | move more stuff into EncryptActivity superclass | Vincent Breitmoser | 2014-09-24 | 3 | -226/+147 |
* | | | use correct pin for nfc in EncryptActivity | Vincent Breitmoser | 2014-09-24 | 4 | -3/+15 |
* | | | allow 1024 bit key signatures | Vincent Breitmoser | 2014-09-24 | 1 | -3/+2 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-24 | 3 | -27/+38 |
|\| | |||||
| * | Fix logging in NFcActivity | Dominik Schürmann | 2014-09-24 | 2 | -27/+38 |
| * | Update safeslinger lib | Dominik Schürmann | 2014-09-24 | 1 | -0/+0 |
* | | fix Le fields in APDUs | Vincent Breitmoser | 2014-09-24 | 1 | -5/+6 |
|/ | |||||
* | Fix yubikey pin lengths other than 6 | Vincent Breitmoser | 2014-09-24 | 1 | -1/+1 |
* | add subtle attention seeker to decryptactivity with available clipboard data | Vincent Breitmoser | 2014-09-24 | 3 | -0/+139 |
* | Fix strings reported by yahoe.001 | Dominik Schürmann | 2014-09-24 | 3 | -4/+4 |
* | Fix NfcActivity typo | Dominik Schürmann | 2014-09-24 | 1 | -1/+1 |
* | Removed submodule openpgp-card-nfc-lib | Dominik Schürmann | 2014-09-24 | 1 | -0/+0 |
* | Removed submodule openpgp-card-nfc-lib | Dominik Schürmann | 2014-09-24 | 1 | -3/+0 |
* | Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ... | Dominik Schürmann | 2014-09-24 | 12 | -9/+951 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-24 | 5 | -32/+62 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-24 | 18 | -200/+331 |
| |\ | |||||
| * | | fix signing in OK with yubikeys | Vincent Breitmoser | 2014-09-24 | 3 | -15/+37 |
| * | | fix signatures produced by yubikey | Vincent Breitmoser | 2014-09-24 | 1 | -12/+15 |
| * | | fix nullpointer in previous swipetorefresh fix | Vincent Breitmoser | 2014-09-23 | 1 | -5/+9 |
* | | | DecryptFiles: Reset state for new file decrytion | Dominik Schürmann | 2014-09-24 | 1 | -1/+3 |
| |/ |/| | |||||
* | | Fix new decrypt button | Dominik Schürmann | 2014-09-24 | 1 | -3/+0 |
* | | cleanup | Dominik Schürmann | 2014-09-24 | 1 | -28/+0 |
* | | Button text for decrypt | Dominik Schürmann | 2014-09-24 | 2 | -13/+79 |
* | | Fix yubikey file decryption | Dominik Schürmann | 2014-09-24 | 4 | -25/+17 |
* | | Yubikey text decryption working | Dominik Schürmann | 2014-09-24 | 5 | -11/+12 |
* | | Yubikey decryption | Dominik Schürmann | 2014-09-24 | 8 | -92/+50 |
* | | DecryptFilesActivity | Dominik Schürmann | 2014-09-24 | 3 | -14/+21 |
* | | Implement buttons in DecryptTextFragment | Dominik Schürmann | 2014-09-23 | 7 | -68/+155 |
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-23 | 1 | -0/+3 |
|\| | |||||
| * | missed a secondary preference initialization | Vincent Breitmoser | 2014-09-23 | 1 | -0/+3 |
* | | DecryptTextActivity rework | Dominik Schürmann | 2014-09-23 | 10 | -62/+112 |
|/ | |||||
* | fix nullpointer ImportKeysListEntry (from pulltorefresh) | Vincent Breitmoser | 2014-09-23 | 1 | -2/+5 |
* | disable pull to refresh in upper right corner | Vincent Breitmoser | 2014-09-23 | 2 | -1/+26 |
* | be more precise on importresult overall error | Vincent Breitmoser | 2014-09-23 | 2 | -4/+7 |
* | take failed keys into account in importkeyresult notification | Vincent Breitmoser | 2014-09-23 | 2 | -1/+16 |
* | fix test case for new PassphraeCacheInterface | Vincent Breitmoser | 2014-09-23 | 1 | -2/+11 |
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 13 | -154/+208 |
* | add test case to make sure s2k IVs are different per subkey | Vincent Breitmoser | 2014-09-23 | 1 | -0/+19 |
* | reject keys with duplicate subkeys altogether | Vincent Breitmoser | 2014-09-23 | 3 | -1/+17 |
* | add test case for duplicate keys in keyring (#870) | Vincent Breitmoser | 2014-09-23 | 3 | -4/+75 |
* | log "unspecified" flags differently | Vincent Breitmoser | 2014-09-22 | 3 | -2/+14 |