Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 1 | -2/+2 |
| | |||||
* | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 1 | -21/+20 |
| | |||||
* | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 1 | -1/+2 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 1 | -3/+3 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 1 | -17/+5 |
| | |||||
* | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 1 | -2/+1 |
| | |||||
* | use final fragment superclass for dns | Vincent Breitmoser | 2015-03-06 | 1 | -213/+18 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 1 | -3/+3 |
| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
* | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 1 | -3/+5 |
| | |||||
* | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -5/+5 |
| | |||||
* | some fixes for compiling (still not working!) | Vincent Breitmoser | 2015-03-02 | 1 | -3/+3 |
| | |||||
* | linked id ui work dns/twitter | Vincent Breitmoser | 2015-01-16 | 1 | -3/+3 |
| | |||||
* | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 1 | -0/+360 |