Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 4 | -16/+12 |
* | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 3 | -4/+14 |
* | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -1/+3 |
* | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 4 | -81/+44 |
* | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 2 | -4/+8 |
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 135 | -1276/+2044 |
|\ | |||||
| * | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -5/+5 |
| * | Pull from transifex | Dominik Schürmann | 2015-04-14 | 110 | -1110/+1555 |
| * | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 1 | -0/+1 |
| |\ | |||||
| | * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 1 | -0/+1 |
| * | | 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 | 2 | -2/+1 |
| * | | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai... | Vincent Breitmoser | 2015-03-30 | 3 | -63/+60 |
| |\ \ | |||||
| | * | | Fix scrollbar | Dominik Schürmann | 2015-03-30 | 1 | -0/+1 |
| | * | | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 3 | -63/+59 |
| * | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+0 |
| |/ / | |||||
| * | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-30 | 3 | -13/+23 |
| |\| | |||||
| * | | 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 |
| |\ \ | |||||
| * | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 3 | -2/+1 |
| * | | | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 1 | -4/+3 |
| * | | | Start refactoring encrypt ui, EncryptFileActivity no longer crashing | Dominik Schürmann | 2015-03-26 | 3 | -10/+8 |
| * | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 191 | -7866/+9358 |
| |\ \ \ | |||||
| * | | | | 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 | 2 | -23/+66 |
| * | | | | 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 | 2 | -3/+12 |
| * | | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 3 | -70/+117 |
| * | | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 11 | -19/+88 |
| * | | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -16/+85 |
| * | | | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 2 | -17/+100 |
| * | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 1 | -5/+15 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 29 | -164/+152 |
| |\ \ \ \ \ | |||||
| * | | | | | | 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 | 2 | -8/+20 |
* | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 191 | -7866/+9359 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 3 | -13/+23 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | -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 | 8 | -113/+93 |
| * | | | | Fix language problems reported by yahoe.001 on transifex | Dominik Schürmann | 2015-03-23 | 4 | -11/+16 |
| * | | | | Pull from transifex | Dominik Schürmann | 2015-03-23 | 110 | -199/+8849 |
| * | | | | Remove remaining html entities in changelog | Dominik Schürmann | 2015-03-23 | 1 | -3/+3 |
| * | | | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 2 | -0/+7 |