Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick from master to maintenance-v0.14.2 #3398

Merged
merged 37 commits into from
Jan 8, 2025

Conversation

tddang-linagora
Copy link
Contributor

@tddang-linagora tddang-linagora commented Jan 6, 2025

git rev-list --left-right --count master...cherry-pick/master-to-maintenance-v0.14.2

Result in 39 72, meaning compare to master, maintenance-v0.14.2 is 72 commits ahead and 39 commits behind. Hence, 39 commits from master will be cherry-picked into this branch.

git rev-list --left-right --pretty=oneline master...cherry-pick/master-to-maintenance-v0.14.2
All commits behind (with "<" header) and ahead (with ">" header)
>671687a823b263a01446f07e942880dcd23e16ee Bump version to v0.14.7
>5e1c8beca6a449fdf9d8a2dc6e81df58d92612ef Delegate cache control from Flutter to browser (#3289)
>650cf0810db89537ce3d760f3881917cac5fc4b8 Bump version to v0.14.6
>b5959e6e48c893e2617d0127415be1dd8f448478 TF-3344 Handle separator when submit list of mail addresses in text
>b8bf8ac0834d7037fe2beac67cc75d1626d518bd TF-3344 Handle separator when pasting list of mail addresses
>eed47e285fe7d79fc93b7a4d96633d342973ba9f TF-3385 Fix Map spam/unspam from fromIterable to fromEntries
>5cd272222d3aeec4490a489b50e6393a292fec2f TF-3385 Fix tests update email flags extension
>2235fccda4e5e53348e55d60270b05bed4b839ad TF-3385 Fix Map read status from fromIterable to fromEntries
>a3ddf9b0c1a8866a874fe56479e677bbbc4cc524 TF-3385 Fix change flags not working
>c13c7f3746f2d9869202815167291b3342e98ce1 TF-3385 Revert undo operation handling
>ec2a43ebb9e62aa13397ff99d47a4d78712105bf TF-3385 Optimize misc
>20450370bb858390e370987a7606038235db4c1e TF-3385 Fix move and delete emails not work properly
>23852dadd022f149d406fa3959e7e5d41b7f5c5e TF-3385 Fix mark as read not work properly
>cd447aa80d7bebad1a21a1fe0f65c6f01381d5aa TF-3385 Remove skipCache mechanism in get all emails
>f4bcd6b4045e2723c5b48adcfcb747129838b3c8 TF-3385 Add try-catch to cache method calls on user actions
>a20e32557195916d52545dd700474116f2fac886 TF-3385 Get & set multiple changes in email cache
>aec0cd7653888502f521b4d75ad091da2e9dc7d4 TF-3385 Create abstract group for update mailbox actions
>5c5233b5cee8c738c30a6241412a566b4b7e5856 TF-3385 Update cache on set method
>8bba046d57770d58cf78aa64ee2537f10957a199 TF-3385 Clean up ThreadController and SearchEmailController ever listener
>1e1452ea8e60b0195f3c4d00cc34cd0d5d4bd701 TF-3385 Update move emails
>76388ab7a690c9a94c604309640dc5e877b1252c TF-3385 Update empty trash and spam emails
>cb50c00e60dcfd36a293803bcae3d11296deec9d TF-3385 Update permanently delete emails
>7e71eb11bec1b280b656712918d4e35b04b3c182 TF-3385 Update save and remove draft email
>7fa1a2d4932a72340f12ffa1530e5b7a1bbd5e33 TF-3385 Update recover deleted emails
>8d1af535f34c8973690a58a7cc2362ae0bc51c83 TF-3385 Update mark as read and star
>6627239fc63ec50d8e71a712557a1946009920de TF-3385 Update mailbox name
>44f2464baaca10fb0e147cd8d8212cd736a45b5a TF-3379 Add unit test for `getCountMailAddressWithoutMe` method
>14088531691b4472c6bbaf002da7e7bc1a93bde2 TF-3379 Show `replyAll` button when sender not me
>e523ef1762d54190c46e698db37c2d9668cc2681 TF-3370 Handle SetError when make email action (Mark as read/star/move/delete)
>8bd4fbdbc31edb77923d30e88bee22cfe825b8e0 TF-3337 Write unit test to verify number of times call request when performing mark as read/star and move emails
>f2ec6f2330ff70c45eccd4dc08caceab5027e8d7 TF-3337 Set maximum objects in `Email/Set` method when mark as read/star and move emails
>97483013e0075b434953012e658cb5089ade56bf TF-3372 Handling error for empty trash failure
>6ae5cd168af35a31ce8cdfe5198672ea547329f7 TF-3372 Handle Empty mailbox success + failure states
>32d12f0c9b67e6604528855e742b668ab4c3673b TF-3372 Use viewStateMailboxActionProgress to build progress bar for not only MarkAsRead but also Empty mailbox action
>0b4ade0ad5292e9d2dde008b1920efeb319262bb TF-3372 Adding onProgressController to interactor layer
>3d8960ef03ff76678267b8f1904ebcc21439975b TF-3372 Worker adds progress state to onProgressController in mobile/web
>32a7f1ff3c32cd49b7c4d82412d5cce9f860b15b TF-3372 Add onProgressController to get the progress of emptying task
>352131746af3eb0ac00e4e7ebbce5d48c23c86e8 TF-3372 Fix Empty Trash/Spam base on receivedAt
>dd19f3aabe90f5fa90f5fda42960a2a1b4b3aa8e [CI] Fix Ruby conflict version
>c3d7014af2c007b1200e2ed402e4f1539d5d5733 Bump version to v0.14.5
>cc50992e7e5fd30a29169224542f67b16ce394b4 TF-3334 Synchonize cache all the time have new changes even in search or not
>54454526a23afbe23ea15ed495e5d480271daff4 TF-3369 Fix cid image without disposition (#3373)
>7a5ebd4c6163ec3a53ec1185859e1bd8e2ccdbea TF-3372 Fix [MU] Emptying trash: Many unnecessary `Email/query + Email/get` requests
>1a9cb88a07f7c5bd3cb8767c8468e18e5983ee0a TF-3181 Handle on click contact support
>23a3474ee83fbb877af34095c38829900804efe0 TF-3181 Display contact support button on mobile app
>36a0f779a8a7e862a471c21e7a7503529bd7c8e6 TF-3181 Display contact support button on web app
>63b1b48195d1089eadfb7be5d029e59cc95bf781 fixup! TF-3332 Prevent refresh when switching mailbox
>39b8f66d21cad034b4a040b888d91670b2f83fc3 fixup! TF-3332 Prevent refresh when switching mailbox
>b42ad94027fcb78e74c5d4a093b7abdce7148b88 fixup! TF-3332 Prevent refresh when switching mailbox
>ee82f217ac24f7beb77123ecbbf9ddcdf7408924 TF-3332 Prevent refresh when switching mailbox
>f2dd7071fd5e2297b04ff9d1ac3044b7511a66c5 TF-3333 Remove `Mailbox/query` & `Mailbox/get` when performing display spam banner
>420df05711d1b0f47f7528a312098e65a95b64f4 TF-3334 Add more concurrence test cases for WebSocketQueueHandler
>d6c3ddcb9a8927392fb875cb5b0a67e3e495dfe3 TF-3334 Skip getting stored state in interactor when performing actions with email and mailbox
>65a52d500167b0a7f3b49223de3a276a959c0e4b TF-3334 Dispose web socket when close controller
>73fe16a70197e57e11e6179be0de7ef1656471f2 TF-3334 Use queue to handle multiple refresh changes mailbox from incoming websocket
>de0c6a96335cee7d4231c969100203512a76ff3a TF-3334 Remove `Email/get` of unsubscribe email action
>5cf704533475d4aa749d1e037d33e77b0e0becb6 TF-3334 Remove `Email/get` of mark as read & mark as star action
>ccf49dbf0218436fc60d8944e08859e09c93a93b TF-3334 Auto resynchronisation mailbox search view when receives websocket notification
>026e198346ff7b5151b0027ae1b81c42cf823d93 TF-3334 Remove resynchronisation when performing actions with mailbox
>9a6c40bce86077bdeff7b8cdc40be5eb77f723ff TF-3334 Auto resynchronisation search view when receives websocket notification on mobile & tablet responsive web
>48a549572e69cf45d3277bfc26aa4a42582a45af TF-3334 Remove resynchronisation when performing actions with emails
>918cfe74b89f42bfeb8174173829970c9b733da2 TF-3341 Integration test web socket for mobile
>3ee3913383f1133f07a809ab20ee92f397b35788 TF-3341 Enable web socket for mobile
>6baff90afb6d1f31fb31ea076824b6fc928de51b Format calendar event description
>9225f9fbd85389e5271ef9a67631487b38ebbbc5 TF-3336 Make Echo ping of web socket optional
>3f52c5d9b3182cbbddb5f01e4a748a561098453f Bump version to v0.14.4
>0b3f106dda035df45d307cbd5d6e1ddc1d8daed1 TF-3349 Add integration test for forward email
>200766571381699969e3adfec959e4a71a3c967e TF-3349 Escape messages when print email
>b3f3241dff8a8fd35e5c2a44da68d393d3fa14a9 TF-3349 Escape messages when forward and reply email
<050a885d0b4ed2cd1495c162ca4136348c715c20 Disable language tool check for text field
>617dbe02c8dcfde36ba74a8a76ea030895ad5baa Bump version to v0.14.3
>65720aa649ce733b0748b206c8f7420ee50bdf76 fixup! Disable language tool check for text field
>c2074065d27cde2440be1088b24fd6dcf4429144 Disable language tool check for text field
<8892c4be32cc05e0914ef19f12e028967fb36837 Update `docker-compose.yaml` reference
<ba1e41a8be1cb059e78f75202301f969b071d921 TF-3290 Only show reconnection confirm dialog when composer is opened
<7a6a02f58f5194c7f8c8ad3c047a5b8938ba598e TF-3181 Handle on click contact support
<01d2a9b71d937930be6ae247996a3ee1e21a5dc0 TF-3181 Display contact support button on mobile app
<cfc027522962fbf7092c8a15876d6c61f0aca6fc TF-3181 Display contact support button on web app
<b240937c6645fb77e0b85d4bb6a8198316d6cf0b TF-3278 Handle open app via deep link at MailboxDashboard screen
<3ecf9a826e328f50f99ae622d7a359f1d7e69287 TF-3278 Handle open app via deep link at Login screen
<a7bea499e100b946f31a814a091e9d08dc12a938 TF-3278 Handle open app via deep link at TwakeWelcome screen
<b71e89a78bfeb210307b418f0d316ee9816f9cbd TF-3278 Handle open tmail app deep link but it was installed but signed in with the other account
<487106c57aee3fca0720dfb4b8e469b1eae571b7 TF-3278 Handle open tmail app deep link but it was installed but signed in with the same account
<f2f551b5a346105a618cca123fb0f3ed0f19463d TF-3278 Handle open tmail app deep link but it was installed but not signed in
<e5405b56eca3bec1e41b36255743b697de9dc497 fixup! TF-3312 Change bundle name of Twake Mail
<27741005641004986def16dd25ff4c4cc7296eb2 TF-3312 Change bundle name of Twake Mail
<547cfd8d10aea12480db6bd51774166647e05db3 TF-3312 Hide system's confirm dialog when logging out
<11960d74be53b5e482c59d982617598ef19ffa64 TF-3312 Add logout confirmation dialog
<159769345707cdf8506f84c75cc481083111642d Fix patrol test on Firebase Test Lab
<aa9999535f592bc252877dc435cf01a539a85750 TF-3219 display limits of email recovery in a yellow banner and filter out invalid suggestions
<5094fd43dd37816590dec476cfc73c58b80b6c70 Hotfix identity creator view bug
<de940d68af3305ced3787a667fa1991d867c68a4 TF-3275 Fix FCM iOS foreground desync (#3314)
<47b842d2583fc6f4b1de12b9cbcf427e24a9090a TF-3189 composer now correctly encodes subaddresses
<20c4720c373928fc9e0759e228c219b2be70fe8f TF-3189 new `reply to` field in the mail composer
<d939ffb1cf82f4b96a8f9d1991357b0790060c8f TF-3189 new confirmation popup when enabling subaddressing for a folder
<0f61e3de8bdb8a7738ab261b46e7d300ebc04600 TF-3189 subaddressing features only shown if supported by the server
<810e304c1994c39525df467b316094db72d0faba TF-3189 new option to copy a folder's subaddress
<ed0b14c35c86558f1ac6e4809cf374bbd90750eb TF-3189 new option to enable/disable subaddressing for a personal folder
<fe2062d8a17e05f39e323dc589a4e3fb4de61d7f TF-3315 Fix TMail web could not display embedded table correctly
<9202925fc5adacb84ef9f42cc99f5151f0aacef7 fixup! TF-3296 Fix [SEARCH] Can't apply the "Starred" filter in search
<3a5f91b1a5a0795d8ff2e7631e4472ba65e06942 TF-3296 Fix [SEARCH] Can't apply the "Starred" filter in search
<6fff59ac6f5fa33496d8350edbbb1c3bfaf8991f TF-3295 Fix BLUE-BAR attendees mail addresses are not clickable
<c5b1e878f4a9ff7b15d4f14acdd33d3e032e483f TF-3294 Fix BLUE-BAR mail to attendees duplicated recipients
<e59fc1fa7e21e11d14dddd19cf801125cee32787 TF-3292 Write integration test for search emails by date and then sort them by relevance
<eaee8a0c08e3200b06f967783cf79c06a0bd4355 TF-3292 Fix [SEARCH] If I filter emails by date and then sort them by relevance, the filter isn't applied
<9c3954a73803a0f1921926f86b9761156430dc2f Delegate cache control from Flutter to browser (#3289)
<2128a6ea2b6a0405c9c1d2a3ced7247533098eec TF-3264 Fix composer drag drop all modes (#3279)
<c4757351b73ff7d9bdbae981338778774359f69f TF-3291 Fix [SEARCH] No results if you add > 1 address in the From field
<1a58542abd0176a93886f102ced087df848347a9 TF-3265 Fix double scrolling composer
<e50a23d0f1a1b14e806c202c8e4c3629e1751674 Update TMail backend docker to memory-1.0.0
<d339dd8ed26073beb60ab490dd391cd542370875 TF-3298 Fix blink when refresh email list (#3299)

Commits to be cherry-picked

  • 050a885 Disable language tool check for text field Commit exists
  • 8892c4b Update docker-compose.yaml reference
  • ba1e41a TF-3290 Only show reconnection confirm dialog when composer is opened
  • 7a6a02f TF-3181 Handle on click contact support
  • 01d2a9b TF-3181 Display contact support button on mobile app
  • cfc0275 TF-3181 Display contact support button on web app
  • b240937 TF-3278 Handle open app via deep link at MailboxDashboard screen
  • 3ecf9a8 TF-3278 Handle open app via deep link at Login screen
  • a7bea49 TF-3278 Handle open app via deep link at TwakeWelcome screen
  • b71e89a TF-3278 Handle open tmail app deep link but it was installed but signed in with the other account
  • 487106c TF-3278 Handle open tmail app deep link but it was installed but signed in with the same account
  • f2f551b TF-3278 Handle open tmail app deep link but it was installed but not signed in
  • e5405b5 fixup! TF-3312 Change bundle name of Twake Mail
  • 2774100 TF-3312 Change bundle name of Twake Mail
  • 547cfd8 TF-3312 Hide system's confirm dialog when logging out
  • 11960d7 TF-3312 Add logout confirmation dialog
  • 1597693 Fix patrol test on Firebase Test Lab
  • aa99995 TF-3219 display limits of email recovery in a yellow banner and filter out invalid suggestions
  • 5094fd4 Hotfix identity creator view bug
  • de940d6 TF-3275 Fix FCM iOS foreground desync (TF-3275 Fix FCM iOS foreground desync #3314)
  • 47b842d TF-3189 composer now correctly encodes subaddresses
  • 20c4720 TF-3189 new reply to field in the mail composer
  • d939ffb TF-3189 new confirmation popup when enabling subaddressing for a folder
  • 0f61e3d TF-3189 subaddressing features only shown if supported by the server
  • 810e304 TF-3189 new option to copy a folder's subaddress
  • ed0b14c TF-3189 new option to enable/disable subaddressing for a personal folder
  • fe2062d TF-3315 Fix TMail web could not display embedded table correctly
  • 9202925 fixup! TF-3296 Fix [SEARCH] Can't apply the "Starred" filter in search
  • 3a5f91b TF-3296 Fix [SEARCH] Can't apply the "Starred" filter in search
  • 6fff59a TF-3295 Fix BLUE-BAR attendees mail addresses are not clickable
  • c5b1e87 TF-3294 Fix BLUE-BAR mail to attendees duplicated recipients
  • e59fc1f TF-3292 Write integration test for search emails by date and then sort them by relevance
  • eaee8a0 TF-3292 Fix [SEARCH] If I filter emails by date and then sort them by relevance, the filter isn't applied
  • 9c3954a Delegate cache control from Flutter to browser (Delegate cache control from Flutter to browser #3289) Commit exists
  • 2128a6e TF-3264 Fix composer drag drop all modes (TF-3264 Fix composer drag drop all modes #3279)
  • c475735 TF-3291 Fix [SEARCH] No results if you add > 1 address in the From field
  • 1a58542 TF-3265 Fix double scrolling composer
  • e50a23d Update TMail backend docker to memory-1.0.0
  • d339dd8 TF-3298 Fix blink when refresh email list (TF-3298 Fix blink when refresh email list #3299)

@tddang-linagora tddang-linagora self-assigned this Jan 6, 2025
emmanuel-ferdman and others added 27 commits January 6, 2025 10:41
@hoangdat hoangdat changed the base branch from master to maintenance-v0.14.2 January 7, 2025 02:04
@dab246
Copy link
Member

dab246 commented Jan 7, 2025

Check cherry picked issue

  • TF-3290 Only show reconnection confirm dialog when composer is opened
  • TF-3181 Display contact support button
  • TF-3278 Handle open Tmail app deep link
  • TF-3312 Hide system's confirm dialog when logging out
  • Fix patrol test on Firebase Test Lab
  • TF-3219 display limits of email recovery in a yellow banner and filter out invalid suggestions
  • Hotfix identity creator view bug
  • TF-3275 Fix FCM iOS foreground desync (TF-3275 Fix FCM iOS foreground desync #3314)
  • TF-3189 Support subaddressing
  • TF-3315 Fix TMail web could not display embedded table correctly
  • TF-3296 Fix [SEARCH] Can't apply the "Starred" filter in search
  • TF-3295 Fix BLUE-BAR attendees mail addresses are not clickable
  • TF-3294 Fix BLUE-BAR mail to attendees duplicated recipients
  • TF-3292 Fix [SEARCH] If I filter emails by date and then sort them by relevance, the filter isn't applied
  • TF-3264 Fix composer drag drop all modes (TF-3264 Fix composer drag drop all modes #3279)
  • TF-3291 Fix [SEARCH] No results if you add > 1 address in the From field
  • TF-3265 Fix double scrolling composer
  • TF-3298 Fix blink when refresh email list (TF-3298 Fix blink when refresh email list #3299)

=> Work well

Copy link
Member

@dab246 dab246 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@hoangdat hoangdat changed the base branch from maintenance-v0.14.2 to master-candidate January 7, 2025 03:18
@hoangdat hoangdat merged commit b3119a8 into master-candidate Jan 8, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants