From 6854b226d35c0c166a934429207fdb7fdcdf43de Mon Sep 17 00:00:00 2001 From: DatDang Date: Mon, 18 Nov 2024 16:08:32 +0700 Subject: [PATCH 1/4] TF-3265 Fix double scrolling composer --- contact/pubspec.lock | 12 ++++++++++-- pubspec.yaml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/contact/pubspec.lock b/contact/pubspec.lock index 9cf2644136..3ec8bc9377 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -652,10 +652,10 @@ packages: description: path: "." ref: main - resolved-ref: b75666ba1ac351c7e7be7a1a8f95e58a860505fc + resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199 url: "https://github.com/linagora/jmap-dart-client.git" source: git - version: "0.2.3" + version: "0.3.0" js: dependency: transitive description: @@ -1238,6 +1238,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + visibility_detector: + dependency: transitive + description: + name: visibility_detector + sha256: "15c54a459ec2c17b4705450483f3d5a2858e733aee893dcee9d75fd04814940d" + url: "https://pub.dev" + source: hosted + version: "0.3.3" vm_service: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 6f87d9b5c2..b331196e9d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,7 +60,7 @@ dependencies: html_editor_enhanced: git: url: https://github.com/linagora/html-editor-enhanced.git - ref: main + ref: bugfix/double-scrolling-editor jmap_dart_client: git: From 692cf862912fe512c1fd64464bc2086b65b3fdfe Mon Sep 17 00:00:00 2001 From: DatDang Date: Tue, 19 Nov 2024 14:00:45 +0700 Subject: [PATCH 2/4] fixup! TF-3265 Fix double scrolling composer --- contact/pubspec.lock | 8 -------- pubspec.lock | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/contact/pubspec.lock b/contact/pubspec.lock index 3ec8bc9377..3123b881fd 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -1238,14 +1238,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - visibility_detector: - dependency: transitive - description: - name: visibility_detector - sha256: "15c54a459ec2c17b4705450483f3d5a2858e733aee893dcee9d75fd04814940d" - url: "https://pub.dev" - source: hosted - version: "0.3.3" vm_service: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index a5ca08fdd8..80a886ce6b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1170,8 +1170,8 @@ packages: dependency: "direct main" description: path: "." - ref: main - resolved-ref: "3274d7fe8c711e7466890b6a3948e9708877ca4a" + ref: "bugfix/double-scrolling-editor" + resolved-ref: e0b57fc111de9c807edcbbefccac06e6b811877b url: "https://github.com/linagora/html-editor-enhanced.git" source: git version: "3.1.1" From cf8abf21663a839c9e964b8d767e7953f7c31e05 Mon Sep 17 00:00:00 2001 From: DatDang Date: Wed, 20 Nov 2024 11:38:17 +0700 Subject: [PATCH 3/4] fixup! fixup! TF-3265 Fix double scrolling composer --- pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index 80a886ce6b..1d510d4721 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1171,7 +1171,7 @@ packages: description: path: "." ref: "bugfix/double-scrolling-editor" - resolved-ref: e0b57fc111de9c807edcbbefccac06e6b811877b + resolved-ref: cd44a909dc5230d8c9aec351226834548070bd32 url: "https://github.com/linagora/html-editor-enhanced.git" source: git version: "3.1.1" From 1a6fb96789fcec6fd71d93c9c173dc9324c31ebd Mon Sep 17 00:00:00 2001 From: DatDang Date: Wed, 20 Nov 2024 13:59:50 +0700 Subject: [PATCH 4/4] fixup! TF-3265 Fix double scrolling composer --- pubspec.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 1d510d4721..59ff3a5b26 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1171,10 +1171,10 @@ packages: description: path: "." ref: "bugfix/double-scrolling-editor" - resolved-ref: cd44a909dc5230d8c9aec351226834548070bd32 + resolved-ref: a306af5dddc3f506e5c460c70e8b9d8ae3f86032 url: "https://github.com/linagora/html-editor-enhanced.git" source: git - version: "3.1.1" + version: "3.1.2" http: dependency: transitive description: