Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | hack loadSystemContact back in | Vincent Breitmoser | 2015-03-10 | 1 | -5/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 1 | -1/+67 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | ||||
| * | cleaned up code, added comments | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+15 |
| | | | | | | | | optimised imports | ||||
| * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+52 |
| | | |||||
| * | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+18 |
| | | |||||
| * | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 1 | -2/+2 |
| | | | | | | | | instead of EXPIRY where possible | ||||
* | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 1 | -1/+6 |
| | | |||||
* | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 1 | -4/+5 |
| | | |||||
* | | fix transition animation | Vincent Breitmoser | 2015-03-09 | 1 | -7/+24 |
| | | |||||
* | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -1/+1 |
| | | |||||
* | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -1/+1 |
| | | |||||
* | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 1 | -58/+38 |
| | | |||||
* | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 1 | -1/+10 |
| | | |||||
* | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 1 | -3/+4 |
| | | |||||
* | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 1 | -4/+32 |
| | | |||||
* | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -7/+29 |
| | | |||||
* | | remove unused bits from projection | Vincent Breitmoser | 2015-03-02 | 1 | -15/+1 |
|/ | |||||
* | forgot to rename a method | Vincent Breitmoser | 2015-03-02 | 1 | -3/+1 |
| | |||||
* | some cleanup in ViewKey* | Vincent Breitmoser | 2015-03-02 | 1 | -15/+4 |
| | |||||
* | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 1 | -6/+1 |
| | |||||
* | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 1 | -23/+85 |
| | | | | keys | ||||
* | CardView and more header design | Dominik Schürmann | 2015-02-25 | 1 | -2/+3 |
| | |||||
* | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 1 | -451/+5 |
| | |||||
* | Remove tabs in view key | Dominik Schürmann | 2015-02-24 | 1 | -0/+615 |