aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-07-31211-3352/+4239
|\
| * Fix animations in create keyDominik Schürmann2014-07-315-47/+31
| * Add notify layouts to some activitiesDominik Schürmann2014-07-314-80/+104
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-314-19/+99
| |\
| | * completely overengineer progress indication in {modify,create}SecretKeyRing m...Vincent Breitmoser2014-07-314-19/+99
| * | Robots like coffee too...Dominik Schürmann2014-07-3115-36/+52
| |/
| * Parcelable data over 1MB can not be send through binder, parcel into a cache ...Dominik Schürmann2014-07-313-16/+128
| * avoid nullpointerexception in EditKeyResultVincent Breitmoser2014-07-311-2/+2
| * fix fromStream method, properly recognize multiple concatenated streamsVincent Breitmoser2014-07-311-17/+20
| * always return an EditKeyResult in modifyKey methodVincent Breitmoser2014-07-311-25/+25
| * Handle result in create keyDominik Schürmann2014-07-311-2/+7
| * Fix stringDominik Schürmann2014-07-311-1/+1
| * Keyserver exception translateableDominik Schürmann2014-07-3113-25/+36
| * Smaller notesDominik Schürmann2014-07-312-1/+9
| * reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-312-30/+71
| * Even better Exception handling with keyserver queriesDominik Schürmann2014-07-311-8/+10
| * Exception handling with keyserver queriesDominik Schürmann2014-07-312-6/+14
| * couple of logging fixesVincent Breitmoser2014-07-313-6/+4
| * rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-3121-209/+193
| * Better exception handling for import of keysDominik Schürmann2014-07-319-47/+27
| * More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-313-17/+181
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-303-23/+15
| |\
| | * couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-303-23/+15
| * | Create key: work on uploadDominik Schürmann2014-07-308-192/+242
| |/
| * Create key: repeat passphraseDominik Schürmann2014-07-305-11/+46
| * Create key: uploadDominik Schürmann2014-07-302-13/+22
| * Fix drawer in key listDominik Schürmann2014-07-301-4/+4
| * return values for create keyDominik Schürmann2014-07-303-8/+22
| * Create key: layout above buttonsDominik Schürmann2014-07-302-4/+8
| * Fix conflictsDominik Schürmann2014-07-302-3/+25
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3041-1023/+332
| |\
| | * fix a couple remaining AppMsgsVincent Breitmoser2014-07-292-10/+7
| | * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-2935-995/+309
| | |\
| | | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-2714-52/+100
| | | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-2715-120/+87
| | | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2659-1453/+1695
| | | |\
| | | * | use SuperToast instead of AppMsg in code, part 2Vincent Breitmoser2014-07-072-3/+64
| | | * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-0717-112/+82
| | | * | get rid of AppMsg libraryVincent Breitmoser2014-07-072-744/+1
| | * | | watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-283-10/+19
| * | | | Create key with fragmentsDominik Schürmann2014-07-3014-297/+733
| |/ / /
| * | | 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-2835-53/+77
| * | | Use verified icon for certify actionDominik Schürmann2014-07-282-13/+52
| * | | Set visibility at lastDominik Schürmann2014-07-282-6/+6
| * | | Use icons in key viewDominik Schürmann2014-07-285-43/+64
| * | | Use new status icons in key listDominik Schürmann2014-07-282-44/+29
| * | | Smaller status images, green testDominik Schürmann2014-07-2861-1/+1
| * | | Fix resource names, add small testDominik Schürmann2014-07-2862-7/+12
| * | | Add icons from ModernPGP projectDominik Schürmann2014-07-2860-0/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 16:25:24 +0000