Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 26 | -198/+215 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 7 | -36/+110 | |
| * | | | | | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 4 | -0/+11 | |
| * | | | | | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 5 | -7/+19 | |
| * | | | | | | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 6 | -17/+17 | |
| * | | | | | | | inline mNfcSignOps variable | Vincent Breitmoser | 2015-03-20 | 1 | -17/+16 | |
| * | | | | | | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 3 | -3/+13 | |
| * | | | | | | | re-inline cryptoInput variable | Vincent Breitmoser | 2015-03-20 | 1 | -32/+34 | |
| * | | | | | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 77 | -774/+1149 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 17 | -248/+296 | |
| * | | | | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 12 | -95/+147 | |
| * | | | | | | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 15 | -240/+475 | |
| * | | | | | | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 17 | -230/+878 | |
| * | | | | | | | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 3 | -3/+64 | |
* | | | | | | | | | minor ui and wording changes | Vincent Breitmoser | 2015-04-09 | 2 | -8/+20 | |
* | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 226 | -8092/+10272 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 7 | -405/+423 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #1188 from adithyaphilip/import-message-error | Dominik Schürmann | 2015-03-28 | 1 | -2/+5 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * / | | | | | | -Fixed a situation where additional emails could be duplicated when creating ... | Daniel Ramos | 2015-03-27 | 2 | -12/+37 | |
| |/ / / / / / | ||||||
| * | | | | | | 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 | |
| | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | 3.2beta3 | Dominik Schürmann | 2015-03-23 | 2 | -3/+3 | |
| * | | | | | 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 | |
| * | | | | | Update build env and plugins | Dominik Schürmann | 2015-03-23 | 1 | -42/+42 | |
| * | | | | | Pull from transifex | Dominik Schürmann | 2015-03-23 | 113 | -209/+8859 | |
| * | | | | | Remove remaining html entities in changelog | Dominik Schürmann | 2015-03-23 | 1 | -3/+3 | |
| * | | | | | 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 | |
| | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Markdown comments | Dominik Schürmann | 2015-03-23 | 5 | -5/+5 | |
| * | | | | | | Remove changelog in main folder, update comments | Dominik Schürmann | 2015-03-23 | 4 | -0/+4 | |
| * | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-23 | 2 | -16/+25 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| * | | | | | | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 82 | -7652/+524 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 7 | -406/+423 | |
* | | | | | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 8 | -34/+38 | |
* | | | | | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 4 | -39/+65 | |
* | | | | | | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 17 | -0/+2 | |
* | | | | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 39 | -153/+149 | |
* | | | | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 7 | -25/+27 | |
* | | | | | | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 12 | -153/+157 | |
* | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 120 | -1203/+1772 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 2 | -16/+25 | |
| |/ / / / |