Commit graph

5484 commits

Author SHA1 Message Date
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
Robin Townsend
1e574307d0 Cache lowBandwidth setting to speed up BaseAvatar
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:08:47 -04: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
b06da16a85 Fix jumping to bottom without a highlighted event
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 13:20:27 -04:00
Robin Townsend
a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Robin Townsend
3bf8e54d7f Use cached RoomContext settings values throughout rooms
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:25:43 -04:00
Robin Townsend
48d3e41351 Cache frequently used settings values in RoomContext
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:23:51 -04:00
Šimon Brandner
8c533c7f8b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-04 08:09:31 +02:00
Travis Ralston
12e013508d
Merge pull request #6132 from matrix-org/travis/ts-mtxcli
Adapt for js-sdk MatrixClient conversion to TS
2021-06-04 00:07:22 -06: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
5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +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
Michael Telatynski
42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Michael Telatynski
3f12b7280d Make AutoHideScrollbar pass through all unknown props 2021-06-03 08:31:06 +01:00
Michael Telatynski
079a5c10ad Respect space ordering field in m.tag for top level spaces 2021-06-02 16:43:38 +01:00
Germain Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Michael Telatynski
da13ec16f3 Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 2021-06-02 12:42:55 +01:00
Michael Telatynski
35948374e9 remove unused imports 2021-06-02 11:56:49 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
Michael Telatynski
bc3c759feb Add temporary mechanism for managing communities without dnd 2021-06-02 11:33:25 +01:00
Šimon Brandner
466a52e238
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-02 10:45:35 +02:00
Šimon Brandner
b202f997e3
Refactor setState()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 10:30:17 +02:00
Šimon Brandner
521b2445a8
Refactoring and fixes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 10:18:32 +02:00
Travis Ralston
c9883f346c Build pass 1 2021-06-01 22:21:04 -06:00
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Michael Telatynski
0b7d3f007a Remove react-beautiful-dnd 2021-06-01 17:35:31 +01:00
Šimon Brandner
3bf28e3a6b
Remove Ended from SUPPORTED_STATES
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 16:29:52 +02:00
Šimon Brandner
6b9e2042c3
Use a Set instead of an Array
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 16:28:57 +02:00
Michael Telatynski
a1ff060138
Merge pull request #6123 from matrix-org/t3chguy/fix/17517
Update way of checking for registration disabled
2021-06-01 15:20:21 +01:00
Michael Telatynski
4e6f1e6294 add comment 2021-06-01 15:00:59 +01:00
Šimon Brandner
9db280bbe6
Listen for CallsChanged
This should avoid delays and such

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 15:31:46 +02:00
Germain Souquet
591314141b Add methods visibility for AutoHideScrollbar 2021-06-01 14:15:42 +01:00
Germain Souquet
308ac505a8 Migrate AutoHideScrollbar to TypeScript
Also changed the way the React.RefObject is collected
2021-06-01 14:13:46 +01:00
Šimon Brandner
70a5715b3d
Support hangup reasons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:46:41 +02:00
Šimon Brandner
f1e780e642
Improved missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 13:40:25 +02:00
Šimon Brandner
9b904cdee8
Remove empty line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 13:39:05 +02:00
Michael Telatynski
72fab80bb9
Merge pull request #6125 from matrix-org/t3chguy/fix/17521
Switch to stable endpoint/fields for MSC2858
2021-06-01 12:07:41 +01:00
Šimon Brandner
14605e49c4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-01 12:11:11 +02:00
Michael Telatynski
f11a7083ae Switch to stable endpoint/fields for MSC2858 2021-06-01 11:01:09 +01:00
Michael Telatynski
e525d046c7 remove outdated TODO 2021-06-01 10:49:19 +01:00
Michael Telatynski
b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Šimon Brandner
0785997983
Handle missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 11:28:45 +02:00
Michael Telatynski
826efeaeaa Update way of checking for registration disabled
Spec says 403 + M_FORBIDDEN
2021-06-01 10:22:24 +01:00
J. Ryan Stinnett
a8b6094482
Merge pull request #5674 from churchtools/default-username
Add url param `defaultUsername` to prefill the login username field
2021-06-01 10:12:31 +01:00
Šimon Brandner
5b3967a486
Add handling for invite
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 11:01:10 +02:00
Šimon Brandner
67a052e46a
Reorganize things and do some fixes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:55:03 +02:00
Šimon Brandner
8c67b96a0f
Save all events
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:42:21 +02:00
Šimon Brandner
c1fcadba3b
Manage some more call states
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:33:44 +02:00
Šimon Brandner
f96e25d833
Simply use call states
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:11:48 +02:00
Šimon Brandner
6b72c13e34
Add some call states
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:06:03 +02:00
Šimon Brandner
30365ca1ad
Allow picking up calls from the timeline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:03:17 +02:00
Germain Souquet
d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Šimon Brandner
dac741d8b9
Another rewrite
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 09:30:37 +02:00
Šimon Brandner
d05b1798b8
Add callId
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
85bcf8ed52
Hook up CallEventGrouper
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
8dc0e2a7ab
Add CallEventGrouper as a replacement for TimeLineCallEventStore
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
4ae92d8adc
Hook up TimelineCallEventStore and add Avatar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +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
71b217e4a1
Merge pull request #6110 from matrix-org/gsouquet/sticky-header-sizing 2021-05-28 14:49:49 +01:00
Germain Souquet
650b683761 Reposition sticky headers when layout has changed 2021-05-28 10:31:42 +01:00
Germain Souquet
29c4d9ffd0 Restore toggle LHS logic 2021-05-28 10:03:46 +01:00
Germain Souquet
1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Germain Souquet
aaca71b316 Reintroduce sticky header width 2021-05-27 12:44:53 +01:00
Germain Souquet
fcae19f831 Track left panel width using ResizeObserver 2021-05-27 12:36:16 +01:00
Michael Telatynski
086ce7c621
Merge pull request #6109 from matrix-org/t3chguy/fix/17387
Fix misleading child counts in spaces
2021-05-27 12:35:00 +01:00
Germain Souquet
51d88062f9 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-27 10:22:16 +01:00
Michael Telatynski
d6d0922753 Fix misleading child counts in spaces 2021-05-27 10:11:28 +01:00
Germain Souquet
f31ec343f4 Use Set::size instead of Array.from()::length 2021-05-27 09:26:31 +01:00
Germain
b8a7d5d730
Better Set handling
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-05-27 09:23:56 +01:00
Germain Souquet
fbb6a42d86 fix reading Set length 2021-05-27 09:05:51 +01:00
Germain Souquet
2d15d66df8 Listen to home server sync update to remove pending rooms 2021-05-27 08:58:11 +01:00
Germain Souquet
be22a325f6 Prevent having duplicates in pending room state 2021-05-27 08:57:27 +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
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Michael Telatynski
231e39a965 Fix accessing currentState on an invalid joinedRoom 2021-05-25 17:26:43 +01:00
Michael Telatynski
830ad47e87
Merge pull request #6097 from matrix-org/t3chguy/allSettled
Remove Promise allSettled polyfill as js-sdk uses it directly
2021-05-25 17:11:06 +01:00
Michael Telatynski
c1f397dcf7 delint 2021-05-25 16:20:23 +01:00
Michael Telatynski
17bbbff479 Remove Promise allSettled polyfill as its widespread enough now and js-sdk uses it directly 2021-05-25 16:12:34 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Germain Souquet
b09dd8f1f8 remove unused values 2021-05-25 14:54:27 +01:00
Germain Souquet
7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski
152c178ea9 Convert NotificationPanel to Typescript 2021-05-25 12:15:37 +01:00
Michael Telatynski
170b11d130 Convert RightPanel to Typescript 2021-05-25 12:13:16 +01:00
Germain
1751b4ba43
Merge pull request #6092 from matrix-org/gsouquet/window-dimensions-reflow 2021-05-25 12:00:08 +01:00
Michael Telatynski
5980528f30
Merge pull request #6089 from matrix-org/t3chguy/fix/17336
Use local room state to render space hierarchy if the room is known
2021-05-25 11:59:09 +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
David Schilling
5c674365d3 Add url param defaultUsername to prefill the login username field
Signed-off-by: David Schilling <dschilling@churchtools.de>
2021-05-25 10:39:33 +02:00
Michael Telatynski
4a5c634d82 Iterate PR 2021-05-24 22:02:50 +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
Michael Telatynski
5b66975605 Use local room state to render space hierarchy if the room is known 2021-05-24 18:57:24 +01:00
Germain Souquet
36d95ff737 Display spinner in user menu when joining a room 2021-05-24 15:02:26 +01:00
Germain Souquet
b5295b03ce Trigger join room actions properly 2021-05-24 14:34:06 +01:00
Robin Townsend
88e0e9b9fb Merge branch 'develop' into improved-forwarding-ui 2021-05-24 08:23:07 -04:00
Germain Souquet
ecff5bd65c Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-05-24 09:20:12 +01:00
Germain Souquet
4851e96297 Switch rooms documentation and polishing 2021-05-24 09:17:29 +01:00
Michael Telatynski
a6adfde8e2
Merge pull request #6070 from matrix-org/t3chguy/fix/17360
Improve explore rooms when no results are found
2021-05-23 21:17:35 +01:00
Michael Telatynski
35b9388fc2 Iterate PR 2021-05-21 13:37:21 +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
Michael Telatynski
e984a4f0cd rejig the code to make types happy 2021-05-20 20:12:28 +01:00
Michael Telatynski
073127aa3c Fix handling of via servers for suggested rooms 2021-05-20 18:47:12 +01:00
Germain Souquet
9e55f24092 Remove extraenous DOM nodes 2021-05-20 16:11:33 +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
Michael Telatynski
ba7604fd44 fix types around sending stickers 2021-05-20 13:24:19 +01:00
Michael Telatynski
c21445c406 switch from MatrixClientPeg in ContentMessages for consistency 2021-05-20 13:23:17 +01:00
Germain
49c853a304 Delete RoomView dead code 2021-05-20 09:37:33 +01:00
Michael Telatynski
aa7ccc1420 Show prompt to create new room from room directory results 2021-05-19 20:07:54 +01:00
Michael Telatynski
a61e977b5f Fix room directory ts migration 2021-05-19 19:30:56 +01:00
Michael Telatynski
8b67cdb80b Pre-populate create room dialog name when going from room directory 2021-05-19 19:20:58 +01:00
Michael Telatynski
d10a45c6a3 Convert RoomDirectory and NetworkDropdown to Typescript 2021-05-19 18:40:03 +01:00
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Germain Souquet
cf8e49729a prevent unwarranted RoomView re-render 2021-05-19 14:32:49 +01:00
Michael Telatynski
6e25e42e66 Show subspace rooms count even if it is 0 for consistency 2021-05-19 13:00:46 +01:00
Michael Telatynski
9b01e1575d
Merge pull request #6055 from matrix-org/t3chguy/fix/17332
Fix space room hierarchy not updating when removing a room
2021-05-19 12:28:11 +01:00
Germain Souquet
382a08bdb1 Delete RoomView dead code 2021-05-19 11:38:10 +01:00
Germain
f7d0afcd28
Performance monitoring measurements (#6041) 2021-05-19 10:07:02 +01:00
Germain Souquet
f9f10de0da use renamed decrypt event method 2021-05-18 13:01:38 +01:00
Michael Telatynski
e9c258a930 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/autocomplete/AutocompleteProvider.tsx
	src/components/views/rooms/Autocomplete.tsx
2021-05-18 12:49:11 +01:00
Michael Telatynski
2732280923 Fix space room hierarchy not updating when removing a room 2021-05-18 11:54:45 +01:00
Germain Souquet
1cfd4b6e1a Use client.decryptEvent to avoid accessing js-sdk private members 2021-05-18 11:41:20 +01:00
Germain Souquet
871c48f69b stop assuming that decryption happens ahead of time 2021-05-18 10:02:21 +01:00
Robin Townsend
d3f1754dfd Fix crash on opening notification panel
The check for pending edits needed a null guard, since the notification
panel uses MessagePanel but is not associated with a specific room.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-17 12:24:41 -04:00
Germain Souquet
7e846b8532 remove unused import 2021-05-17 15:05:20 +01:00
Germain Souquet
c67f31144f remove custom LoggedInView::shouldComponentUpdate logic 2021-05-17 14:45:41 +01:00
Robin Townsend
64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04:00
Michael Telatynski
d0458332d5 fix roving tab index intercepting home/end in space create menu 2021-05-14 11:22:20 +01:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674
Improve Spaces "Just Me" wizard
2021-05-14 10:58:55 +01:00
Michael Telatynski
034bd9cb02
Merge pull request #6029 from matrix-org/t3chguy/fix/17275
Show alternative button during space creation wizard if no rooms
2021-05-14 10:48:39 +01:00
Michael Telatynski
e1df62472d remove unused imports and run i18n 2021-05-14 10:48:24 +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
2f28de8472 Show alternative button during space creation wizard if user opted to create 0 rooms 2021-05-13 13:22:50 +01:00
Michael Telatynski
423c515708 Consolidate AddExistingToSpace between Dialog and Just Me integrated flow 2021-05-13 09:46:45 +01:00
Michael Telatynski
654ce95c74 Progress from adding existing rooms to new space upon completion 2021-05-12 17:31:55 +01:00
Michael Telatynski
2c89be312a Disable space fields whilst their form is busy 2021-05-12 13:30:00 +01:00
Germain
91133ed35b
Prioritise and reduce the amount of events decrypted on application startup (#5980) 2021-05-12 12:19:53 +01:00
Michael Telatynski
2c2d95560b Linkify topics in space room directory results 2021-05-12 10:05:53 +01:00
Michael Telatynski
7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +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
Michael Telatynski
2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-05-11 13:40:28 +01:00
Michael Telatynski
60d3da2441 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
2021-05-11 10:59:22 +01:00
Germain Souquet
da1df70557 Improve comments and explainer for new decryption approach 2021-05-11 10:18:53 +01:00
Michael Telatynski
23001cb10d remove unused import 2021-05-11 10:11:51 +01:00
Germain Souquet
be236309c5 use arrayFastClone instead of slice 2021-05-11 10:08:57 +01:00
Michael Telatynski
de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
Michael Telatynski
5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 2021-05-11 09:14:01 +01:00
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Travis Ralston
beef07bdef Merge branch 'develop' into err 2021-05-10 20:08:19 -06:00
Travis Ralston
379d19e2e0
Lint 2021-05-10 19:56:30 -06:00
Robin Townsend
c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -04:00
Germain Souquet
17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Michael Telatynski
70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1
Switch the Home Space out for an All rooms space
2021-05-10 16:26:05 +01:00
Michael Telatynski
c96bb374ea Allow user to progress through space setup wizard using Enter/Return 2021-05-10 16:06:23 +01:00
Germain Souquet
f1a6f6fd7f make breadcrumb room events decryption more idiomatic 2021-05-10 15:48:39 +01:00
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
Germain Souquet
6e3f8d6a0a Decrypt last events first to avoid shifts when scrolling up 2021-05-07 15:26:16 +01:00
Germain Souquet
fa30285c6b Decrypt messages on when used on a timeline 2021-05-07 15:16:54 +01:00
Ayush PS
32edbc155f Merge remote-tracking branch 'origin/develop' into err 2021-05-07 19:16:00 +05:30
Michael Telatynski
a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +01:00
Michael Telatynski
6338ced8a3
Merge pull request #5977 from matrix-org/t3chguy/fix/17176
Iterate Spaces admin UX around room management
2021-05-07 11:47:45 +01:00
Germain Souquet
17099c656b Call renamed room::decryptAllEvents method 2021-05-07 11:25:25 +01:00
Michael Telatynski
6137162786 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1
 Conflicts:
	src/stores/room-list/RoomListStore.ts
2021-05-07 10:40:07 +01:00
Michael Telatynski
4079b03ae0 Bring back filter all spaces behaviour 2021-05-07 10:39:35 +01:00
Michael Telatynski
6f28964b49
Merge pull request #5979 from matrix-org/t3chguy/spaces-logs
Guard all isSpaceRoom calls behind the labs flag
2021-05-07 10:28:14 +01:00
Michael Telatynski
d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-05-06 13:06:50 +01:00
Michael Telatynski
d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
Germain Souquet
0c87a67caf Lazily decrypt events on room view 2021-05-06 11:46:25 +01:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski
90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Michael Telatynski
68210b1415
Merge pull request #5963 from matrix-org/t3chguy/fix/17119
Update space ordering behaviour to match updates in MSC
2021-05-05 22:26:45 +01:00
Michael Telatynski
650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
Michael Telatynski
886959f32d port rate limiting code over to space creation wizard's add existing rooms 2021-05-05 11:54:14 +01:00
Michael Telatynski
a70be45b6e Experiment switching the Home Space out for an All rooms space 2021-05-04 18:26:49 +01:00
Michael Telatynski
ac61c8eca8 Adhere to updated sort order for space children 2021-05-04 12:27:27 +01:00
Michael Telatynski
a7642b2b24 Fix space name "Empty room" during creation wizard 2021-05-04 10:48:34 +01:00
Jaiwanth
54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Michael Telatynski
8dbcc85249
Merge pull request #5944 from matrix-org/t3chguy/fix/17043
Inhibit sending RR when context switching to a room
2021-04-30 15:13:18 +01:00
Michael Telatynski
39ccecab03
Merge pull request #5950 from matrix-org/t3chguy/fix/17117
Prevent room list keyboard handling from landing focus on hidden nodes
2021-04-30 12:55:27 +01:00
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
Michael Telatynski
042ca65806 fix beta dot showing up when beta is disabled 2021-04-30 12:32:42 +01:00
Michael Telatynski
43410835a3 Prevent room list keyboard handling from landing focus on hidden nodes 2021-04-30 11:53:56 +01:00
Šimon Brandner
2e62b18617
Revert some changes to avoid re-translation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-30 12:30:14 +02:00
Šimon Brandner
c6bd2c7d67
Fix some more formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:18:26 +02: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
Michael Telatynski
73abe51fb9 actually use the new state 2021-04-29 16:46:21 +01:00
Michael Telatynski
62198601d2 Tweak room list filter placeholder and results copy for spaces 2021-04-29 16:40:08 +01:00
Michael Telatynski
279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski
036bc50b5d Disable groups routes when spaces is enabled to avoid confusion 2021-04-29 12:29:22 +01:00
Michael Telatynski
a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
2021-04-29 09:52:21 +01:00
Michael Telatynski
e390c3c732 Inhibit sending RR when context switching to a room 2021-04-29 09:37:21 +01:00
Michael Telatynski
9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-04-28 22:49:36 +01:00
Michael Telatynski
1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Ayush PS
81f2e67443 Fixed Linting errors 2021-04-28 23:40:23 +05:30
Ayush PS
8b644e783e Finally fixes two todays 2021-04-28 23:23:51 +05:30
Travis Ralston
b90c845fcb
Revert "Fixes the two Todays problem in Redaction" 2021-04-28 10:07:22 -06:00
Travis Ralston
e53b3b6634
Merge pull request #5917 from DantrazTrev/Redact
Fixes the two Todays problem in Redaction
2021-04-28 09:51:43 -06:00
Travis Ralston
baef98253e
Merge pull request #5920 from aaronraimist/page-up-down
Fix page up/down scrolling only half a page
2021-04-28 09:51:36 -06:00
Michael Telatynski
5a921bf38a Add beta pill to space create menu 2021-04-28 12:10:03 +01:00
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:52:23 +02:00
Michael Telatynski
9dff5cd596 tweak leave space on preview 2021-04-28 08:59:02 +01:00
Michael Telatynski
18a01d9271 Show spaces beta prompt when viewing a space without the beta 2021-04-28 08:41:31 +01:00
Ayush PS
e2ce699130 Fixed linting warnings in MessagePanel.js 2021-04-28 10:02:20 +05:30
Michael Telatynski
46d35411b4 Add animated mx_BetaDot atop the legacy Communities button 2021-04-27 17:01:22 +01:00
Michael Telatynski
c5f653245a Show Spaces beta card in Labs & My Communities view
the image is temporary
2021-04-27 16:29:42 +01:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
Travis Ralston
b9bd83ad41 Handle possible edge case with getting stuck in "unsent messages" bar
Just in case we're not cleaning up the isResending state properly, here's a catch all.

Unrelated to https://github.com/vector-im/element-web/issues/17078 (this code doesn't affect the js-sdk error the author is seeing)
2021-04-27 08:58:18 -06:00
J. Ryan Stinnett
dd8abb0206
Merge pull request #5912 from matrix-org/jryans/convert-flow-to-ts
Convert some Flow-typed files to TypeScript
2021-04-27 13:44:47 +01:00
Michael Telatynski
13a5d06e29
Merge pull request #5926 from matrix-org/t3chguy/fix/17067
Fix issues with space hierarchy in layout and with incompatible servers
2021-04-27 11:21:15 +01:00
Šimon Brandner
a220b8b572
Wire up AudioFeedArrayForCall
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 11:59:08 +02:00
Michael Telatynski
915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Michael Telatynski
43b43dc685 tidy up code 2021-04-26 16:11:07 +01:00
Michael Telatynski
a8711dcce9 useSpaceSummary return error for incompatible server notice 2021-04-26 16:06:42 +01:00
J. Ryan Stinnett
cddcedcce2 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-26 15:57:28 +01:00
J. Ryan Stinnett
b8a915bb76 Tweak private / underscores for fields and methods 2021-04-26 14:02:53 +01:00
Michael Telatynski
8656212eb9 Space creation prompt user to add existing rooms instead of creating new ones 2021-04-26 12:41:04 +01:00
Ayush PS
123482952a Fixed linting errors 2021-04-26 15:01:39 +05:30
Aaron Raimist
ac486c847e
Try 0.9
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-26 01:10:04 -05:00
Aaron Raimist
e5f0119f66
Fix page up/page down scrolling only half a page
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-25 23:18:12 -05:00
Ayush PS
9a11b346c9 To fix the Redaction error and a few improvements 2021-04-24 18:09:34 +05:30
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
31a28b1a9e Update extensions for some files with types
This migrates one bucket of files using some amount of Flow typing to mark them
as TypeScript instead. The remaining type errors are fixed in subsequent
commits.
2021-04-23 16:05:30 +01:00
Travis Ralston
4be9c51dad Move all the RED_EXCLAMATION badges to a single definition 2021-04-21 16:43:25 -06:00
Travis Ralston
9227618b42 Show indicator in Room List for unsent events 2021-04-21 16:36:06 -06:00
Travis Ralston
91b3688feb Redesign "failed to send messages" status bar 2021-04-21 16:24:17 -06:00
Germain Souquet
c5a1bb2d2c fix sticky tags header in room list 2021-04-21 10:44:20 +01:00
Michael Telatynski
c953b1b6bb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pr/only-member-warning 2021-04-19 12:01:32 +01:00
Michael Telatynski
71d5f03a25 delint 2021-04-19 11:36:40 +01:00
J. Ryan Stinnett
495aff898f
Merge pull request #5864 from SimonBrandner/dont-render-msg-option
Render msgOption only if showReadReceipts is enabled
2021-04-15 17:24:13 +01:00
Travis Ralston
eed5efdbe1 Labs: Add quick/cheap "do not disturb" flag
This just disables audio notifications and the popup, which is the easiest way to do "do not disturb" for a device. This needs spec changes to be done properly, as it's a shame that mobile devices for the user will still go off.

Disabling all of push doesn't sound ideal as it would potentially mean missing highlights for when leaving DND mode.
2021-04-15 00:47:09 -06:00
Aaron Raimist
9c250171b4
Use new copy
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-14 18:27:41 -05:00
Šimon Brandner
43c236e8a5
Pass showReadReceipts from MessagePanel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-14 12:24:33 +02:00
Michael Telatynski
5f59e39958 Apply the same to quoting & inserting of emoji then consolidate 2021-04-13 15:09:37 +01:00
Michael Telatynski
ace3a62bac Allow click inserting mentions into the edit composer too 2021-04-13 14:52:26 +01:00
Germain Souquet
9081f80008 Move user to welcome_page if continuing with previous session 2021-04-12 17:01:27 +01:00
Travis Ralston
8aa4b1a760
Merge pull request #5834 from matrix-org/travis/sponsored/security-disable-ui
Add ability to hide post-login encryption setup with customisation point
2021-04-09 08:04:06 -06:00
Germain Souquet
d148b521f5 Revert JumpToBottom to button and use dispatcher to view room 2021-04-09 11:23:41 +01:00
Germain Souquet
d450822bfd fix linting issues in ScrollPanel 2021-04-09 11:17:50 +01:00
Germain Souquet
ef1da6acdd remove wrongly committed orig file 2021-04-09 09:02:47 +01:00
Travis Ralston
cc7982cfca
Merge pull request #5827 from SimonBrandner/show-drop-only-file
Show drop file UI only if dragging a file
2021-04-09 00:05:44 -06:00
Šimon Brandner
dacffdd62e
Add some comments
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 07:57:25 +02:00
Travis Ralston
1e551585c0 Fix copy/paste fail 2021-04-08 09:33:39 -06:00
Travis Ralston
d89bbe2167 Move check to MatrixChat 2021-04-08 09:20:14 -06:00
Travis Ralston
4ef3d176d9 Add ability to hide post-login encryption setup with customisation point
This is primarily intended for alternative setup UI or where the customisations end up configuring encryption some other way. If used without respecting the warnings in the docs, the user could end up at a blank page - use with caution, and only as directed.
2021-04-07 19:16:29 -06:00
Germain Souquet
7627ea13fe Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-04-07 09:54:12 +01:00
Germain Souquet
c5eb17eabd reset highlighted event on room timeline scroll 2021-04-07 09:48:56 +01:00
Felix Krull
10cf362da5 Fix viewing invitations when the inviter has no avatar set
Signed-off-by: Felix Krull <f_krull@gmx.de>
2021-04-06 13:55:22 +02:00
Šimon Brandner
d547cd5db8
Show drop file UI only if dragging a file
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-06 07:52:02 +02:00
Travis Ralston
4d72af7916
Merge pull request #5744 from panoschal/forgot-password-validation
Require strong password in forgot password form
2021-04-05 00:46:47 -06:00
Panagiotis
901d5a86d0 Merge branch 'develop' into forgot-password-validation 2021-04-01 12:39:25 +03:00
Panagiotis
d2f40a859b define PASSWORD_MIN_SCORE in one place and import from there 2021-04-01 12:30:49 +03:00
Aaron Raimist
0af52c931e
Merge branch 'develop' into only-member-warning
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-03-31 23:15:09 -05:00
Germain Souquet
a308a54183 Clicking jump to bottom resets room hash 2021-03-31 12:28:24 +01:00
Clemens Zeidler
be00320def Make use of the KeyBindingsManager in the ScrollPanel
Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
2021-03-29 13:38:15 +13:00
Clemens Zeidler
7d087524a5 Make use of the KeyBindingManager in LeftPanel
LeftPanel was making key action decisions based on the forwarded event.
Use the KeyBindingManager now.

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
2021-03-28 20:00:53 +13:00
J. Ryan Stinnett
33e8edb3d5
Merge pull request #5720 from czeidler/key-bindings
Decouple key bindings from event handling
2021-03-26 15:14:38 +00:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12
Fixing spaces papercuts
2021-03-26 15:01:31 +00:00
Travis Ralston
e48dbef054
Merge pull request #5804 from matrix-org/travis/uploads-fix
Fix upload bar not populating when starting uploads
2021-03-26 08:08:21 -06:00
Michael Telatynski
af18019314 Final spaces tweaks for the demo 2021-03-26 13:46:01 +00:00
Michael Telatynski
eff0e6fcc3 Add facepile to Space landing page and tweak layout slightly 2021-03-26 13:11:57 +00:00
J. Ryan Stinnett
5f70c625ab
Merge pull request #5807 from matrix-org/jryans/tweak-cs-text
Tweak cross-signing copy
2021-03-26 12:12:25 +00:00
J. Ryan Stinnett
fd59a66523 Tweak cross-signing copy
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
2021-03-26 11:13:39 +00:00
Michael Telatynski
a8c1b7abab Hide space room management checkboxes if you don't have permission at the root space 2021-03-26 09:59:02 +00:00
Michael Telatynski
8c6d92cc99 Move space room discovery & management into the space room view 2021-03-26 09:54:15 +00:00
Travis Ralston
76a05eddfa Fix upload bar not populating when starting uploads
Fixes https://github.com/vector-im/element-web/issues/16713

See diff for more information
2021-03-25 22:29:21 -06:00
Travis Ralston
318db15e35
Merge pull request #5790 from panoschal/fix/view-source-bug
View Source: make Event ID go below Event ID
2021-03-25 19:11:26 -06:00
Michael Telatynski
d5ab7801f7
Merge pull request #5797 from matrix-org/t3chguy/redaction-groupere
Fix edge case with redaction grouper messing up continuations
2021-03-25 20:01:32 +00:00
Michael Telatynski
5e3a7c48f4 Fix edge case with redaction grouper messing up continuations 2021-03-25 19:37:55 +00:00
Michael Telatynski
5061db259a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12 2021-03-25 16:37:56 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Michael Telatynski
35ede972db clear filter when switching spaces 2021-03-25 13:29:17 +00:00
Michael Telatynski
3ce9db162e Tweak some spaces copy 2021-03-25 13:24:16 +00:00
Panagiotis
aa1f468235 fix: room id sticked with event id 2021-03-25 14:36:40 +02:00
Michael Telatynski
760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11
Tweak and fix some space features
2021-03-25 09:02:11 +00:00
Michael Telatynski
d705e3020f delint 2021-03-24 20:01:27 +00:00
Michael Telatynski
20ea1436fc Update iconography for spaces 2021-03-24 19:43:33 +00:00
Michael Telatynski
8369d42dd0 Hoist activeSpace tracking from RoomList to LeftPanel 2021-03-24 19:43:09 +00:00
Michael Telatynski
6d9496cc22 Consolidate space summary api logic between space room view and directory 2021-03-24 17:02:12 +00:00
Michael Telatynski
d9f3e70b0b Fix joining over federation from Space Home (via servers) 2021-03-24 16:46:30 +00:00
Michael Telatynski
56dbd5f628 Remove unused autoJoin prop and move viaServers logic into RVS
this fixes the issue where autoJoining ignored viaServers
2021-03-24 16:45:53 +00:00
Michael Telatynski
ea760e8f29 Fix space room directory behaviour 2021-03-24 15:26:56 +00:00
Michael Telatynski
3df3baea14 Tweak behaviour during space creation 2021-03-24 14:19:10 +00:00
Michael Telatynski
f7a3805eed Fix styling inconsistency in space room view 2021-03-24 14:02:25 +00:00
Michael Telatynski
4e9a2df3b0 Spaces autofocus and prefill the search box 2021-03-24 14:00:52 +00:00
Michael Telatynski
fb46815b6a Spaces move away from Form Buttons 2021-03-24 13:15:31 +00:00
Travis Ralston
2f2bb9456f Reduce code duplication 2021-03-23 18:17:41 -06:00
Travis Ralston
fa54ca615a Appease the linter 2021-03-22 21:41:13 -06:00
Travis Ralston
026aa6f88d Track next event [tile] over group boundaries
Fixes https://github.com/vector-im/element-web/issues/16745
2021-03-22 21:39:07 -06:00
Travis Ralston
2f8ed0bffc
Merge pull request #5781 from matrix-org/t3chguy/fix/16739
Fix redaction event list summaries breaking sender profiles
2021-03-22 15:52:36 -06:00
Michael Telatynski
2818cdf3d4 Fix space hierarchy exploding when encountering an empty subspace 2021-03-22 17:46:50 +00:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10
Improve discovery of rooms in a space
2021-03-22 13:24:23 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
Michael Telatynski
497caf5645 Fix redaction event list summaries breaking sender profiles 2021-03-22 13:22:16 +00:00
Michael Telatynski
98df2883d3
Merge pull request #5728 from matrix-org/t3chguy/fix/3657
Collapse redactions into an event list summary
2021-03-19 19:16:20 +00:00
Travis Ralston
3caf07be87
Merge pull request #5658 from matrix-org/travis/welcome-login
Add an optional config option to make the welcome page the login page
2021-03-19 09:12:35 -06:00
Travis Ralston
6ce0c17455
Merge pull request #5774 from matrix-org/travis/js-sdk-imports
Convert a bunch more js-sdk imports to absolute paths
2021-03-19 07:23:45 -06:00
Travis Ralston
1f5c090ed2
Merge pull request #5775 from matrix-org/travis/fix-archive
Remove forgotten rooms from the room list once forgotten
2021-03-19 07:23:18 -06:00
Michael Telatynski
76dffdcb2c Tweak space creation copy and auto focus fields 2021-03-19 13:20:30 +00:00
Michael Telatynski
1fbbb67e74 Consolidate button styles in Space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski
c6f6d24b32 Iterate space creation and previews 2021-03-19 13:20:30 +00:00
Michael Telatynski
90d87122bc Tweak copy on space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski
d04c8b3fb4 Improve discovery of rooms in a space 2021-03-19 11:54:10 +00:00
Travis Ralston
3bd186e2d2
Merge pull request #5772 from SimonBrandner/fix-timeline-jumps
Fix weird timeline jumps
2021-03-18 23:51:52 -06:00
Travis Ralston
1d43c8b791 Remove forgotten rooms from the room list once forgotten
Fixes https://github.com/vector-im/element-web/issues/15559

This isn't exactly perfect as an implementation: if the user refreshes immediately after forgetting then there is a good chance the room re-appears because of the sync accumulator. At the very least this change makes it so in *most* cases the room goes away, which is probably good enough until https://github.com/vector-im/element-web/issues/14038 can be implemented properly.
2021-03-18 23:28:59 -06:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
Travis Ralston
720ac9d837 Replace type declaration in Registration.tsx 2021-03-18 14:45:14 -06:00
Šimon Brandner
4a506a809e
Merge branch 'develop' into fix-timeline-jumps 2021-03-18 18:26:43 +01:00
Šimon Brandner
7ac8fdea64
Don't call scrollToBottom() on scroll_to_bottom()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-18 18:02:33 +01:00
Šimon Brandner
a4a3b4da78
jumpToLiveTimeline() on scroll_to_bottom
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-18 18:01:50 +01:00
Michael Telatynski
17399c6be6
Merge pull request #5764 from matrix-org/t3chguy/spaces4.9
Fix left panel resizing and lower min-width improving flexibility
2021-03-18 11:34:55 +00:00
David Baker
bd763a09ba
Merge pull request #5765 from matrix-org/dbkr/resize_dispatch_async
Make some dispatches async
2021-03-16 16:00:05 +00:00
David Baker
67e2ae9988 Make some dispatches async
It looks like these dispatches were being dispatched while already
dispatching, causing soft crashes (although I can't see where the
first dispatch was from). Either way, seems like these didn't need
to be sync.
2021-03-16 15:42:03 +00:00
Michael Telatynski
688407abe6
Merge branch 'develop' into t3chguy/spaces4.9 2021-03-16 11:14:38 +00:00
Michael Telatynski
11cd791c76 Tweak left panel min widths for better flexibility 2021-03-16 11:13:39 +00:00
Michael Telatynski
baaceccfda Rearrange dom hierarchy to put space panel at same level as LeftPanel
so they don't steal horizontal space from each other
2021-03-16 11:13:39 +00:00
Travis Ralston
0e0ccfea88
Merge pull request #5756 from SimonBrandner/hangup-all-on-logout
Hangup all calls on logout
2021-03-15 21:10:13 -06:00
Travis Ralston
9b6d9b3bf1 years are difficult 2021-03-12 15:02:39 -07:00
Travis Ralston
75cfd9a8f5 Redirect to login properly 2021-03-12 15:01:05 -07:00
Travis Ralston
c8d7b0e1b9 Collapse copyright 2021-03-12 14:56:47 -07:00
Travis Ralston
25485edb3f Merge branch 'develop' into travis/welcome-login 2021-03-12 14:55:40 -07:00
Travis Ralston
d3541b78eb
Merge pull request #5714 from matrix-org/travis/media-customization
Support a media handling customisation endpoint
2021-03-12 11:01:59 -07:00
Šimon Brandner
02051a39ff
Hangup all calls on logout
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-12 13:55:14 +01:00
Clemens Zeidler
a8a8741c06 Make FocusRoomSearch a NavigationAction 2021-03-12 19:40:28 +13:00
Clemens Zeidler
2a21d45ac0 Merge branch 'develop' into key-bindings 2021-03-12 16:44:12 +13:00
panoschal
104bcdd0b0
Merge branch 'develop' into forgot-password-validation 2021-03-11 19:18:08 +02:00
Travis Ralston
a9a4bd50ca Merge branch 'develop' into travis/media-customization 2021-03-11 08:37:49 -07:00
Panagiotis
be7fb33a67 Merge branch 'develop' into edit-view-source 2021-03-11 17:07:56 +02:00
Travis Ralston
229a95f190
Merge pull request #5734 from matrix-org/travis/skinning/pt3-easy-comps
[SK-3] Decorate easy components with replaceableComponent
2021-03-11 07:26:20 -07:00
Michael Telatynski
081e745417
Merge pull request #5751 from matrix-org/t3chguy/spaces4.7
Rebuild space previews with new designs
2021-03-11 14:06:31 +00:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login
Rework cross-signing login flow
2021-03-11 12:53:55 +00:00
Michael Telatynski
6d81634eec Rebuild space previews with new designs 2021-03-11 11:49:43 +00:00
Michael Telatynski
bd3386358a
Merge pull request #5749 from matrix-org/t3chguy/spaces4.6
Properly gate SpaceRoomView behind labs
2021-03-11 11:17:36 +00:00
Michael Telatynski
4ca838d4c7 Properly gate SpaceRoomView behind labs 2021-03-11 11:04:39 +00:00
Panagiotis
066f72fcdb feat: require strong password in forgot password form 2021-03-11 00:14:55 +02:00
Travis Ralston
533c9fed64 Appease the linter 2021-03-10 12:32:18 -07:00
Travis Ralston
fa5d98c319 Convert cases of getHttpUriForMxc to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca Convert cases of mxcUrlToHttp to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
e5180a472f Merge branch 'develop' into travis/skinning/pt3-easy-comps 2021-03-10 12:30:06 -07:00
Travis Ralston
9e43fca9b6
Merge pull request #5739 from matrix-org/travis/message-state-fixes/hidden-rr
Document behaviour of showReadReceipts=false for sent receipts
2021-03-10 07:23:51 -07:00
J. Ryan Stinnett
32f737e1ba Tweak sent marker code style 2021-03-10 13:45:37 +00:00
J. Ryan Stinnett
51ece182e8
Merge pull request #5737 from matrix-org/travis/message-states-fixes/edits
Fix sent markers disappearing for edits/reactions
2021-03-10 13:42:46 +00:00