OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
38,707 Commits
202 Branches
553 Tags
428 MiB
Commit Graph

38707 Commits (ac23afe9f1a8f4396a34ade5d3dfa6995682c810)

Author SHA1 Message Date
Germain Souquet ac23afe9f1 Allow EventTile to be rendered with mock events 2021-10-15 15:36:06 +01:00
Germain cee0d6894f
Merge pull request #6951 from matrix-org/gsouquet/fix-thread-root-hidden 2021-10-15 15:00:17 +01:00
Germain Souquet 93fc24c875 Adding renderThreadInfo comment to explain data accessor 2021-10-15 14:47:02 +01:00
Germain Souquet 904147b194 Merge branch 'develop' into gsouquet/fix-thread-root-hidden 2021-10-15 14:45:11 +01:00
Germain 3ec05c9cbd
Merge pull request #6952 from matrix-org/gsouquet/display-new-thread 2021-10-15 14:41:58 +01:00
Dariusz Niemczyk f8c516d927
Add new thread message preview (#18958) (#6953) 
Closes https://github.com/vector-im/element-web/issues/18958
 2021-10-15 14:29:17 +01:00
Andy Balaam 9c753765d5
Merge pull request #6955 from andybalaam/table-for-devicespanel 
Switch DevicesPanel to use table (for screen readers)
 2021-10-15 14:16:45 +01:00
Andy Balaam 690893ea6b Merge duplicate CSS selectors 2021-10-15 13:32:39 +01:00
Germain f0ff3a26cc
Merge pull request #6954 from aaronraimist/download-tooltip 2021-10-15 11:57:39 +01:00
Andy Balaam 7edec291ac Switch DevicesPanel to use table (for screen readers) 2021-10-15 11:50:49 +01:00
Aaron Raimist 8cdb1c667d Fix tooltip when downloading unencrypted file 2021-10-15 05:23:59 -05:00
Germain Souquet 6baa6c8f65 Listen to new thread to render info on timeline 2021-10-15 11:08:33 +01:00
Germain af55ac7b8c
Merge pull request #6950 from matrix-org/gsouquet/threads-replies-compat 
Add 'm.thread' relation to replies when replying to a threaded event
 2021-10-15 10:27:40 +01:00
Germain Souquet 17c4cc91af Reconcile threads root with its children before displaying it 2021-10-15 10:26:04 +01:00
Germain Souquet 3dcf0d0b7e Fix incorrect logic to hide thread relations 2021-10-15 10:25:42 +01:00
Germain 2ad11b3af7
Merge pull request #6949 from matrix-org/gsouquet/threads-relations 2021-10-15 08:58:57 +01:00
Germain Souquet 99ad603d91 Merge branch 'develop' into gsouquet/threads-relations 2021-10-15 08:43:51 +01:00
Germain Souquet 5fccbd4ef7 Remove auto-import 2021-10-14 17:40:00 +01:00
Germain Souquet 378536ee2a Add 'm.thread' relation for replies to a threaded event 2021-10-14 17:22:06 +01:00
Germain Souquet d315641056 Make threads use 'm.thread' relation 2021-10-14 17:04:27 +01:00
Dariusz Niemczyk 2dd6dddc67
Fix incorrect liveTimeline reference (#6948) 
Fixes https://github.com/vector-im/element-web/issues/19400
 2021-10-14 15:37:56 +00:00
Dariusz Niemczyk c31bd8c647
Remove unnecessary adapter in ThreadPanel-test.tsx (#6946) 2021-10-14 15:42:54 +01:00
Dariusz Niemczyk 562a880c7d
Create room threads list view (#6904) 
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads

In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
 2021-10-14 15:27:35 +02:00
Michael Telatynski 6bb47ec710
Merge pull request #6945 from matrix-org/t3chguy/fix/19390 2021-10-14 13:40:27 +01:00
Michael Telatynski 069a8d05f1 Space Room View should react to join rule changes down /sync 2021-10-14 12:06:24 +01:00
Michael Telatynski 4d8346f364
Merge pull request #6884 from matrix-org/t3chguy/fix/19010 2021-10-14 11:11:29 +01:00
Michael Telatynski 020eca6922 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19010 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/rooms/MemberList.tsx
	src/components/views/rooms/RoomList.tsx
 2021-10-14 11:05:29 +01:00
Michael Telatynski 4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969 2021-10-14 09:59:34 +01:00
Michael Telatynski a37c10b256
Merge pull request #6920 from matrix-org/t3chguy/fix/17410 2021-10-14 09:58:45 +01:00
Michael Telatynski 53d7c9d2e5
Merge pull request #6921 from matrix-org/t3chguy/fix/19003.1 2021-10-14 09:58:28 +01:00
Michael Telatynski 2a3c483f96
Merge pull request #6919 from matrix-org/t3chguy/fix/19146 2021-10-14 09:58:19 +01:00
James Salter 1f7d07ab6c
Merge pull request #6942 from SimonBrandner/fix/autoplay-setting 
Don't `setValue()` if that would lead to setting a `null`/`undefined`
 2021-10-14 09:30:43 +01:00
Šimon Brandner 9533f7b0b9
Don't setValue() if that would lead to setting a null/undefined 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-13 19:47:49 +02:00
Travis Ralston ea7257698c
Merge pull request #6934 from matrix-org/travis/labs/polls 
Add feature flag for polls and placeholder dialog
 2021-10-13 11:28:53 -06:00
Travis Ralston 3643359c15
Merge pull request #6922 from matrix-org/travis/hide-buttons-customisation 
Add customisation point for visibility of invites and room creation
 2021-10-13 11:25:52 -06:00
Andy Balaam e40413fa99
Merge pull request #6940 from andybalaam/devicespanel-css-in-devicespanel 
Move the required CSS for DevicesPanel into its own scss file
 2021-10-13 16:48:10 +01:00
David Baker ed9d006615
Merge pull request #6939 from matrix-org/dbkr/fix_room_list_on_unsent_message 
Fix bug where room list would get stuck showing no rooms
 2021-10-13 15:50:31 +01:00
Šimon Brandner 15076ce796
Fix issues with custom themes (#6937) 
Fallback to non-custom colors in custom themes

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-13 16:43:01 +02:00
David Baker c2ed27a1b2 Typo 2021-10-13 15:42:57 +01:00
Travis Ralston a539eada69
Merge pull request #6933 from matrix-org/travis/upstream/fix-imports 
Fix bad imports to js-sdk
 2021-10-13 07:47:36 -06:00
David Baker 0332bc99cb Fix bug where room list would get stuck showing no rooms 
If you had an unsent message in a room that was in a sublist with
the 'Show rooms with unread messages first' option enabled, the
room list would show no rooms next time you restarted element and
get stuck that way.

This was because there was a different notification category for
rooms with unsent messages but the algorithm is hard-coded to add
only a fixed set of categories to its list, and it missed 'unsent',
so it NPEed when it encountered a room with an unsent message.

This just adds the category (assuming that we want to show rooms
with unsent messages first). It doesn't make it less hard-coded, or
fix the fact that an exception in the room list code causes everything
to break.

Fixes https://github.com/vector-im/element-web/issues/19373
 2021-10-13 14:39:09 +01:00
Andy Balaam 4e9a20db21 Move the required CSS for DevicesPanel into its own scss file 
Signed-off-by: Andy Balaam <andyb@element.io>
 2021-10-13 13:55:01 +01:00
Dariusz Niemczyk bc336abf47
Fix missing snapshot serializer&enzyme init (#6932) 2021-10-13 11:09:43 +01:00
Travis Ralston ad53662704 add comma 2021-10-12 15:26:22 -06:00
Travis Ralston 71c5b02390 Add feature flag for polls and placeholder dialog 
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
 2021-10-12 15:13:56 -06:00
Travis Ralston d99660d420 Add customisation point for visibility of invites and room creation 
Fixes https://github.com/vector-im/element-web/issues/19331
 2021-10-12 14:33:29 -06:00
Travis Ralston 8873c75567 Fix bad imports to js-sdk 2021-10-12 13:51:24 -06:00
Michael Telatynski 3417c03f41
Merge pull request #6931 from matrix-org/t3chguy/fix/19350 2021-10-12 17:51:55 +01:00
Michael Telatynski c141c740d8
Merge pull request #6928 from matrix-org/t3chguy/fix/18883 2021-10-12 17:51:45 +01:00
Michael Telatynski 4416212d0b
Merge pull request #6926 from matrix-org/t3chguy/fix/18231 2021-10-12 14:03:12 +01:00