mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 00:51:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
33981 commits 219 branches 562 tags 474 MiB
Commit graph

13876 commits

Author SHA1 Message Date
Šimon Brandner
7b6c3aec63
Change some styling to better match the designs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 16:33:00 +02:00
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
J. Ryan Stinnett
6e827ad4c9
Merge pull request #6204 from robintown/forward-dialog-display-name 
Fix forward dialog message preview display names
 2021-06-17 10:10:54 +01:00
Germain Souquet
1a08af8ccf remove stray bullet point in reply preview 2021-06-17 08:45:09 +01:00
Robin Townsend
ce57b66c91 Fix forward dialog message preview display names 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-16 18:17:25 -04:00
J. Ryan Stinnett
8f02ca8ce9 Stop requesting null next replies from the server 
A recent change (47e007e08f) introduced a
regression where we failed to check whether a reply thread has a next reply.
This meant that we would end up sending `/context/undefined` requests to the
server for every reply thread on every room view.

Fixes https://github.com/vector-im/element-web/issues/17563
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6079
 2021-06-16 18:04:41 +01:00
Michael Telatynski
ccf30ed94c
Merge pull request #6202 from matrix-org/t3chguy/fix/17669 2021-06-16 12:46:44 +01:00
Michael Telatynski
ab964339d2 Add another setState skip to prevent redundant state updates 2021-06-16 12:11:17 +01:00
Michael Telatynski
626d575820 tidy AuxPanel TS 2021-06-16 12:07:58 +01:00
Michael Telatynski
d87325ae6a Small cleanup around the room status bar and auxpanel to prevent redundant state updates 2021-06-16 12:06:41 +01:00
Michael Telatynski
e3a6ce13cd Fix tight-loop update issue caused by a broken shouldComponentUpdate 2021-06-16 12:04:37 +01:00
Michael Telatynski
deb2e8d679 Remove unused methods 2021-06-16 12:04:01 +01:00
Germain Souquet
069e2e13cf Migrate MessageTimestamp to TypeScript 2021-06-16 10:01:30 +01:00
Germain Souquet
a5d608f2af Keep composer reply when scrolling away from a highlighted event 2021-06-16 10:01:23 +01:00
Germain Souquet
7310d35d7f Merge branch 'develop' into gsouquet/benchmark-tracking 2021-06-15 11:45:11 +01:00
Germain Souquet
011a2f2bb6 Remove test data for develop pipeline 2021-06-15 10:59:57 +01:00
Germain Souquet
d5f7f524e1 Slow down registration process 2021-06-15 10:24:07 +01:00
Michael Telatynski
6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566 2021-06-14 23:27:51 +01:00
Michael Telatynski
539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-14 22:22:30 +01:00
Michael Telatynski
430ec8cecd Clear selected rooms after operation in manage space rooms 2021-06-14 22:18:18 +01:00
Michael Telatynski
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Travis Ralston
951fbf4a1a fix import 2021-06-14 13:38:43 -06:00
Travis Ralston
2eafe132b8 Move various createRoom types to the js-sdk 2021-06-14 13:31:58 -06:00
Šimon Brandner
e260e8671f
Inline display name into return 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-11 15:14:16 +02:00
Germain Souquet
b1824ce579 fix HTML tag for Event Tile when not rendered in a list 2021-06-11 11:34:53 +01:00
Germain
88e337b89c
Merge pull request #5929 from matrix-org/gsouquet-e2ee-warning 2021-06-10 14:58:31 +01:00
Germain
79b8fbc2a9
Add indentation for unencrypted warning text 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-06-10 14:21:48 +01:00
Germain
0a6cd6a758
Merge pull request #6171 from matrix-org/gsouquet/fix-17505 
Fix expanding last collapsed sticky session when zoomed in
 2021-06-10 12:44:57 +01:00
Germain Souquet
9731e275f8 cater for an undefined MatrixClient on rooms 2021-06-10 12:15:55 +01:00
Germain Souquet
6606a1142d Update unencrypted room warning copy 2021-06-10 11:29:10 +01:00
Germain Souquet
7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Germain Souquet
4f649f290c Migrate RoomSettingsDialog to TypeScript 2021-06-10 10:46:54 +01:00
Germain Souquet
c2d1eb3e8e Merge branch 'develop' into gsouquet-e2ee-warning 2021-06-10 10:25:20 +01:00
Šimon Brandner
fdda534053
Merge branch 'develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 19:23:14 +02:00
Germain Souquet
b4cb275ca1 Fix expanding last collapsed sticky session when zoomed in 2021-06-09 17:59:41 +01:00
Germain
91a88f25a8
Merge pull request #6168 from matrix-org/gsouquet/fix-17586 
Revert refreshStickyHeaders optimisations
 2021-06-09 16:34:11 +01:00
J. Ryan Stinnett
9aaf506ad5
Merge pull request #6169 from matrix-org/jryans/rebuild-the-sky 
Restore read receipt animation from event to event
 2021-06-09 16:16:17 +01:00
J. Ryan Stinnett
c6972c4535 Fix spelling 2021-06-09 15:53:38 +01:00
J. Ryan Stinnett
e566704bdf Remove redundant early return 2021-06-09 15:48:30 +01:00
J. Ryan Stinnett
b43315c6c1 Restore read receipt animation from event to event 
This restores expected read receipt animation by always including the positioned
parent of read receipts. I imagine there's something smarter we could be doing,
but for now, at least least get back to expected behaviour.

Fixes https://github.com/vector-im/element-web/issues/17561
 2021-06-09 15:46:10 +01:00
Germain Souquet
927de02a8e Revert refreshStickyHeaders optimisations 2021-06-09 14:59:55 +01:00
Germain Souquet
ceed6ecbe8 Restore Page Up/Down key bindings when focusing the composer 2021-06-09 14:03:31 +01:00
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Michael Telatynski
2938bfbadf
Merge pull request #6162 from matrix-org/t3chguy/fix/17596 
Fix upgrade to element home button in top left menu
 2021-06-08 17:48:45 +01:00
Michael Telatynski
90982f9b3f Fix upgrade to element home button in top left menu 2021-06-08 17:31:08 +01:00
Michael Telatynski
f34a2e61bc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-06-08 16:54:49 +01:00
Michael Telatynski
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553 2021-06-08 16:45:35 +01:00
Michael Telatynski
93eb9feaa7 iterate PR based on feedback 2021-06-08 16:42:58 +01:00
Michael Telatynski
f84ee22769 Add comment 2021-06-08 16:36:53 +01:00
David Baker
399be4fa5d
Merge pull request #6161 from matrix-org/dbkr/widget_load_error 
Better handling for widgets that fail to load
 2021-06-08 16:28:44 +01:00