Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 1 | -60/+24 |
| | |||||
* | use ViewAnimator for progress, streamline text on first step | Vincent Breitmoser | 2015-03-13 | 1 | -12/+20 |
| | |||||
* | change finish button label to "link identity" | Vincent Breitmoser | 2015-03-13 | 1 | -1/+1 |
| | |||||
* | fix linked wizard buttons | Vincent Breitmoser | 2015-03-12 | 1 | -5/+8 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 1 | -2/+2 |
| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | ||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 1 | -2/+2 |
| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
* | some fixes for compiling (still not working!) | Vincent Breitmoser | 2015-03-02 | 1 | -1/+1 |
| | |||||
* | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 1 | -0/+190 |