744ff5ca9a
Reset matrix-js-sdk back to develop branch
2023-09-15 12:13:30 +01:00
0c0f4cfdbd
Merge branch 'master' into develop
2023-09-15 12:13:08 +01:00
8436c91279
v1.11.43
2023-09-15 12:09:01 +01:00
c52c62ebc0
Prepare changelog for v1.11.43
2023-09-15 12:09:00 +01:00
2f69013f6d
Merge branch 'develop' into germain-gg/notifications-labs
2023-09-15 16:28:59 +05:30
dce42d32e7
Merge pull request #11495 from matrix-org/germain-gg/fix-right-panel-member
...
Move ViewUser action callback to RoomView
2023-09-15 11:37:26 +01:00
1e303652cc
Merge branch 'develop' into germain-gg/room-ui-develop
2023-09-15 09:14:50 +02:00
491b43ef09
Migrate more strings to translation keys ( #11606 )
2023-09-14 18:47:29 +01:00
3608d52c4a
Default intentional mentions ( #11602 )
...
* Default intentional mentions
* wait for autocomplete to settle before submitting edit
* lint
* Update strings
---------
Co-authored-by: Kerry Archibald <kerrya@element.io>
2023-09-14 11:36:15 +00:00
610f9396bb
Fix broken tests
2023-09-14 16:55:14 +05:30
1d0c7046c0
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-14 11:39:17 +01:00
e301fe474b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/cr/72
...
# Conflicts:
# test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap
2023-09-14 11:33:22 +01:00
1ba419fe11
Merge branch 'develop' into germain-gg/notifications-labs
2023-09-14 12:14:08 +05:30
237038aa56
Fix RoomView::onSearchClick toggle behaviour ( #11605 )
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-13 19:23:33 +00:00
361941e5d4
Reset matrix-js-sdk back to develop branch
2023-09-13 13:00:58 +01:00
dc6c7022fc
Merge branch 'master' into develop
2023-09-13 12:59:06 +01:00
60585cce94
v1.11.42
2023-09-13 12:47:26 +01:00
3a6a603778
Prepare changelog for v1.11.42
2023-09-13 12:47:25 +01:00
28a8c1cd1e
Upgrade matrix-react-sdk to 3.80.1
2023-09-13 12:44:38 +01:00
da1daa1b18
Reset matrix-js-sdk back to develop branch
2023-09-13 12:02:40 +01:00
2d5e486db6
Merge branch 'master' into develop
2023-09-13 12:01:35 +01:00
0a7b3718a7
v3.80.1
2023-09-13 12:01:18 +01:00
4bacfa41f5
Prepare changelog for v3.80.1
2023-09-13 12:01:15 +01:00
4deb864322
Update Compound to fix Firefox-specific avatar regression ( #11604 )
2023-09-13 11:32:47 +01:00
f7fa9facd7
Let code in RoomView handle all cases
2023-09-13 14:58:01 +05:30
8c35abbb04
Migrate more strings to translation keys ( #11601 )
2023-09-13 09:30:56 +01:00
564d4eda7c
Change binary to use ( #11486 )
2023-09-12 19:00:34 +00:00
b9be840291
Reset matrix-react-sdk back to develop branch
2023-09-12 17:17:24 +01:00
81b6320595
Merge branch 'master' into develop
...
# Conflicts:
# package.json
# yarn.lock
2023-09-12 17:16:37 +01:00
189fa14c29
v1.11.41
2023-09-12 17:12:42 +01:00
ee254efcf3
Prepare changelog for v1.11.41
2023-09-12 17:12:42 +01:00
c9e5df4aa0
Upgrade matrix-js-sdk to 28.1.0
2023-09-12 17:06:29 +01:00
eec8b37c49
Upgrade matrix-react-sdk to 3.80.0
2023-09-12 17:06:18 +01:00
6f8f97ba35
Reset matrix-js-sdk back to develop branch
2023-09-12 17:04:51 +01:00
da9321011f
Resetting package fields for development
2023-09-12 17:00:10 +01:00
6a4915ac98
Merge branch 'master' into develop
...
# Conflicts:
# res/css/views/avatars/_BaseAvatar.pcss
2023-09-12 16:59:39 +01:00
fc01716588
v3.80.0
2023-09-12 16:58:37 +01:00
62a32ed5b4
Prepare changelog for v3.80.0
2023-09-12 16:58:34 +01:00
5cd6570a5d
Upgrade matrix-js-sdk to 28.1.0
2023-09-12 16:56:34 +01:00
919580fd10
Rename setPhase to showOrHidePanel
2023-09-12 20:48:29 +05:30
89fa7b4b39
Iterate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-12 15:36:22 +01:00
b1f455eb2d
Assert that the thread is unread after an edit ( #11504 )
...
* Expand a thread reply test to be more explicit
* Add an assertion that the thread is read after I read it
* Assert that the thread is unread after an edit
2023-09-12 11:41:04 +00:00
14746004b5
Update babel monorepo to v7.22.17 ( #26121 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-12 10:11:23 +01:00
d00ba74aaa
Migrate more strings to translation keys ( #11599 )
2023-09-12 08:36:06 +01:00
68e8fa7c8c
Tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-12 08:35:07 +01:00
0583fc8090
Merge pull request #11600 from matrix-org/johannes/bring-back-cypress-cloud-parallelisation
2023-09-12 09:08:48 +02:00
c2133e37d0
Re-enable parallelisation via Cypress Cloud now that the cycle has renewed
2023-09-12 08:58:19 +02:00
953195eb5b
Add an assertion that the thread is read after I read it ( #11503 )
...
* Expand a thread reply test to be more explicit
* Add an assertion that the thread is read after I read it
2023-09-12 03:23:11 +00:00
a4156add49
Tests for thread roots and reading history ( #11588 )
...
* Minor improvements to unread tests
* Test for reading an older message in a room
* Test for reading an old message in a thread
Also a mostly-trivial test for read status being preserved over
restarts.
* Give the reason for a failing test
* Fix a failing test by making it wait for a thread to be read
* More tests for thread roots
2023-09-12 03:22:04 +00:00
e54dd60381
Update tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-11 17:55:32 +01:00
RiotRobot