Commit graph

4313 commits

Author SHA1 Message Date
Tulir Asokan
598689b059 Run eslint 2021-07-02 12:56:08 +03:00
Tulir Asokan
5240209529 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-02 12:39:51 +03:00
Michael Telatynski
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10 2021-07-02 09:51:58 +01:00
Michael Telatynski
5d1a1b46f3 Fix instances of the Edit Message Composer's save button being wrongly disabled 2021-07-01 23:48:52 +01:00
David Baker
80f5232217 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
Michael Telatynski
c2545923c1 Use better types to make CI happy 2021-07-01 21:10:37 +01:00
David Baker
eb1a22ab19 Add types 2021-07-01 21:00:54 +01:00
David Baker
38ed53d5d1
Oops, don't just blindly insert the commented type
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-01 20:58:51 +01:00
David Baker
3db95d607d
Use semicolons
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-01 20:57:56 +01:00
David Baker
e121e5bf8a nice try, vscode 2021-07-01 19:58:25 +01:00
David Baker
8bbb768825 Convert RoomHeader to TS
Also add a type of OOBData... possibly this should be in the js-sdk,
but threepid invites themselves have a type in react-sdk so it can
live alongside it I guess (also I'm not entirely sure we actually
use it anymore...)
2021-07-01 19:54:05 +01:00
David Baker
ae16efcf5b Remove rateLimitedFunc 2021-07-01 18:35:38 +01:00
Germain Souquet
d804df84a7 Allow missing sender in event 2021-07-01 15:16:47 +01:00
Michael Telatynski
04902fa2e4
Merge pull request #6292 from matrix-org/t3chguy/ts/9 2021-07-01 14:11:17 +01:00
Germain Souquet
9c93b9002f Add extra context for filtering out '>' for sanitizeHtml 2021-07-01 12:23:36 +01:00
Germain Souquet
04db8333e3 Fix typing and unused import 2021-07-01 12:13:43 +01:00
Germain Souquet
ede87129b2 Add a layout fallback for EventTile 2021-07-01 11:45:29 +01:00
Germain Souquet
d47194e61d Migrate SearchResultTile to TypeScript 2021-07-01 11:17:44 +01:00
Michael Telatynski
6693993d08 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/9 2021-07-01 08:21:59 +01:00
Travis Ralston
12d7be2b6a Merge branch 'develop' into travis/new-audio 2021-06-30 13:25:41 -06:00
Germain Souquet
209344d443 improvements to bubble layout 2021-06-30 17:06:51 +01:00
Michael Telatynski
3a80df4222 Fix react context not being assigned during construction 2021-06-30 13:45:43 +01:00
Michael Telatynski
0a5abb09f4 Fixes identified by TS 2021-06-30 13:03:29 +01:00
Michael Telatynski
e768ecb3d0 Typescript conversion of Composer components and more 2021-06-30 13:01:26 +01:00
Germain Souquet
d1c6cfe6b9 Improved message bubble layout (no reply) 2021-06-30 12:06:16 +01:00
Germain Souquet
d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
Germain Souquet
fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Robin Townsend
adb5df52a4 Merge branch 'develop' into text-for-event-perf 2021-06-29 22:13:18 -04:00
Michael Telatynski
8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/ScrollPanel.tsx
	src/components/structures/TimelinePanel.tsx
	src/components/views/elements/ErrorBoundary.tsx
	src/components/views/elements/EventListSummary.tsx
	src/components/views/messages/TileErrorBoundary.tsx
2021-06-29 22:14:40 +01:00
J. Ryan Stinnett
782e793925 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:27:24 +01:00
Michael Telatynski
623317cd47 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/TimelinePanel.tsx
2021-06-29 15:22:54 +01:00
Germain
640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter
Deprecate Tinter and TintableSVG
2021-06-29 15:22:48 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
J. Ryan Stinnett
4c5720a573 Update lint comments 2021-06-29 12:51:13 +01:00
Travis Ralston
d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240 2021-06-28 21:00:36 -06:00
Travis Ralston
964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio 2021-06-28 20:52:44 -06:00
Travis Ralston
b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf
Improve audio recording performance
2021-06-28 20:49:21 -06:00
Germain Souquet
6607294573 Deprecate Tinter and TintableSVG 2021-06-28 17:13:23 +01:00
J. Ryan Stinnett
a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht
Removes the override on the Bubble Container
2021-06-28 16:23:40 +01:00
Germain Souquet
6cb86057c5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-28 09:29:11 +01:00
Travis Ralston
1874f3b963
Merge pull request #6269 from matrix-org/travis/encrypt-voice
Encrypt the voice message file if needed
2021-06-28 01:30:16 -06:00
J. Ryan Stinnett
18b470820d
Merge pull request #6270 from SimonBrandner/fix/presence/17786
Fix hyper-precise presence
2021-06-26 18:47:17 +01:00
Šimon Brandner
3c6612df93
Fix hyper-precise presence
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 07:53:42 +02:00
Travis Ralston
b5bb767b8f Appease the linter 2021-06-25 14:11:50 -06:00
Travis Ralston
cb0d2a2c4f Encrypt the voice message file if needed
Fixes https://github.com/vector-im/element-web/issues/17729

"oops, should have done that"
2021-06-25 13:54:05 -06:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237)
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
2021-06-25 11:45:15 +01:00
Travis Ralston
76caba0385 Restore mx_VoiceMessagePrimaryContainer class 2021-06-25 00:10:32 -06:00
Robin Townsend
e35e836052 Convert TextualEvent and SearchResultTile to TypeScript
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 18:45:23 -04:00
Robin Townsend
f9fe28a6ad Merge branch 't3chguy/ts/8' into text-for-event-perf 2021-06-24 18:45:08 -04:00
Travis Ralston
ffef2e58cb Unify audio message types to new media body 2021-06-24 11:38:35 -06:00
Travis Ralston
470778cbb8 Move voice message components to audio-generic directory 2021-06-24 11:38:35 -06:00
Michael Telatynski
c5a1da49ce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
 Conflicts:
	src/components/structures/AutoHideScrollbar.tsx
2021-06-24 16:42:03 +01:00
Šimon Brandner
dc2f71bee6
Even more fixes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:55:44 +02:00
Šimon Brandner
b065f6d1a4
Remove sdk...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:48:36 +02:00
Šimon Brandner
f0dbc974fa
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile 2021-06-24 16:44:13 +02:00
Šimon Brandner
c0a1127cb7
Fix PowerStatus
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:43:11 +02:00
Šimon Brandner
f08b92309f
Iterate EntityTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:35:33 +02:00
Šimon Brandner
8fb788ae56
Iterate EntityTile once more
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:39:51 +02:00
Šimon Brandner
5b21cff240
Iterate MemberTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:38:21 +02:00
Šimon Brandner
1b64cd0c88
Iterate PresenceLabel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:36:22 +02:00
Šimon Brandner
298e505381
Iterate EntityTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:29:24 +02:00
Šimon Brandner
d2d8cb3c24
Think about what you copy-paste, Simon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:15:44 +02:00
Šimon Brandner
a774aed365
Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:07:43 +02:00
Germain Souquet
21caa6df12 move live recording logic down the component tree 2021-06-24 09:58:11 +01:00
Germain Souquet
56467485f5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-24 09:42:47 +01:00
Šimon Brandner
e25940cbdd
Convert PresenceLabel to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:11 +02:00
Šimon Brandner
87d27593de
Convert MemberTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:11 +02:00
Šimon Brandner
d5acfc6cf4
Convert EntityTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:06 +02:00
Šimon Brandner
99c442cea7
Convert MemberList to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:06 +02:00
Germain Souquet
a6367c0796 Reintroduce LiveRecording components for maintenance reasons 2021-06-23 09:33:38 +01:00
Šimon Brandner
9bceb40820
CallMediaHandler -> MediaDeviceHandler
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
Michael Telatynski
24b03366a8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17368 2021-06-22 22:40:59 +01:00
Michael Telatynski
9dc8493a5c Hide communities invites and the community autocompleter when Spaces Beta is enabled 2021-06-22 22:07:42 +01:00
Michael Telatynski
cecf0ce299 Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript 2021-06-22 20:41:26 +01:00
Michael Telatynski
6fd1dc7d18 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7 2021-06-22 18:09:24 +01:00
Michael Telatynski
59258585b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-22 17:28:19 +01:00
Michael Telatynski
a839d0f396 More typescript conversion 2021-06-22 17:23:13 +01:00
Germain
ded738ce8c
Add spaces around curlies
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-22 14:57:44 +01:00
Germain Souquet
a85c6c67e0 Make waveform update match the screen refresh rate 2021-06-22 12:28:23 +01:00
Germain Souquet
3d3c428455 Fix DesktopBuildsNotice return type 2021-06-22 10:26:49 +01:00
Michael Telatynski
845bb95887 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-21 20:46:28 +01:00
Germain Souquet
7f635c68c5 Migrate SearchBar to TypeScript 2021-06-21 14:50:21 +01:00
Tulir Asokan
29eff06c52 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-20 21:19:15 +03:00
Travis Ralston
9344adb2d2
Revert "Partially restore immutable event objects at the rendering layer" 2021-06-19 13:38:19 -06:00
Tulir Asokan
c1bc4b0027 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-19 16:11:53 +03:00
Germain Souquet
6271c5c3d8 first iteration for message bubble layout 2021-06-18 18:59:22 +01:00
Travis Ralston
273fb75fc9 Merge branch 'develop' into travis/event-fixes 2021-06-18 11:26:51 -06:00
Michael Telatynski
ab94b284b8 Updates around the use of private fields out of class 2021-06-18 16:29:10 +01:00
Travis Ralston
bc74a7366b
Merge pull request #6197 from matrix-org/travis/voice-messages/fix-msc-number
Update MSC number references for voice messages
2021-06-18 09:23:28 -06:00
Michael Telatynski
233e2aa425 Fix bugs identified by the typescripting 2021-06-18 16:22:31 +01:00
Michael Telatynski
0ae4e7b11d Fix typescript types 2021-06-18 16:21:46 +01:00
Michael Telatynski
058cbbbd0c Fix imports 2021-06-18 16:13:55 +01:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
Robin Townsend
d08f8087c6
Merge branch 'matrix-org:develop' into text-for-event-perf 2021-06-18 10:29:41 -04:00
Michael Telatynski
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5 2021-06-18 09:49:03 +01:00
Travis Ralston
98e0200b4a Function name 2021-06-17 14:21:50 -06:00
Ayush Pratap Singh
1259247380
Merge branch 'matrix-org:develop' into Bubble-bericht 2021-06-18 00:16:16 +05:30
Ayush PS
1394e5b0a4 Updated changes for the tile
Signed-off-by: Ayush PS <ayushpratap16@gmail.com>
2021-06-18 00:12:39 +05:30
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
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
Michael Telatynski
02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Robin Townsend
af11878e0c Use cached setting values when calling TextForEvent
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 20:41:36 -04: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
deb2e8d679 Remove unused methods 2021-06-16 12:04:01 +01:00
Travis Ralston
d13611736a Update MSC number references for voice messages
as per https://github.com/matrix-org/matrix-doc/pull/3245
2021-06-15 17:24:56 -06:00
Travis Ralston
ea46df0d48 Partially restore immutable event objects at the rendering layer
This is primarily to fix some extremely rare edge cases in local echo, but also restores the accuracy of some comments in the stack regarding immutable event objects (which were made mutable many years ago).

This shouldn't have any impact on the daily usage of the app, only adding a measured 0ms of latency to the stack.
2021-06-15 14:23:19 -06:00
Tulir Asokan
9f66bd0f65 Remove extra space 2021-06-15 17:48:16 +03:00
Tulir Asokan
cdd2773aa6 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-15 17:37:49 +03: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
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
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
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
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
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03: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
Šimon Brandner
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:49:05 +02: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
Šimon Brandner
466a52e238
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-02 10:45:35 +02:00
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00