aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-07-0128-260/+907
|\
| * 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
| | * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-4/+3
| | * | Added new button style and converted account_settings and the select_secret_k...Daniel Albert2014-06-291-5/+3
| | * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-292-7/+6
| | * | Added button_rounded styleDaniel Albert2014-06-281-3/+3
| * | | 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
| * | 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
| |/
* | Merge branch 'master' into improve-file-moremar-v-in2014-06-248-54/+461
|\|
| * new edit key: change passphraseDominik Schürmann2014-06-221-63/+107
| * new edit key: diff for existing user idsDominik Schürmann2014-06-225-26/+379
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-222-2/+2
| |\
| * | Rename adapterDominik Schürmann2014-06-226-29/+39
* | | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-2215-79/+495
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-225-8/+326
| |\|
| | * Start new designed activityDominik Schürmann2014-06-215-8/+326
| * | use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-222-2/+2
| |/
| * Fix qr code finallyDominik Schürmann2014-06-204-19/+31
| * import: forward motion events to activity regardlessVincent Breitmoser2014-06-201-0/+12
| * Work on Qr code importDominik Schürmann2014-06-205-43/+70
| * Use actionbar button for log activityDominik Schürmann2014-06-202-4/+48
| * Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-6/+7
| * Fix update from keyserver flowDominik Schürmann2014-06-202-5/+7
* | Improve file more, Part 1mar-v-in2014-06-229-379/+162
|/
* Merge branch 'master' of https://github.com/open-keychain/open-keychain into ...mar-v-in2014-06-196-243/+174
|\
| * Fixing fingerprint search, part 1Dominik Schürmann2014-06-191-80/+88
| * Remove unused code to import splitted qr codesDominik Schürmann2014-06-191-77/+1
| * New callback model for ImportKeysActivityDominik Schürmann2014-06-196-99/+85
| * forward touch events to pager in import activityVincent Breitmoser2014-06-181-0/+13
* | Merge branch 'master' into improve-filemar-v-in2014-06-1815-350/+528
|\|
| * Merge branch 'new-edit'Vincent Breitmoser2014-06-182-10/+7
| |\
| | * new-edit: remove old save keyring stuffVincent Breitmoser2014-06-172-10/+7
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-181-0/+13
| |\|
| | * add more progress info from import routineVincent Breitmoser2014-06-161-0/+13
| * | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1810-322/+227
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 03:07:59 +0000