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

4107 commits

Author SHA1 Message Date
Robin Townsend
b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael Telatynski
ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571 
Fix Stickerpicker context menu
 2021-06-07 22:21:19 +01:00
Michael Telatynski
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps 2021-06-07 13:12:11 +01:00
Germain
ea6904ce2a
Fix local echo comment for scroll tokens 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-07 12:37:11 +01:00
Germain Souquet
d111f4cbb1 Merge branch 'develop' into gsouquet/fix-files-scroll-token 2021-06-07 12:25:08 +01:00
Germain Souquet
a6ddffe74c Add scroll token to file and notif event tiles 2021-06-07 09:26:42 +01:00
Michael Telatynski
31d308a1fb Fix Stickerpicker context menu 2021-06-07 09:22:47 +01:00
Robin Townsend
903d4d252a Add optimized function to determine whether event has text to display 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 23:06:56 -04:00
Robin Townsend
ea2120bdfd Fix timestamps 
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 01:55:01 -04:00
Robin Townsend
a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
J. Ryan Stinnett
ab96d5f8af Repair event status position in timeline 
https://github.com/matrix-org/matrix-react-sdk/pull/6079 caused a regression in
the event status indicator. The `mx_EventTile_msgOption` container was folded
into the avatars code path, but the event status is a special case of this, so
it now needs to also have this container to preserve its positioning.

Fixes https://github.com/vector-im/element-web/issues/17552
 2021-06-04 11:54:58 +01:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
Germain
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event 
Fix mx_Event containment rules and empty read avatar row
 2021-06-03 16:38:55 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Michael Telatynski
83d223475b delint imports 2021-06-03 08:41:22 +01:00
Germain Souquet
a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski
53fc475539
Update src/components/views/rooms/PinnedEventTile.tsx 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-06-03 08:03:31 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
Germain Souquet
82fe9a5c7b remove unused import 2021-06-02 10:48:18 +01:00
Germain Souquet
d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance 2021-06-02 10:42:17 +01:00
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
J. Ryan Stinnett
173b0e9d78
Merge pull request #6117 from SimonBrandner/fix/down-arrow-edit/17491 
Clear stored editor state when canceling editing using a shortcut
 2021-06-01 12:07:23 +01:00
Germain Souquet
d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Šimon Brandner
d72c773e2d
clearStoredEditorState when canceling editing using a shortcut 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-29 08:26:53 +02:00
Germain Souquet
fd69fce1ba guard event listener from null values 2021-05-28 17:37:29 +01:00
Germain Souquet
f10e95956b Use passive option for scroll handler 2021-05-28 14:59:14 +01:00
Germain Souquet
650b683761 Reposition sticky headers when layout has changed 2021-05-28 10:31:42 +01:00
Germain Souquet
51d88062f9 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-27 10:22:16 +01:00
J. Ryan Stinnett
118556b542
Merge pull request #6106 from matrix-org/jryans/hidden-events-reactions 
Update reactions row on event decryption
 2021-05-26 17:34:54 +01:00
Michael Telatynski
264ab925cd delint 2021-05-26 14:21:28 +01:00
Michael Telatynski
1ffbaee560 update style of imports in all modified files 2021-05-26 14:14:55 +01:00
Michael Telatynski
974d62e347 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/views/messages/TextualBody.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
 2021-05-26 14:08:01 +01:00
Michael Telatynski
27ad90760d Iterate pinned messages 2021-05-26 13:51:17 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Germain
776b7100b5
Merge pull request #6086 from matrix-org/gsouquet/middle-pane-resize 2021-05-26 09:46:09 +01:00
Michael Telatynski
fd74a946e0 add header 2021-05-25 17:24:43 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Michael Telatynski
4fa6d3599b Convert PinnedEventTile to Typescript 2021-05-25 15:44:39 +01:00
Germain
7ecd96b320
Merge pull request #6095 from matrix-org/gsouquet/sticky-headers-results 2021-05-25 15:32:49 +01:00
Germain Souquet
d644338421 WhoIsTypingTile TypeScript conversion 2021-05-25 14:34:19 +01:00
Germain Souquet
a803e33ffe Convert WhoIsTypingTile to TypeScript 2021-05-25 14:10:16 +01:00
Germain Souquet
7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski
13427aaf07 Add a pulse animation to the pinned messages indicator and move it 2021-05-25 13:07:39 +01:00
Germain Souquet
88af74e4a4 Improve addEventsToTimeline performance scoping WhoIsTypingTile::setState 2021-05-25 12:45:19 +01:00
J. Ryan Stinnett
cb88f37bbd Remove outdated diagnostic log 
The cited issue (https://github.com/vector-im/element-web/issues/11120) has
since been fixed, so this "temporary" (2 years ago) logging is no longer needed.
 2021-05-25 12:28:16 +01:00
Germain Souquet
f156c2db15 prevent reflow in app when accessing window dimensions 2021-05-25 10:28:43 +01:00
Germain Souquet
ac93cc514f Prevent layout trashing when resizing the window 2021-05-25 10:28:20 +01:00
Germain Souquet
73d51a91d6 Prevent unneeded state updates to hide StickerPicker 2021-05-25 10:27:59 +01:00
Michael Telatynski
4a5c634d82 Iterate PR 2021-05-24 22:02:50 +01:00
Michael Telatynski
a757f589bd post-merge fixup 2021-05-24 21:57:59 +01:00
Michael Telatynski
d8acc0612a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/views/rooms/EditMessageComposer.js
	src/components/views/rooms/SendMessageComposer.js
 2021-05-24 21:57:38 +01:00
Germain Souquet
cdecc156df Remove unused prop 2021-05-24 17:30:37 +01:00
Germain Souquet
3b69c0203c Remove resize notifier prop from RoomTile 2021-05-24 17:05:59 +01:00
Germain Souquet
0bbfb1a6d9 remove unused variable checkObjectHasNoAdditionalKeys 2021-05-24 16:18:55 +01:00
Germain Souquet
671f169457 Remove unused middlePanelResized event listener 2021-05-24 16:08:48 +01:00
Germain Souquet
4851e96297 Switch rooms documentation and polishing 2021-05-24 09:17:29 +01:00
Robin Townsend
f34d61cf5d Merge branch 'develop' into improved-forwarding-ui 2021-05-21 08:15:09 -04:00
Germain Souquet
ccfd6ba4b1 fix linting issues 2021-05-21 12:53:26 +01:00
Germain Souquet
5ba419db54 split room header and header wrapper 2021-05-21 10:21:54 +01:00
Michael Telatynski
073127aa3c Fix handling of via servers for suggested rooms 2021-05-20 18:47:12 +01:00
Germain Souquet
0f63098c59 Remove typo semicolon 2021-05-20 18:02:44 +01:00
Germain Souquet
9e55f24092 Remove extraenous DOM nodes 2021-05-20 16:11:33 +01:00
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet
171539d42d Simplify EventTile structure 
Only render MessageTimestamp to the DOM when a tile is hovered
 2021-05-20 15:26:02 +01:00
Germain Souquet
422740f13b normalize displayName 2021-05-20 11:04:17 +01:00
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Michael Telatynski
aa4984019c
Merge pull request #6061 from jaiwanth-v/update-memberlist-invite 
Update MemberList to reflect changes for invite permission change
 2021-05-19 17:35:58 +01:00
Germain
6170403c10
Depile encrypted events to find the most suitable one for preview (#6056) 2021-05-19 13:25:52 +01:00
Jaiwanth
d73eb0c70f Update MemberList.js 2021-05-19 17:46:10 +05:30
Michael Telatynski
78a8c9e10e Fix issue when a room without a name or alias is marked as suggested 2021-05-19 10:46:11 +01:00
Jaiwanth
e78206301f Modify to avoid forceUpdate 2021-05-19 14:31:04 +05:30
Jaiwanth
0d8a7eabc7 Update MemberList on invite permission change 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-19 12:49:55 +05:30
Robin Townsend
64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04:00
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276 
Decorate room avatars with publicity in add existing to space flow
 2021-05-14 11:23:46 +01:00
Michael Telatynski
6f9c2f05a2 remove unused vars/imports 2021-05-14 10:49:53 +01:00
Travis Ralston
2d2c0d54c0
Merge pull request #6001 from jaiwanth-v/save-edited-state-messages 
Save edited state of a message when switching rooms
 2021-05-13 20:06:31 -06:00
Michael Telatynski
f6e8d38b87 Remove redundant tag prop 2021-05-13 14:23:10 +01:00
Germain
bd2917aa69
Add a limit option for autocomplete results (#6016) 2021-05-12 12:18:56 +01:00
Jaiwanth
240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Jaiwanth
87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-05-11 10:37:53 +05:30
Travis Ralston
12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Jaiwanth
1f77048750 Minor refactor 2021-05-09 16:12:04 +05:30
Jaiwanth
6f98aa06c4 Save edited state when switching rooms 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-09 13:42:01 +05:30
Robin Townsend
7fa81766db Remove old forwarding code 
This has been replaced by ForwardDialog.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-08 21:11:06 -04:00
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Travis Ralston
54931cb43e Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline 2021-05-04 09:05:04 -06:00
Travis Ralston
704edfc05b
Merge pull request #5959 from matrix-org/travis/voicemessages/permissions 
Handle no/blocked microphones in voice messages
 2021-05-04 09:03:38 -06:00
Jaiwanth
29aec4abdb Use middlePanelResized instead of noisy 2021-05-04 15:39:46 +05:30
Travis Ralston
87a57ec7e5 Handle no/blocked microphones in voice messages 
Fixes https://github.com/vector-im/element-web/issues/17139
 2021-05-03 16:41:39 -06:00
Jaiwanth
54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Travis Ralston
8abd251ec5 delib 2021-05-03 11:43:46 -06:00
Travis Ralston
d7ed2d3486 Switch to m.audio with extensible events 2021-05-03 10:27:15 -06:00
Jaiwanth
cf9edb1884 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into room-preview-spaces 2021-05-03 21:53:54 +05:30
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998 
Make the text filter search all spaces instead of just the selected one
 2021-04-30 12:53:38 +01:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 20:08:14 +02:00
Šimon Brandner
232b87a3b4
Improve formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 19:57:02 +02:00