PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
47342 commits 1 branch 0 tags 338 MiB
Commit graph

47342 commits

This branch
This branch
All branches
Author SHA1 Message Date
RMidhunSuresh
2f69013f6d
Merge branch 'develop' into germain-gg/notifications-labs 2023-09-15 16:28:59 +05:30
Andy Balaam
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
Michael Telatynski
491b43ef09
Migrate more strings to translation keys (#11606) 2023-09-14 18:47:29 +01:00
Johannes Marbach
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
RMidhunSuresh
610f9396bb
Fix broken tests 2023-09-14 16:55:14 +05:30
Michael Telatynski
1d0c7046c0
i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-09-14 11:39:17 +01:00
Michael Telatynski
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
RMidhunSuresh
1ba419fe11
Merge branch 'develop' into germain-gg/notifications-labs 2023-09-14 12:14:08 +05:30
Michael Telatynski
237038aa56
Fix RoomView::onSearchClick toggle behaviour (#11605) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-09-13 19:23:33 +00:00
RiotRobot
da1daa1b18 Reset matrix-js-sdk back to develop branch 2023-09-13 12:02:40 +01:00
RiotRobot
2d5e486db6 Merge branch 'master' into develop 2023-09-13 12:01:35 +01:00
RiotRobot
0a7b3718a7 v3.80.1 2023-09-13 12:01:18 +01:00
RiotRobot
4bacfa41f5 Prepare changelog for v3.80.1 2023-09-13 12:01:15 +01:00
Michael Telatynski
4deb864322
Update Compound to fix Firefox-specific avatar regression (#11604) 2023-09-13 11:32:47 +01:00
RMidhunSuresh
f7fa9facd7
Let code in RoomView handle all cases 2023-09-13 14:58:01 +05:30
Michael Telatynski
8c35abbb04
Migrate more strings to translation keys (#11601) 2023-09-13 09:30:56 +01:00
Till
564d4eda7c
Change binary to use (#11486) 2023-09-12 19:00:34 +00: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
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
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
0ee2eac0e5
Fix vertical alignment of default avatar font (#11582) 2023-09-08 11:01:21 +01:00