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

34369 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
98e0200b4a Function name 2021-06-17 14:21:50 -06:00
Travis Ralston
a687391b98 Switch order 2021-06-17 14:21:01 -06:00
Germain
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591 2021-06-17 16:41:00 +01:00
Michael Telatynski
7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Michael Telatynski
35e68b8aa5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 2021-06-17 15:45:32 +01:00
Michael Telatynski
f38cd38bd3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/structures/TimelinePanel.js
	src/components/views/context_menus/MessageContextMenu.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
 2021-06-17 15:31:06 +01:00
Michael Telatynski
017e0ba40f fix more private field accesses in tests 2021-06-17 15:23:29 +01:00
Michael Telatynski
2e73647a85 Fix tests by updating private field names and spies 2021-06-17 15:18:52 +01:00
J. Ryan Stinnett
07a0c3e450
Merge pull request #6211 from matrix-org/jryans/reply-scroll-release 
[Release] Keep composer reply when scrolling away from a highlighted event
 2021-06-17 15:12:54 +01:00
Germain Souquet
1597b2a971 Keep composer reply when scrolling away from a highlighted event 2021-06-17 15:07:59 +01:00
J. Ryan Stinnett
e69b2fb3be
Merge pull request #6210 from matrix-org/jryans/reply-preview-li-release 
[Release] Remove stray bullet point in reply preview
 2021-06-17 15:04:44 +01:00
J. Ryan Stinnett
1fcfec6a94
Merge pull request #6209 from matrix-org/jryans/nested-reply-perf-release 
[Release] Stop requesting null next replies from the server
 2021-06-17 15:04:36 +01:00
Germain Souquet
0367b5bcce remove stray bullet point in reply preview 2021-06-17 15:02:18 +01:00
J. Ryan Stinnett
7c6161d83a 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-17 15:00:13 +01:00
Michael Telatynski
3e38d92fa4 Fix up some more type defs 2021-06-17 14:49:27 +01:00
J. Ryan Stinnett
9f83846ecc Remove redundant word from GitHub Actions workflow 2021-06-17 14:35:33 +01:00
Michael Telatynski
02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Michael Telatynski
f929d2ee5f Typescript fixes due to MatrixEvent being TSified 2021-06-17 14:06:03 +01:00
Michael Telatynski
97e6599780
Merge pull request #6207 from matrix-org/t3chguy/ts/5 
Fix types in SlashCommands
 2021-06-17 12:15:16 +01:00
Michael Telatynski
cce4ccb157 Fix types in SlashCommands which assumed something was a promise but it wasn't 2021-06-17 11:37:06 +01:00
Germain
782adbc41e
Merge pull request #6190 from matrix-org/gsouquet/performance-tracking-markers 2021-06-17 10:27:33 +01:00
Germain
48e090abcc
Remove unnecessary comment 2021-06-17 10:20:43 +01: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
2f1abe251f
Merge pull request #6206 from matrix-org/gsouquet/fix-17672 
Remove stray bullet point in reply preview
 2021-06-17 08:58:47 +01:00
Germain Souquet
1a08af8ccf remove stray bullet point in reply preview 2021-06-17 08:45:09 +01:00
Jaiwanth
9e6b8ff9f5 Start implementation of plain text export 2021-06-17 10:46:08 +05:30
Robin Townsend
2750d64495 Merge branch 'develop' into event-tile-preview-fixes 2021-06-16 18:27:10 -04:00
Robin Townsend
79bf7bee56 Fix EventTilePreview display names 
Because of 91df392a2a, we now need to
additionally set rawDisplayName to properly fake our display name for an
event.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-16 18:23:44 -04: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
ad3aefad35
Merge pull request #6203 from matrix-org/jryans/nested-reply-perf 
Stop requesting null next replies from the server
 2021-06-16 20:17:53 +01:00
Michael Telatynski
100de336a1 i18n 2021-06-16 20:12:31 +01: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
e7fde2686f remove unused imports 2021-06-16 12:12:00 +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
Michael Telatynski
590ce56740 Use MultiInviter error messages in InviteDialog for room invites 2021-06-16 11:48:14 +01:00
Germain Souquet
9f8d04ab9a Fix passing variable down to evaluate context 2021-06-16 11:39:04 +01:00
Michael Telatynski
384bb3af2e Fix layout regression in the invite dialog for few results 2021-06-16 10:37:34 +01:00
Michael Telatynski
47ddd33d21 Remove explicit .js imports 2021-06-16 10:24:51 +01:00
Germain
40d384d9f9
Merge pull request #6200 from matrix-org/gsouquet/fix-17632 2021-06-16 10:21:02 +01:00
Michael Telatynski
27e27b7a87 Convert MultiInviter, RoomInvite and UserAddress to Typescript 2021-06-16 10:18:32 +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
Michael Telatynski
d4e376201f Break down the SpacePanel component 2021-06-16 09:44:37 +01:00
Michael Telatynski
bceee7978e improve naming of tests 2021-06-16 09:30:47 +01:00
Michael Telatynski
cee294f5a7 iterate PR 2021-06-16 09:23:06 +01:00