Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 1 | -11/+10 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -11/+10 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 1 | -10/+15 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Show main user id instead of key in certify screen | Dominik Schürmann | 2015-03-15 | 1 | -10/+15 |
| | | |||||
* | | minor changes, add convertFingerprintToKeyId method | Vincent Breitmoser | 2015-03-08 | 1 | -1/+1 |
|/ | |||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -1/+1 |
| | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -3/+3 |
| | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 1 | -1/+1 |
| | |||||
* | Make the Certify screen a little more self-explanatory | Tim Bray | 2014-10-21 | 1 | -5/+6 |
| | |||||
* | keylist: add safeslinger exchange button to secret keys | Vincent Breitmoser | 2014-10-10 | 1 | -3/+0 |
| | |||||
* | rename certify_key_item to the more appropriate multi_certify_item | Vincent Breitmoser | 2014-10-08 | 1 | -1/+1 |
| | |||||
* | more layout neatification | Vincent Breitmoser | 2014-10-05 | 1 | -1/+1 |
| | |||||
* | merge key ids in getSelectedCertifyActions | Vincent Breitmoser | 2014-10-04 | 1 | -3/+25 |
| | |||||
* | implement preliminary MultiCertifyActivity (most heavy lifting is done) | Vincent Breitmoser | 2014-10-04 | 1 | -0/+161 |