Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 8 | -43/+70 |
* | Start reworking decrypt ui classes | Dominik Schürmann | 2015-03-27 | 3 | -172/+197 |
* | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 9 | -404/+418 |
* | Update gradle plugin, update gradle test plugin | Dominik Schürmann | 2015-03-26 | 2 | -2/+2 |
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-26 | 1 | -14/+76 |
|\ | |||||
| * | Merge pull request #1182 from iseki-masaya/1045 | Dominik Schürmann | 2015-03-26 | 1 | -14/+76 |
| |\ | |||||
| | * | Modify break as return. | iseki | 2015-03-26 | 1 | -1/+1 |
| | * | Add brackets for if-else constructs and externalize the procedure as showMult... | iseki | 2015-03-26 | 1 | -26/+33 |
| | * | Add a loop for multiple key export. | iseki | 2015-03-25 | 1 | -13/+68 |
| |/ | |||||
* | | Start refactoring encrypt ui, EncryptFileActivity no longer crashing | Dominik Schürmann | 2015-03-26 | 9 | -516/+539 |
* | | Fix certify with CryptoInputParcel | Dominik Schürmann | 2015-03-25 | 3 | -10/+6 |
* | | Remove backward compat in CertifyKeyFragment | Dominik Schürmann | 2015-03-25 | 1 | -17/+1 |
* | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 235 | -8380/+10180 |
|\| | |||||
| * | 3.2beta3 | Dominik Schürmann | 2015-03-23 | 2 | -3/+3 |
| * | translation fixes | Dominik Schürmann | 2015-03-23 | 9 | -113/+93 |
| * | Fix language problems reported by yahoe.001 on transifex | Dominik Schürmann | 2015-03-23 | 4 | -11/+16 |
| * | Update build env and plugins | Dominik Schürmann | 2015-03-23 | 7 | -52/+52 |
| * | Pull from transifex | Dominik Schürmann | 2015-03-23 | 114 | -210/+8860 |
| * | Remove remaining html entities in changelog | Dominik Schürmann | 2015-03-23 | 1 | -3/+3 |
| * | Fix transifex config | Dominik Schürmann | 2015-03-23 | 1 | -4/+1 |
| * | Merge pull request #1165 from kentnek/dev-yubikey-null | Dominik Schürmann | 2015-03-23 | 1 | -5/+11 |
| |\ | |||||
| | * | Fixed #1152: | Kent | 2015-03-20 | 1 | -5/+11 |
| * | | Merge pull request #1166 from adithyaphilip/multi-threaded | Dominik Schürmann | 2015-03-23 | 25 | -122/+691 |
| |\ \ | |||||
| | * | | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 21 | -334/+611 |
| | * | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 6 | -35/+327 |
| * | | | Fix passphrase cache not clearing all passphrases | Dominik Schürmann | 2015-03-23 | 1 | -2/+2 |
| * | | | Merge pull request #1174 from Jesperbk/development | Dominik Schürmann | 2015-03-23 | 1 | -1/+3 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Fixed issue where setting a passphrase to null later causes a NullPointerExce... | JesperBK | 2015-03-23 | 1 | -1/+3 |
| * | | | Update readme for libs link | Dominik Schürmann | 2015-03-23 | 1 | -1/+1 |
| * | | | Markdown comments | Dominik Schürmann | 2015-03-23 | 5 | -5/+5 |
| * | | | Remove changelog in main folder, update comments | Dominik Schürmann | 2015-03-23 | 5 | -265/+5 |
| * | | | Update transifex config | Dominik Schürmann | 2015-03-23 | 1 | -9/+12 |
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-23 | 5 | -16/+29 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #1170 from manojkhannakm/development | Dominik Schürmann | 2015-03-22 | 1 | -0/+0 |
| | |\ \ \ | |||||
| | | * | | | Updated openpgp-api-lib | Manoj Khanna | 2015-03-22 | 1 | -0/+0 |
| | | |/ / | |||||
| * | / / | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 83 | -7652/+524 |
| | |/ / | |/| | | |||||
* | | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 5 | -24/+78 |
* | | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 2 | -5/+9 |
* | | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 5 | -16/+29 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 5 | -16/+29 |
| |/ / | |||||
* | | | forgot spongycastle update | Vincent Breitmoser | 2015-03-22 | 1 | -0/+0 |
* | | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 2 | -6/+33 |
* | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 4 | -6/+51 |
* | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 9 | -221/+396 |
* | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 6 | -31/+24 |
* | | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 3 | -14/+114 |
* | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 9 | -228/+376 |
* | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 20 | -88/+264 |
* | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 7 | -37/+365 |
* | | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 30 | -468/+689 |