aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* - add multi select for storage api (kitkat)mar-v-in2014-07-318-86/+95
| | | | | - UI fixes - refactoring
* Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
|
* Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-207-557/+541
|
* Merge branch 'master' into improve-file-moremar-v-in2014-07-0623-1314/+1608
|\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| * 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
| |/ /
* | | Many changes to file ... and still incompletemar-v-in2014-07-066-98/+524
| | | | | | | | | | | | | | | - Multi file - Reworked UI
* | | Encrypt/Decrypt UI workmar-v-in2014-07-027-66/+99
| | |
* | | Missing import after mergemar-v-in2014-07-011-0/+1
| | |
* | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0128-260/+907
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * | 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
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 10:53:55 +0000