aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | 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
|/
* 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
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-225-8/+326
| |\
| * | use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-222-2/+2
* | | Rename adapterDominik Schürmann2014-06-226-29/+39
| |/ |/|
* | Start new designed activityDominik Schürmann2014-06-215-8/+326
|/
* 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
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 15:36:23 +0000