Commit graph

31789 commits

Author SHA1 Message Date
Travis Ralston
78b1f6c0b1
Merge pull request #5784 from matrix-org/travis/sr-groups
Track next event [tile] over group boundaries
2021-03-23 18:27:53 -06:00
Travis Ralston
2f2bb9456f Reduce code duplication 2021-03-23 18:17:41 -06:00
Travis Ralston
fe71106b1b
Merge pull request #5780 from DantrazTrev/Discovery
Fixing the minor UI issues in the email discovery
2021-03-22 23:11:19 -06:00
Travis Ralston
edcd7c4426 Merge branch 'develop' into Discovery 2021-03-22 23:04: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
Hubert Chathi
3f74c43fc5
Merge pull request #5783 from uhoreg/fix_dehydration
Don't overwrite callback with undefined if no customization provided
2021-03-22 21:52:08 -04:00
Hubert Chathi
d5b115dd08 don't overwrite callback with undefined if no customization provided 2021-03-22 19:52:09 -04: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
Germain
c0c8a55449
Fix CIDER formatting buttons on Safari 2021-03-22 15:50:25 +00:00
Germain Souquet
0db31dfeae fix: CIDER formatting buttons on Safari 2021-03-22 15:05:22 +00:00
Germain Souquet
cfbcf12e1d docs: update file extensions in CIDER editor documentation 2021-03-22 15:02:28 +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
Travis Ralston
427f649be6
Merge pull request #5778 from tawfiek/dilog-btns
Make buttons in verify dialog respect the system font
2021-03-21 20:28:33 -06:00
Ayush PS
f5911e6446 Fixing the minor UI issues in the email discovery 2021-03-22 00:33:09 +05:30
Tawfiek
90b8a66476 fix make btns in verify dailog respect system font 2021-03-21 14:11:45 +02: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
Michael Telatynski
16ae01aa43
Merge pull request #5648 from jaiwanth-v/add-invite-to-context-menu
Added invite option to room's context menu
2021-03-19 17:34:22 +00:00
Jaiwanth
495cbadb08 Update src/components/views/rooms/RoomTile.tsx 2021-03-19 22:46:19 +05:30
Jaiwanth
70e0b77fc4 Changed invite phrases in context menu and invite dialog 2021-03-19 21:32:52 +05:30
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
Jaiwanth
b2a72565d3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into add-invite-to-context-menu 2021-03-19 20:28:10 +05:30
David Baker
8a765cf67a
Merge pull request #5770 from matrix-org/dbkr/jitsi_display_name
Fix username showing instead of display name in Jitsi widgets
2021-03-19 13:41:35 +00: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
2b4c670b89 Fix favourites not showing up in home until a refresh 2021-03-19 13:20:30 +00:00
Michael Telatynski
3718d550c5 Fix space creation menu shade width 2021-03-19 13:20:30 +00:00
Michael Telatynski
88b7c8f53d Fix add existing to space dialog showing all spaces additionally as rooms 2021-03-19 13:20:30 +00:00
Michael Telatynski
31ce19373b Fix space panel spacings 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
David Baker
4a734ef70b Clear displayname / vatar if they're unset 2021-03-19 11:29:14 +00:00
David Baker
cd138bf87e Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_display_name 2021-03-19 11:27:37 +00:00
David Baker
d06bd348a3
Merge pull request #5771 from matrix-org/dbkr/log_getusermedia_error
Log error when failing to list usermedia devices
2021-03-19 09:58:06 +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
c2cc086217 Import the js-sdk at the index so the request object gets set
Now that all the imports are replaced, we need to set up the js-sdk somewhere. Might as well do it in the index of the react-sdk where callers will be relying on those skin functions.
2021-03-18 21:24:02 -06:00
Travis Ralston
be8ee1a576 Appease the linter 2021-03-18 21:05:51 -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
e4b7a307ba
Merge pull request #5773 from matrix-org/travis/h/reg-type
Replace type declaration in Registration.tsx
2021-03-18 14:58:44 -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
David Baker
f3ca75391d Merge remote-tracking branch 'origin/develop' into dbkr/log_getusermedia_error 2021-03-18 17:15:07 +00: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