Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 2 | -13/+13 |
|\ | |||||
| * | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 1 | -0/+1 |
| * | Merge branch 'development' of https://github.com/Hiperzone/open-keychain into... | Dominik Schürmann | 2015-05-04 | 1 | -0/+1 |
| |\ | |||||
| | * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Daniel Ramos | 2015-04-26 | 3 | -23/+11 |
| | |\ | |||||
| | * \ | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de... | Daniel Ramos | 2015-04-24 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | -Improved email sanity verifications when adding emails when creating a new Key | Daniel Ramos | 2015-04-14 | 1 | -0/+1 |
| * | | | | Fix yubikey strings | Dominik Schürmann | 2015-05-01 | 1 | -5/+6 |
| * | | | | Fix key creation string and display | Dominik Schürmann | 2015-04-30 | 1 | -2/+3 |
| * | | | | API: Allow selection of decryption keys when decryption fails | Dominik Schürmann | 2015-04-30 | 1 | -0/+1 |
| * | | | | display creation dates for ambiguous user ids | Vincent Breitmoser | 2015-04-27 | 1 | -1/+1 |
| * | | | | add distinct status for messages signed by "your" key | Vincent Breitmoser | 2015-04-27 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
| * | | | UI fixes for Android < 5 | Dominik Schürmann | 2015-04-26 | 1 | -6/+1 |
* | | | | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 1 | -6/+6 |
* | | | | small ui niceties | Vincent Breitmoser | 2015-04-27 | 1 | -5/+5 |
* | | | | display creation dates for ambiguous user ids | Vincent Breitmoser | 2015-04-27 | 1 | -1/+1 |
* | | | | add distinct status for messages signed by "your" key | Vincent Breitmoser | 2015-04-27 | 1 | -0/+1 |
* | | | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 3 | -10/+18 |
|\| | | | |||||
| * | | | Switch to new support lib version 22.1 | Dominik Schürmann | 2015-04-25 | 1 | -1/+1 |
| * | | | Remove old navigation drawer dependency | Dominik Schürmann | 2015-04-25 | 2 | -9/+1 |
| * | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 1 | -7/+8 |
| |/ / | |||||
| * | | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 1 | -0/+1 |
| * | | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 1 | -0/+12 |
| * | | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 1 | -0/+3 |
| |/ | |||||
* | | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 1 | -6/+7 |
* | | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 1 | -0/+4 |
* | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 1 | -7/+8 |
* | | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 1 | -0/+1 |
* | | 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 |
| | |_|/ | |/| | |