| Commit message (Expand) | Author | Age | Files | Lines |
* | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-17 | 1 | -0/+4 |
* | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 1 | -0/+11 |
|\ |
|
| * | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 1 | -8/+11 |
| * | Improved smart card error handling | Joey Castillo | 2015-06-10 | 1 | -0/+8 |
* | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 2 | -2/+2 |
|\| |
|
| * | Allow debug build besides release build | Dominik Schürmann | 2015-06-10 | 2 | -2/+2 |
* | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -1/+4 |
|\| |
|
| * | Improve FAQ entry for file manager | Dominik Schürmann | 2015-06-08 | 1 | -1/+1 |
| * | Improve FAQ entry for file manager | Dominik Schürmann | 2015-06-08 | 1 | -1/+1 |
| * | Explicit mention of dependency on 3rd party tool | Stéphane Lavergne | 2015-06-08 | 1 | -1/+4 |
* | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 1 | -0/+1 |
|/ |
|
* | Merge branch 'v/sticky-prefs' | Vincent Breitmoser | 2015-06-03 | 1 | -0/+8 |
|\ |
|
| * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 1 | -0/+8 |
* | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 1 | -0/+1 |
|/ |
|
* | prevent NaN dialog on import with no selected keys | Adithya Abraham Philip | 2015-05-31 | 1 | -0/+1 |
* | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -0/+1 |
* | show status indicators in EncryptFragment | Vincent Breitmoser | 2015-05-30 | 3 | -17/+96 |
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -2/+1 |
|\ |
|
| * | preserve state in DecryptTextActivity | Vincent Breitmoser | 2015-05-28 | 1 | -2/+1 |
| * | fix merge problems (derp) | Vincent Breitmoser | 2015-05-28 | 1 | -16/+0 |
| * | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 |
| * | don't show allowed key list if no key exists, and some minor PgpDecryptVerify... | Vincent Breitmoser | 2015-05-28 | 8 | -8/+8 |
| * | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-28 | 1 | -2/+0 |
| * | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-28 | 3 | -10/+9 |
| * | Improve strings | Dominik Schürmann | 2015-05-28 | 2 | -28/+45 |
| * | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 1 | -1/+1 |
| * | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 |
| * | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -0/+3 |
* | | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 |
* | | don't show allowed key list if no key exists, and some minor PgpDecryptVerify... | Vincent Breitmoser | 2015-05-28 | 8 | -8/+8 |
* | | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-27 | 1 | -2/+0 |
* | | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-27 | 3 | -10/+9 |
* | | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 1 | -1/+1 |
* | | Improve strings | Dominik Schürmann | 2015-05-19 | 2 | -33/+34 |
* | | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 |
* | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -0/+3 |
* | | Moving blank smart card messages to strings.xml | Joey Castillo | 2015-05-13 | 1 | -0/+2 |
* | | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+2 |
* | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 1 | -0/+3 |
* | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 13 | -0/+16 |
|/ |
|
* | Version 3.2 | Dominik Schürmann | 2015-05-06 | 23 | -23/+23 |
* | Pull from transifex | Dominik Schürmann | 2015-05-06 | 10 | -141/+163 |
* | Renaming for consisitency | Dominik Schürmann | 2015-05-06 | 1 | -5/+5 |
* | Move error overlay into generalized DecryptFragment, better error handling in... | Dominik Schürmann | 2015-05-06 | 1 | -76/+126 |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-05-05 | 1 | -0/+1 |
|\ |
|
| * | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 1 | -0/+1 |
* | | Fix nullpointer in file decryption | Dominik Schürmann | 2015-05-05 | 1 | -1/+1 |
|/ |
|
* | Fix revoked/expired state in decrypt activity | Dominik Schürmann | 2015-05-04 | 1 | -3/+3 |
* | Merge branch 'development' of https://github.com/Hiperzone/open-keychain into... | Dominik Schürmann | 2015-05-04 | 1 | -0/+1 |
|\ |
|
| * | -removed unneeded inputType attribute from xml files (+1 squashed commits) | Daniel Ramos | 2015-04-30 | 2 | -2/+0 |