| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into v/decrypt-key-lookup | Vincent Breitmoser | 2015-11-15 | 50 | -153/+348 |
|\ |
|
| * | decrypt: skip all encountered marker packets (fix #1582) | Vincent Breitmoser | 2015-11-15 | 1 | -1/+0 |
| * | decrypt: skip unavailable and unsuitable keys | Vincent Breitmoser | 2015-11-13 | 1 | -0/+2 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-08 | 2 | -0/+16 |
| |\ |
|
| | * | bench: add simple s2k benchmark (iterations for 100ms) | Vincent Breitmoser | 2015-11-04 | 1 | -2/+4 |
| | * | bench: run ops multiple times and for an average time | Vincent Breitmoser | 2015-11-04 | 1 | -0/+2 |
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 10 | -4/+20 |
| | |\ |
|
| | * | | bench: simple working benchmark | Vincent Breitmoser | 2015-11-04 | 1 | -0/+5 |
| | * | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 2 | -0/+7 |
| * | | | Cleanup settings activity | Dominik Schürmann | 2015-11-08 | 1 | -10/+0 |
| | |/
| |/| |
|
| * | | Support for Android 6 ACTION_PROCESS_TEXT | Dominik Schürmann | 2015-11-02 | 8 | -0/+9 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-02 | 2 | -2/+30 |
| |\| |
|
| | * | keylist: add "search for query" button to empty view | Vincent Breitmoser | 2015-11-02 | 2 | -2/+30 |
| * | | Fix API 23 regression for activities without layout, see http://stackoverflow... | Dominik Schürmann | 2015-11-02 | 2 | -4/+11 |
| |/ |
|
| * | use Proxy.NO_PROXY instead of null value for no proxy | Vincent Breitmoser | 2015-10-29 | 1 | -1/+1 |
| * | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 2 | -8/+15 |
| * | Target SDK 23 and related fixes | Dominik Schürmann | 2015-10-26 | 1 | -0/+3 |
| * | Update android-patternview, materialtabstrip, floatingactionbutton | Dominik Schürmann | 2015-10-26 | 1 | -1/+1 |
| * | Update zxing-android-embedded with new custom activity | Dominik Schürmann | 2015-10-26 | 1 | -0/+13 |
| * | Pull from transifex | Dominik Schürmann | 2015-10-26 | 33 | -127/+248 |
| * | https everywhere | Dominik Schürmann | 2015-10-25 | 1 | -4/+4 |
* | | decryptlist: re-decrypt after key lookup | Vincent Breitmoser | 2015-10-23 | 1 | -0/+2 |
* | | decryptlist: implement key lookup (wip) | Vincent Breitmoser | 2015-10-23 | 1 | -13/+40 |
|/ |
|
* | inputdataoperation: guess filetype from filename for generic application/ mim... | Vincent Breitmoser | 2015-10-23 | 1 | -0/+1 |
* | More space for backup code | Dominik Schürmann | 2015-10-22 | 1 | -11/+10 |
* | Sync changelog with transifex | Dominik Schürmann | 2015-10-22 | 19 | -0/+228 |
* | Version 3.6, Changelog 3.6 | Dominik Schürmann | 2015-10-22 | 1 | -0/+12 |
* | Remove unnecessary line in keybase fragment | Dominik Schürmann | 2015-10-21 | 1 | -5/+0 |
* | Fix keybase verification | Dominik Schürmann | 2015-10-21 | 2 | -10/+0 |
* | Update from transifex | Dominik Schürmann | 2015-10-21 | 26 | -1544/+1310 |
* | encrypttext: localization, and truncate overlong input | Vincent Breitmoser | 2015-10-21 | 1 | -1/+3 |
* | displaytextactivity: truncate displayed text if too long | Vincent Breitmoser | 2015-10-21 | 1 | -0/+2 |
* | linked: fix colors for dark theme | Vincent Breitmoser | 2015-10-21 | 5 | -5/+5 |
* | re-add accidentally deleted string | Vincent Breitmoser | 2015-10-21 | 1 | -0/+1 |
* | UI preparations for yubikey reset | Dominik Schürmann | 2015-10-16 | 3 | -129/+180 |
* | Remove default PIN setting | Dominik Schürmann | 2015-10-16 | 2 | -10/+1 |
* | nfc dialog: button placeholder to retain size | Dominik Schürmann | 2015-10-16 | 1 | -2/+24 |
* | Prevent nfc dialog from closing when touching outside of it, add cancel button | Dominik Schürmann | 2015-10-16 | 2 | -1/+11 |
* | Allow choosing of YubiKey PIN | Dominik Schürmann | 2015-10-16 | 3 | -126/+34 |
* | Layout for backup code input | Dominik Schürmann | 2015-10-15 | 1 | -0/+152 |
* | Renaming export strings to backup | Dominik Schürmann | 2015-10-15 | 13 | -116/+116 |
* | Check if backup code in passphrase dialog | Dominik Schürmann | 2015-10-15 | 1 | -0/+1 |
* | Support backupVersion ASCII Armor header | Dominik Schürmann | 2015-10-15 | 1 | -0/+1 |
* | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 2 | -19/+2 |
* | Add restore to backup fragment, cleanup, renamings | Dominik Schürmann | 2015-10-15 | 3 | -0/+23 |
* | Layout consistency for backup fragment | Dominik Schürmann | 2015-10-15 | 4 | -435/+373 |
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 23 | -46/+45 |
|\ |
|
| * | pgpsignencrypt: unsupported parameter combinations are a bug | Vincent Breitmoser | 2015-10-08 | 1 | -1/+0 |
| * | pgpdecryptverify: refactor signature verification state into SignatureChecker... | Vincent Breitmoser | 2015-10-08 | 1 | -1/+0 |
| * | pgpdecryptverify: fix one pass signature check, actually use bracketed structure | Vincent Breitmoser | 2015-10-07 | 1 | -2/+4 |