Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 2 | -5/+7 |
|\ | |||||
| * | Ripple | Dominik Schürmann | 2015-03-10 | 1 | -4/+0 |
| * | Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain... | Dominik Schürmann | 2015-03-10 | 1 | -0/+3 |
| |\ | |||||
| | * | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-10 | 1 | -0/+1 |
| | * | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 1 | -2/+4 |
| | * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+2 |
| | * | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+1 |
| * | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 1 | -1/+4 |
* | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 1 | -0/+4 |
* | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 1 | -12/+17 |
|\| | | |||||
| * | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+1 |
| * | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 1 | -2/+4 |
| |/ | |||||
| * | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 1 | -2/+2 |
| * | Improve icons | Dominik Schürmann | 2015-03-09 | 1 | -7/+7 |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-09 | 1 | -2/+5 |
| |\ | |||||
| * | | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 1 | -2/+4 |
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 2 | -3/+23 |
|\ \ \ | | |/ | |/| | |||||
| * | | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -2/+5 |
| |/ | |||||
| * | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into pa... | Dominik Schürmann | 2015-03-05 | 1 | -0/+14 |
| |\ | |||||
| | * | Implemented Matt Allen password strength indicator | Lukas Zorich | 2015-03-03 | 1 | -0/+14 |
| * | | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
| * | | Remove advanced preferences, move compression as menu item in encrypt activit... | Dominik Schürmann | 2015-03-05 | 1 | -0/+1 |
| * | | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 |
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 2 | -30/+33 |
|\| | | |||||
| * | | Rewording secret_key_deletion_confirmation | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| * | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ... | Dominik Schürmann | 2015-03-04 | 1 | -0/+11 |
| |\ \ | |||||
| | * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-03-02 | 2 | -2/+3 |
| | |\| | |||||
| | * | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 1 | -0/+7 |
| | * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 1 | -15/+16 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 1 | -0/+58 |
| | |\ \ \ | |||||
| | * \ \ \ | merged dialog | Adithya Abraham Philip | 2015-02-26 | 9 | -139/+67 |
| | |\ \ \ \ | |||||
| | * | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 1 | -0/+4 |
| * | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 1 | -16/+15 |
| * | | | | | | More simplification of delete strings | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| * | | | | | | Simplify certify strings | Dominik Schürmann | 2015-03-04 | 1 | -11/+2 |
| * | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 1 | -4/+4 |
| * | | | | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 1 | -2/+3 |
| * | | | | | | Fix toolbar margins on Android lower 5 | Dominik Schürmann | 2015-03-03 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -0/+1 |
* | | | | | | add linked it to view key context menu | Vincent Breitmoser | 2015-03-02 | 1 | -1/+2 |
* | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 2 | -2/+3 |
|\| | | | | | |||||
| * | | | | | Search string simplified | Dominik Schürmann | 2015-03-02 | 1 | -2/+1 |
| * | | | | | Re-add black color | Dominik Schürmann | 2015-03-02 | 1 | -0/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 6 | -71/+275 |
|\| | | | | |||||
| * | | | | Strings: File size | Dominik Schürmann | 2015-02-28 | 1 | -2/+2 |
| * | | | | Fix strings based on transifex reports | Dominik Schürmann | 2015-02-28 | 1 | -13/+13 |
| * | | | | Keybase header text | Dominik Schürmann | 2015-02-27 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
| * | | | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -0/+58 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Check fingerprint match between proof & database | Tim Bray | 2014-11-22 | 1 | -0/+1 |
| | * | | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 1 | -4/+5 |
| | |\ \ |