Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 1 | -62/+78 |
|\ | |||||
| * | Rename advanced to extended | Dominik Schürmann | 2015-03-31 | 1 | -7/+7 |
| * | From passphrase to password | Dominik Schürmann | 2015-03-31 | 1 | -47/+47 |
| * | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 1 | -1/+1 |
| * | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+0 |
| * | Fix strings with email address | Dominik Schürmann | 2015-03-29 | 1 | -2/+2 |
| * | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 1 | -0/+1 |
| |\ | |||||
| * \ | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -25/+12 |
| |\ \ | |||||
| * | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 1 | -0/+1 |
| * | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -0/+1 |
| * | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 1 | -1/+2 |
| * | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -6/+8 |
| * | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -1/+3 |
| * | | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 |
| * | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 1 | -0/+2 |
| * | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+1 |
| * | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -2/+4 |
| * | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -3/+5 |
| |\ \ \ | |||||
| * | | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -1/+2 |
| * | | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 1 | -1/+1 |
* | | | | | minor ui and wording changes | Vincent Breitmoser | 2015-04-09 | 1 | -4/+4 |
* | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 1 | -25/+13 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | -Fixed a situation where additional emails could be duplicated when creating ... | Daniel Ramos | 2015-03-27 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
| * | | | 3.2beta3 | Dominik Schürmann | 2015-03-23 | 1 | -1/+1 |
| * | | | translation fixes | Dominik Schürmann | 2015-03-23 | 1 | -20/+0 |
| * | | | Fix language problems reported by yahoe.001 on transifex | Dominik Schürmann | 2015-03-23 | 1 | -4/+9 |
| * | | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -0/+2 |
| | |/ | |/| | |||||
* | | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 1 | -0/+1 |
* | | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 1 | -8/+8 |
* | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -1/+9 |
* | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 1 | -0/+9 |
* | | | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 1 | -0/+7 |
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 1 | -4/+8 |
|\| | | |||||
| * | | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 1 | -3/+5 |
| |/ | |||||
| * | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 1 | -0/+1 |
| * | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 1 | -1/+2 |
* | | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 1 | -1/+10 |
* | | support github resource (pa) | Vincent Breitmoser | 2015-03-24 | 1 | -0/+3 |
* | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 1 | -6/+10 |
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 1 | -5/+8 |
|\| | |||||
| * | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 1 | -3/+4 |
| * | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 1 | -3/+4 |
| * | Pull from transifex | Dominik Schürmann | 2015-03-10 | 1 | -1/+1 |
| * | API 7 | Dominik Schürmann | 2015-03-10 | 1 | -1/+2 |
* | | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 1 | -14/+15 |
* | | use ViewAnimator for progress, streamline text on first step | Vincent Breitmoser | 2015-03-13 | 1 | -20/+18 |
* | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 1 | -2/+0 |
* | | change finish button label to "link identity" | Vincent Breitmoser | 2015-03-13 | 1 | -0/+1 |
* | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 1 | -1/+7 |
|\| | |||||
| * | Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain... | Dominik Schürmann | 2015-03-10 | 1 | -0/+3 |
| |\ |