aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Fixes after mergemar-v-in2014-08-011-2/+5
* Merge branch 'master' into improve-file-moremar-v-in2014-08-0111-132/+171
|\
| * Start fixing CachedPublicKeyRingDominik Schürmann2014-08-011-13/+17
| * Certifying instead of signingDominik Schürmann2014-08-011-7/+6
| * Use darker colorsDominik Schürmann2014-08-013-9/+9
| * Show file tab only for import of existing keysDominik Schürmann2014-08-011-15/+42
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-313-32/+43
| |\
| | * move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-313-32/+43
| * | Show revoked and expired for private keysDominik Schürmann2014-07-311-29/+28
| |/
| * Fixes for uploadDominik Schürmann2014-07-313-15/+19
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-312-25/+15
| |\
| | * fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-312-25/+15
| * | Create key: design fixesDominik Schürmann2014-07-311-1/+7
| |/
* | Fix string resourcesmar-v-in2014-07-311-1/+1
* | Fix mergemar-v-in2014-07-313-37/+19
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-3131-1706/+1688
|\|
| * Fix animations in create keyDominik Schürmann2014-07-313-22/+18
| * Robots like coffee too...Dominik Schürmann2014-07-315-17/+16
| * Parcelable data over 1MB can not be send through binder, parcel into a cache ...Dominik Schürmann2014-07-311-9/+21
| * Handle result in create keyDominik Schürmann2014-07-311-2/+7
| * Keyserver exception translateableDominik Schürmann2014-07-311-2/+4
| * reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-311-4/+6
| * couple of logging fixesVincent Breitmoser2014-07-311-2/+0
| * rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-314-18/+19
| * Better exception handling for import of keysDominik Schürmann2014-07-312-36/+16
| * More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-312-14/+24
| * Create key: work on uploadDominik Schürmann2014-07-304-10/+14
| * Create key: repeat passphraseDominik Schürmann2014-07-302-7/+32
| * Create key: uploadDominik Schürmann2014-07-301-13/+20
| * return values for create keyDominik Schürmann2014-07-302-4/+20
| * Fix conflictsDominik Schürmann2014-07-301-1/+2
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3018-873/+92
| |\
| | * fix a couple remaining AppMsgsVincent Breitmoser2014-07-292-10/+7
| | * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-2914-850/+84
| | |\
| | | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-273-10/+6
| | | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-275-15/+18
| | | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2614-602/+813
| | | |\
| | | * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-0711-101/+71
| | | * | get rid of AppMsg libraryVincent Breitmoser2014-07-071-744/+0
| * | | | Create key with fragmentsDominik Schürmann2014-07-304-212/+464
| |/ / /
| * | | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-284-23/+49
| * | | Use verified icon for certify actionDominik Schürmann2014-07-281-2/+12
| * | | Set visibility at lastDominik Schürmann2014-07-282-6/+6
| * | | Use icons in key viewDominik Schürmann2014-07-282-22/+39
| * | | Use new status icons in key listDominik Schürmann2014-07-281-20/+23
| * | | Smaller status images, green testDominik Schürmann2014-07-281-1/+1
| * | | Fix resource names, add small testDominik Schürmann2014-07-281-5/+10
| * | | cleanup left-oversDominik Schürmann2014-07-271-2/+0
| * | | Redesigned QR Code viewDominik Schürmann2014-07-273-115/+119
| * | | Load QR Code asynchronously and with a fade in animationDominik Schürmann2014-07-271-5/+41
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 22:14:24 +0000