aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix animations in create keyDominik Schürmann2014-07-311-1/+1
|
* Create key: work on uploadDominik Schürmann2014-07-301-1/+0
|
* Create key: repeat passphraseDominik Schürmann2014-07-301-2/+32
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-301-15/+0
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
* Create key with fragmentsDominik Schürmann2014-07-301-0/+200