aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java
Commit message (Expand)AuthorAgeFilesLines
* linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-101-172/+0
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-6/+24
* linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-2/+2
* linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-091-21/+20
* work on cookie scanning during creationVincent Breitmoser2015-03-241-1/+2
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-3/+3
* work on second step of identity creationVincent Breitmoser2015-03-131-17/+5
* remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+1
* use final fragment superclass for dnsVincent Breitmoser2015-03-061-213/+18
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-3/+3
* do a TON of UI workVincent Breitmoser2015-03-051-3/+5
* work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-5/+5
* some fixes for compiling (still not working!)Vincent Breitmoser2015-03-021-3/+3
* linked id ui work dns/twitterVincent Breitmoser2015-01-161-3/+3
* affirmation -> linked identityVincent Breitmoser2015-01-151-0/+360