Commit Graph

62611 Commits (3ff5a511e5d13cac3c33f1043ab2e52f4d692bc3)

Author SHA1 Message Date
ElementRobot b9be840291 Reset matrix-react-sdk back to develop branch 2023-09-12 17:17:24 +01:00
ElementRobot 81b6320595 Merge branch 'master' into develop
# Conflicts:
#	package.json
#	yarn.lock
2023-09-12 17:16:37 +01:00
ElementRobot 189fa14c29 v1.11.41 2023-09-12 17:12:42 +01:00
ElementRobot ee254efcf3 Prepare changelog for v1.11.41 2023-09-12 17:12:42 +01:00
ElementRobot c9e5df4aa0 Upgrade matrix-js-sdk to 28.1.0 2023-09-12 17:06:29 +01:00
ElementRobot eec8b37c49 Upgrade matrix-react-sdk to 3.80.0 2023-09-12 17:06:18 +01:00
ElementRobot 6f8f97ba35 Reset matrix-js-sdk back to develop branch 2023-09-12 17:04:51 +01:00
ElementRobot da9321011f Resetting package fields for development 2023-09-12 17:00:10 +01:00
ElementRobot 6a4915ac98 Merge branch 'master' into develop
# Conflicts:
#	res/css/views/avatars/_BaseAvatar.pcss
2023-09-12 16:59:39 +01:00
ElementRobot fc01716588 v3.80.0 2023-09-12 16:58:37 +01:00
ElementRobot 62a32ed5b4 Prepare changelog for v3.80.0 2023-09-12 16:58:34 +01:00
ElementRobot 5cd6570a5d Upgrade matrix-js-sdk to 28.1.0 2023-09-12 16:56:34 +01:00
RMidhunSuresh 919580fd10
Rename setPhase to showOrHidePanel 2023-09-12 20:48:29 +05:30
Michael Telatynski 89fa7b4b39
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-12 15:36:22 +01:00
Andy Balaam 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
renovate[bot] 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
Michael Telatynski d00ba74aaa
Migrate more strings to translation keys (#11599) 2023-09-12 08:36:06 +01:00
Michael Telatynski 68e8fa7c8c
Tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-12 08:35:07 +01:00
Johannes Marbach 0583fc8090
Merge pull request #11600 from matrix-org/johannes/bring-back-cypress-cloud-parallelisation 2023-09-12 09:08:48 +02:00
Johannes Marbach c2133e37d0 Re-enable parallelisation via Cypress Cloud now that the cycle has renewed 2023-09-12 08:58:19 +02:00
Andy Balaam 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
Andy Balaam 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
Michael Telatynski e54dd60381
Update tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-11 17:55:32 +01:00
Michael Telatynski 0a36af7cc0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/cr/72 2023-09-11 17:50:26 +01:00
Michael Telatynski 623212ea0c
i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-11 17:49:01 +01:00
Charly Nguyen 5cf2e1514b
Use knock rooms sync to reflect the knock state (#11596)
Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net>
2023-09-11 16:33:40 +00:00
Charly Nguyen bb91df1d3c
Avoid rendering view-message link in RoomKnocksBar unnecessarily (#11598)
Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net>
2023-09-11 13:33:27 +00:00
Michael Telatynski 569832bc24
Handle ManagedHybrid widgets in `useRoomCall` and mark them in the widget state event
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-11 11:39:30 +01:00
R Midhun Suresh 3c6d8a2a28
Fix avatar in right panel not using the correct font (#11593)
* Fix style

* Remove previous fix
2023-09-11 09:27:12 +00:00
renovate[bot] 8837e5212a
Update dependency axe-core to v4.8.0 (#11585)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 09:02:41 +00:00
Andy Balaam a621dfa6c1
Expand a thread reply test to be more explicit (#11502) 2023-09-09 06:45:48 +00:00
Andy Balaam a4b861637f
Avoid using markAsRead where we don't need it (#11517)
* Avoid using markAsRead where we don't need it

* Review response
2023-09-08 13:07:26 +00:00
Andy Balaam 493d5083a8
Tests for reacting to thread roots (#11586) 2023-09-08 13:06:44 +00:00
Andy Balaam 728a3a751a
Tests for redactions in the main timeline (#11587) 2023-09-08 13:06:25 +00:00
Andy Balaam f1f8c6bf2c
Add waits in Spotlight Cypress tests, hoping this unflakes them (#11590)
Attempt to fix:

* https://github.com/vector-im/element-web/issues/26053
* https://github.com/vector-im/element-web/issues/26140
* https://github.com/vector-im/element-web/issues/26139
* https://github.com/vector-im/element-web/issues/26138
2023-09-08 12:08:21 +00:00
ElementRobot be3cb55f7d v1.11.41-rc.2 2023-09-08 12:08:13 +01:00
ElementRobot 0aa7368e5d Prepare changelog for v1.11.41-rc.2 2023-09-08 12:08:13 +01:00
ElementRobot 24d5457518 Upgrade matrix-react-sdk to 3.80.0-rc.2 2023-09-08 12:07:00 +01:00
ElementRobot ffbc52aa61 v3.80.0-rc.2 2023-09-08 11:58:24 +01:00
ElementRobot 1df268e017 Prepare changelog for v3.80.0-rc.2 2023-09-08 11:58:23 +01:00
ElementRobot 06ab698269
[Backport staging] Fix vertical alignment of default avatar font (#11592)
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-08 10:56:59 +00:00
ElementRobot 9834686e90
[Backport staging] Fix avatars in public room & space search being flex shrunk (#11591)
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-08 10:47:50 +00:00
Michael Telatynski badff8cae5
Fix copy-res
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-08 11:24:22 +01:00
Michael Telatynski 0ee2eac0e5
Fix vertical alignment of default avatar font (#11582) 2023-09-08 11:01:21 +01:00
Michael Telatynski 9479433b0e
Fix avatars in public room & space search being flex shrunk (#11580) 2023-09-08 11:01:13 +01:00
ElementRobot 6dc6c80cc5
Merge pull request #26141 from vector-im/actions/localazy-download
Localazy Download
2023-09-08 11:59:10 +02:00
Michael Telatynski e84e161034
yarn.lock
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-08 10:51:22 +01:00
Michael Telatynski 5a534e4010
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-08 10:49:41 +01:00
Michael Telatynski 34d7eca8f3
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-08 10:45:32 +01:00
Michael Telatynski 472c07c0a8
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-08 10:43:44 +01:00