aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix debug backup/restore methodsDominik Schürmann2014-08-041-6/+6
|
* Create key: design fixesDominik Schürmann2014-07-311-1/+7
|
* Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-291-8/+7
|\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
| * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-261-59/+20
| |\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-071-10/+6
| | |
* | | Work on first time wizard designDominik Schürmann2014-07-271-0/+2
| |/ |/|
* | Program flow fixesDominik Schürmann2014-07-251-13/+3
| |
* | Simple create keyDominik Schürmann2014-07-161-43/+0
| |
* | New first time screenDominik Schürmann2014-07-161-8/+22
| |
* | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-111-7/+4
|/
* use expert create key for key creation testing (revert this later on!)Vincent Breitmoser2014-07-021-5/+50
|
* Start work on a first-time wizardDominik Schürmann2014-06-271-4/+4
|
* add debug backup/restore options to main menuVincent Breitmoser2014-04-141-0/+34
| | | | Closes #543
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+95