aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* Fix string resourcesmar-v-in2014-07-311-1/+1
|
* Fix mergemar-v-in2014-07-311-0/+2
|
* Merge branch 'master' into improve-file-moremar-v-in2014-07-3125-624/+815
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * Fix animations in create keyDominik Schürmann2014-07-311-25/+11
| |
| * Add notify layouts to some activitiesDominik Schürmann2014-07-314-80/+104
| |
| * Robots like coffee too...Dominik Schürmann2014-07-314-11/+26
| |
| * Smaller notesDominik Schürmann2014-07-311-1/+1
| |
| * Create key: work on uploadDominik Schürmann2014-07-303-182/+219
| |
| * Create key: repeat passphraseDominik Schürmann2014-07-302-2/+11
| |
| * Create key: uploadDominik Schürmann2014-07-301-0/+2
| |
| * Fix drawer in key listDominik Schürmann2014-07-301-4/+4
| |
| * Create key: layout above buttonsDominik Schürmann2014-07-302-4/+8
| |
| * Fix conflictsDominik Schürmann2014-07-301-2/+23
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-304-63/+24
| |\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
| | * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-294-63/+24
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-275-67/+21
| | | |
| | | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-267-218/+131
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-1/+6
| | | | |
| * | | | Create key with fragmentsDominik Schürmann2014-07-303-80/+229
| |/ / /
| * | | Fix build by removing old icon referenceDominik Schürmann2014-07-281-1/+0
| | | |
| * | | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-283-30/+28
| | | |
| * | | Use verified icon for certify actionDominik Schürmann2014-07-281-11/+40
| | | |
| * | | Use icons in key viewDominik Schürmann2014-07-282-21/+21
| | | |
| * | | Use new status icons in key listDominik Schürmann2014-07-281-24/+6
| | | |
| * | | Fix resource names, add small testDominik Schürmann2014-07-281-2/+2
| | | |
| * | | Fix background color of notify areaDominik Schürmann2014-07-271-2/+0
| | | |
| * | | Redesigned QR Code viewDominik Schürmann2014-07-272-19/+14
| | | |
| * | | Open keyboard on passphrase dialog, this should now work on all Android ↵Dominik Schürmann2014-07-271-0/+2
| | | | | | | | | | | | | | | | versions... hopefully
| * | | Prettify buttonsDominik Schürmann2014-07-271-34/+70
| | | |
| * | | Work on first time wizard designDominik Schürmann2014-07-273-84/+115
| | |/ | |/|
| * | New first time screenDominik Schürmann2014-07-165-204/+102
| | |
| * | cleanupDominik Schürmann2014-07-081-30/+0
| | |
| * | Work on subkeys adapterDominik Schürmann2014-07-083-14/+59
| |/
* | - add multi select for storage api (kitkat)mar-v-in2014-07-313-30/+25
| | | | | | | | | | - UI fixes - refactoring
* | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-203-13/+43
| |
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-069-120/+265
|\| | | | | | | | | | | | | | | | | 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-4/+4
| |
| * Remove old edit button, rename activitiesDominik Schürmann2014-07-031-16/+0
| |
| * Cache passphrase for editDominik Schürmann2014-07-032-7/+92
| |
| * edit key: subkey adapterDominik Schürmann2014-07-032-1/+97
| |
| * Work on editDominik Schürmann2014-07-032-8/+0
| |
| * A little bit less purpleDominik Schürmann2014-07-022-7/+4
| |
| * edit key: work on savingDominik Schürmann2014-07-021-8/+0
| |
| * Edit key: adding user idsDominik Schürmann2014-07-024-15/+72
| |
| * edit key: part 3Dominik Schürmann2014-07-011-60/+0
| |
* | Many changes to file ... and still incompletemar-v-in2014-07-0610-237/+253
| | | | | | | | | | - Multi file - Reworked UI
* | Encrypt/Decrypt UI workmar-v-in2014-07-023-79/+108
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3015-90/+60
|\
| * (should have) fixed Travis buildsDaniel Albert2014-06-302-7/+2
| |
| * Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-307-0/+321
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 02:11:29 +0000