mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
26334 commits 203 branches 553 tags 406 MiB
Commit graph

26334 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
7390baf451 Merge branch 'develop' into element 2020-07-08 18:09:38 +02:00
Travis Ralston
eb38d80bd5
Merge pull request #4920 from matrix-org/joriks/room-list-priorities 
Enable options to favourite and low priority rooms
 2020-07-08 10:08:02 -06:00
Bruno Windels
d5747ad6c0 Merge branch 'develop' into element 2020-07-08 18:07:45 +02:00
Travis Ralston
0368bff5b1
Merge pull request #4904 from matrix-org/joriks/room-list-voip 
Move voip previews to bottom right corner
 2020-07-08 10:07:42 -06:00
Bruno Windels
7da2b5d92f fix muted video icon center 2020-07-08 18:06:11 +02:00
Bruno Windels
1acf9edb3d Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element 2020-07-08 18:03:22 +02:00
Jorik Schellekens
5ba64aa4e1 Back to defaul orientation 2020-07-08 17:03:08 +01:00
Bruno Windels
571bd30898 update call icons 2020-07-08 18:02:30 +02:00
Jorik Schellekens
9dd28a9ce0 semi 2020-07-08 17:02:26 +01:00
Bruno Windels
99bce536cd update call icons 2020-07-08 17:30:50 +02:00
Jorik Schellekens
4ae64aff9a lint line length 2020-07-08 16:14:04 +01:00
Jorik Schellekens
6ca7150533 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into 
joriks/room-list-priorities
 2020-07-08 16:08:55 +01:00
Jorik Schellekens
53bdddfcdd Fix discrepancies with style 2020-07-08 16:07:38 +01:00
Jorik Schellekens
fb6791e221
Merge pull request #4923 from matrix-org/joriks/room-list-focus-search 
Focus room filter on openSearch
 2020-07-08 15:20:08 +01:00
Travis Ralston
536238a9a3
Merge pull request #4924 from matrix-org/travis/room-list/resizable 
Swap out the resizer lib for something more stable in the new room list
 2020-07-08 08:05:00 -06:00
Travis Ralston
3912f2d21c Merge remote-tracking branch 'origin/develop' into travis/room-list/resizable 2020-07-08 07:55:10 -06:00
Travis Ralston
b4f3b8ab11 Use the right variables when detecting max height 2020-07-08 07:53:55 -06:00
Travis Ralston
b2abe61fc5 clarify which NumberSize to use 2020-07-08 07:51:48 -06:00
Travis Ralston
9b0eeae2eb Clarify who is meant to use the polyfill 2020-07-08 07:51:04 -06:00
Bruno Windels
7dad56ca86 Merge branch 'develop' into element 2020-07-08 15:50:17 +02:00
Bruno Windels
269c30f8e8 Revert "also blur the sticky headers" 
This reverts commit 82e0816d86.
 2020-07-08 15:47:01 +02:00
Bruno Windels
989e4a9ceb
Merge pull request #4912 from matrix-org/bwindels/bettersticky 
Add wrapper to room list so sticky headers don't need a background
 2020-07-08 13:34:01 +00:00
Bruno Windels
a361ac3f83 make collapsing/expanding the first header work again 2020-07-08 15:11:47 +02:00
Bruno Windels
a8085f4e3b remove background on sticky headers 2020-07-08 14:50:08 +02:00
Bruno Windels
0d94cfa97a put sticky headers in padding of wrapper 
this way they don't need a background, as the list is already clipped
 2020-07-08 14:49:38 +02:00
Bruno Windels
75751abc60 add wrapper we can then add padding to when sticking headers 2020-07-08 14:49:04 +02:00
Michael Telatynski
5d23e4216e
Merge pull request #4908 from matrix-org/t3chguy/room-list/12345 
New room list view_room show_room_tile support
 2020-07-08 13:34:28 +01:00
Michael Telatynski
ec54d509e5 remove stale debug log 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-08 13:24:40 +01:00
Michael Telatynski
d7ad555c12
Merge pull request #4871 from matrix-org/t3chguy/room-list/3 
Convert Context Menu to TypeScript
 2020-07-08 13:24:10 +01:00
Michael Telatynski
5ef93686d9
Merge pull request #4925 from matrix-org/t3chguy/room-list/14352 
Use html innerText for org.matrix.custom.html m.room.message room list previews
 2020-07-08 13:23:58 +01:00
Michael Telatynski
64d7580494
Merge pull request #4913 from matrix-org/t3chguy/fix/14363 
Fix MELS summary of 3pid invite revocations
 2020-07-08 13:23:45 +01:00
Michael Telatynski
fe04846c6d
Merge pull request #4926 from matrix-org/t3chguy/room-list/14318 
Fix sticky headers being left on display:none if they change too quickly
 2020-07-08 13:23:13 +01:00
Michael Telatynski
7b115056b0 Fix sticky headers being left on display:none if they change too quickly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-08 09:21:33 +01:00
Michael Telatynski
faa9124f2b Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345 
 Conflicts:
	src/components/views/rooms/RoomTile2.tsx
 2020-07-08 08:57:01 +01:00
Michael Telatynski
8d5d3b1c92 Use html innerText for org.matrix.custom.html m.room.message room list previews 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-08 08:50:25 +01:00
Michael Telatynski
c5e8a0b5af Convert HtmlUtils to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-08 08:40:58 +01:00
Travis Ralston
15b6a273c9 Swap out the resizer lib for something more stable 
react-resizer appears to be okay at tracking state, but it often desyncs from reality. re-resizer is more maintained and more broadly used (160k downloads vs 110k), and appears to generally do a better job of tracking the cursor.

The new library has some oddities though, such as deltas, touch support (hence the polyfill), and calling handles "Enable".

For https://github.com/vector-im/riot-web/issues/14022
 2020-07-07 22:21:00 -06:00
Travis Ralston
7f757cd0f3
Merge pull request #4922 from matrix-org/joriks/room-list-fix-resize-gaps 
Fix gaps under resize handle
 2020-07-07 22:20:01 -06:00
Jorik Schellekens
8679d90703 lint semi 2020-07-08 00:27:29 +01:00
Jorik Schellekens
70c1bf3e5c Focus room filter on openSearch 2020-07-08 00:25:43 +01:00
Jorik Schellekens
0906da01ba Fix gaps 2020-07-08 00:18:58 +01:00
Jorik Schellekens
92dec8ddd8 Fix gaps 2020-07-08 00:16:24 +01:00
Travis Ralston
1b89e75a5d
Merge pull request #4921 from matrix-org/travis/room-list/fix-dms 
Fix DM handling in new room list
 2020-07-07 16:19:48 -06:00
Jorik Schellekens
f4e05142db lint 2020-07-07 23:17:56 +01:00
Travis Ralston
774e32ecf0 Fix DM handling in new room list 2020-07-07 16:16:46 -06:00
Jorik Schellekens
b3f50b6e17 Enable options to favourite and low priority rooms 2020-07-07 23:14:04 +01:00
Travis Ralston
85e018111b
Merge pull request #4918 from matrix-org/travis/room-list/respect-old-settings 
Respect and fix understanding of legacy options in new room list
 2020-07-07 15:19:56 -06:00
Travis Ralston
3dfb9711ed
Merge pull request #4916 from matrix-org/travis/room-list/dm-handle 
Ensure DMs are not lost in the new room list, and clean up tag logging
 2020-07-07 15:14:27 -06:00
Travis Ralston
3e2ae2b30d
Merge pull request #4915 from matrix-org/travis/fix-setting-spam 
Mute "Unknown room caused setting update" spam
 2020-07-07 15:13:39 -06:00
Travis Ralston
f4d22865c5
Merge pull request #4917 from matrix-org/travis/room-list/encrypted 
Remove comment claiming encrypted rooms are handled incorrectly in the new room list
 2020-07-07 15:13:28 -06:00