aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-121-3/+12
| |\ \ \ \ \ \ \ \
| * | | | | | | | | more work on edit keyDominik Schürmann2014-07-122-7/+222
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-121-0/+17
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Fixed issues discussed in #713Daniel Albert2014-07-121-2/+2
| | | | | | | |
* | | | | | | | Implemented Notification, no fallback yetDaniel Albert2014-07-121-3/+12
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-081-1/+2
|\| | | | | |
| * | | | | | Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-061-1/+2
| |/ / / / /
* / / / / / Work on subkeys adapterDominik Schürmann2014-07-084-52/+246
|/ / / / /
* | | | | Use strings in edit keyDominik Schürmann2014-07-031-3/+4
| | | | |
* | | | | Remove old edit button, rename activitiesDominik Schürmann2014-07-035-796/+775
| | | | |
* | | | | cleanup, debug for passphrase setDominik Schürmann2014-07-031-5/+4
| | | | |
* | | | | fix no passphrase checkDominik Schürmann2014-07-031-1/+3
| | | | |
* | | | | Cache passphrase for editDominik Schürmann2014-07-031-2/+2
| | | | |
* | | | | Cache passphrase for editDominik Schürmann2014-07-033-30/+60
| | | | |
* | | | | cleanupDominik Schürmann2014-07-032-0/+5
| | | | |
* | | | | edit key: subkey adapterDominik Schürmann2014-07-032-1/+361
| | | | |
* | | | | Work on editDominik Schürmann2014-07-034-41/+59
| | | | |
* | | | | smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
| | | | |
* | | | | Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2
| | | | |
* | | | | merge KeychainIntentServiceDominik Schürmann2014-07-021-5/+50
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0210-362/+254
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-021-5/+50
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | use expert create key for key creation testing (revert this later on!)Vincent Breitmoser2014-07-021-5/+50
| | | | | | |
* | | | | | | fix nullpointer, cleanupDominik Schürmann2014-07-023-10/+9
| | | | | | |
* | | | | | | remove init methods from adapterDominik Schürmann2014-07-023-88/+52
| |_|/ / / / |/| | | | |
* | | | | | edit key: work on savingDominik Schürmann2014-07-023-23/+24
| | | | | |
* | | | | | Edit key: adding user idsDominik Schürmann2014-07-029-205/+243
| | | | | |
* | | | | | edit key: part 3Dominik Schürmann2014-07-014-327/+180
|/ / / / /
* | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3014-64/+49
|\ \ \ \ \
| * | | | | Fixed Bootstrap resourceDaniel Albert2014-06-301-1/+1
| | | | | |
| * | | | | Fixed, issue #702Daniel Albert2014-06-301-1/+1
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3013-154/+763
| |\| | | |
| * | | | | Converted all other buttonsDaniel Albert2014-06-305-30/+20
| | | | | |
| * | | | | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-294-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | Added drawables for them
| * | | | | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-4/+3
| | | | | |
| * | | | | Added new button style and converted account_settings and the ↵Daniel Albert2014-06-291-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | select_secret_key_layout to use it
| * | | | | Updated file_dialog to use the new buttonsDaniel Albert2014-06-292-7/+6
| | | | | |
| * | | | | Added button_rounded styleDaniel Albert2014-06-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | converted decrypt_file_fragment to new style
* | | | | | work on edit keyDominik Schürmann2014-06-303-33/+80
| |/ / / / |/| | | |
* | | | | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-282-81/+24
| | | | |
* | | | | fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-282-1/+10
| | | | |
* | | | | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-283-5/+11
| | | | | | | | | | | | | | | | | | | | closes #698
* | | | | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-2810-69/+720
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Magic to find possible mails and names of device ownerDominik Schürmann2014-06-282-2/+10
| | | | |
| * | | | More wizardryDominik Schürmann2014-06-273-89/+159
| | | | |
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-271-1/+5
| |\ \ \ \
| * | | | | Start work on a first-time wizardDominik Schürmann2014-06-272-4/+399
| | | | | |
| * | | | | new edit key: first version to add user idsDominik Schürmann2014-06-245-58/+236
| | |_|_|/ | |/| | |
* | | | | Added unlock icon, fixed drawer items, switched to icons from resource in drawerDaniel Albert2014-06-271-11/+15
| |/ / / |/| | |
* | | | Fix for #687Daniel Albert2014-06-241-1/+5
|/ / /