Commit message (Expand) | Author | Age | Files | Lines | ||||||
---|---|---|---|---|---|---|---|---|---|---|
... | ||||||||||
* | | | Query for duplicate user ids | Dominik Schürmann | 2015-03-15 | 3 | -2/+14 | |||||
* | | | Add missing license headers | Dominik Schürmann | 2015-03-15 | 6 | -0/+102 | |||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-14 | 1 | -1/+2 | |||||
|\| | | ||||||||||
| * | | Merge pull request #1143 from manojkhannakm/development | Dominik Schürmann | 2015-03-14 | 1 | -1/| * | | | Fixed possible ArrayIndexOutOfBoundsException. | danielnelz | 2015-03-11 | 2 | -2/+2 |
| * | | | Merge remote-tracking branch 'upstream/development' into development | danielnelz | 2015-03-09 | 4 | -29/+32 | |||||
| |\| | | ||||||||||
| * | | | Added braces to if else. | danielnelz | 2015-03-09 | 2 | -4/+6 | |||||
| * | | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 18 | -73/+106 | |||||
* | | | | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 1 | -3/+3 | |||||
* | | | | Merge pull request #1137 from manojkhannakm/development | Dominik Schürmann | 2015-03-12 | 3 | -46/+104 | |||||
|\ \ \ \ | ||||||||||
| * | | | | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 3 | -46/+104 | |||||
* | | | | | Merge pull request #1134 from adithyaphilip/sync-confirmed-keys | Dominik Schürmann | 2015-03-12 | 3 | -14/+53 | |||||
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||||||
| * | | | | added contact sync at end of CertifyOperation | Adithya Abraham Philip | 2015-03-11 | 1 | -0/+4 | |||||
| * | | | | corrected linked system contact display name | Adithya Abraham Philip | 2015-03-11 | 2 | -14/+49 | |||||
| |/ / / | ||||||||||
* / / / | change user_id primary key in database, use keyring rather than unified query... | Vincent Breitmoser | 2015-03-11 | 3 | -14/+26 | |||||
|/ / / | ||||||||||
* | | | make constant for certify hash algo | Dominik Schürmann | 2015-03-11 | 2 | -11/+6 | |||||
* | | | Disable maybe methods in ImportKeysListEntry for now | Dominik Schürmann | 2015-03-10 | 1 | -2/+3 | |||||
* | | | Fix expiry, revoked checks in OpenPgpSignatureResultBuilder | Dominik Schürmann | 2015-03-10 | 1 | -2/+2 | |||||
* | | | API 7 | Dominik Schürmann | 2015-03-10 | 8 | -204/+555 | |||||
* | | | Ripple | Dominik Schürmann | 2015-03-10 | 1 | -3/+1 | |||||
* | | | Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain... | Dominik Schürmann | 2015-03-10 | 1 | -3/+70 | |||||
|\ \ \ | ||||||||||
| * | | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-10 | 1 | -0/+19 | |||||
| * | | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 5 | -35/+312 | |||||
| * | | | cleaned up code, added comments | Adithya Abraham Philip | 2015-03-10 | 2 | -9/+16 | |||||
| * | | | added contact linking | Adithya Abraham Philip | 2015-03-10 | 2 | -9/+80 | |||||
| * | | | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+18 | |||||
| | |/ | |/| | ||||||||||
* | | | Merge pull request #1121 from adithyaphilip/rawcontact-deletion | Dominik Schürmann | 2015-03-10 | 1 | -3/+47 | |||||
|\ \ \ | ||||||||||
| * | | | added CALLER_IS_SYNCADAPTER parameter to delete queries | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+47 | |||||
* | | | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 5 | -6/+433 | |||||
|/ / / | ||||||||||
* | | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+19 | |||||
* | | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 5 | -35/+312 | |||||
|/ / | ||||||||||
* | | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 1 | -22/+27 | |||||
* | | Fix ascii armor in encrypt activity | Dominik Schürmann | 2015-03-09 | 1 | -3/+2 | |||||
* | | Fix compression check in activities | Dominik Schürmann | 2015-03-09 | 3 | -4/+3 | |||||
|/ | ||||||||||
* | API: If signature key is known return pi to show key | Dominik Schürmann | 2015-03-09 | 1 | -73/+72 | |||||
* | Fix colors for remote activity | Dominik Schürmann | 2015-03-09 | 1 | -1/+1 | |||||
* | Cleanup new widgets | Dominik Schürmann | 2015-03-09 | 3 | -38/+41 | |||||
* | Merge pull request #1112 from chipset95/issue-1106-imp | Dominik Schürmann | 2015-03-09 | 4 | -54/+53 | |||||
|\ |