Tulir Asokan
99717db762
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-03-19 21:58:30 +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
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
David Baker
84b6027d41
Log error when failing to list usermedia devices
...
So we can debug why this might be failing
2021-03-18 16:41:22 +00:00
Travis Ralston
b69d9e8c33
Merge pull request #5767 from matrix-org/travis/no-persist-logs
...
Add possibility to delay rageshake persistence in app startup
2021-03-18 07:55:31 -06: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
2b608aa919
Remove blank line
2021-03-17 19:18:32 +00:00
David Baker
d95955d90b
Merge branch 'develop' into dbkr/jitsi_display_name
2021-03-17 19:17:52 +00:00
David Baker
f6a87386bc
Fix username showing instead of display name in Jitsi widgets
...
If you opened element and entered a jitsi conference straight away
in the room you landed in, your jitsi display name would be your
matrix username rather than your display name. This was because
OwnProfileStore was still busy fetching your profile from the server
while the room, and therefore jitsi widget, was rendered.
Blocking these widgets loading on this profile fetch completing isn't
really an option, so store the profile data in localstorage and seed
OwnProfileStore with the values from there.
Bonus: the name in the top left will now be your display name as
soon as the app is loaded, rather than being your username for the
first several seconds after you load the app.
Fixes https://github.com/vector-im/element-web/issues/16577
2021-03-17 19:09:43 +00:00
Travis Ralston
e223235999
Merge pull request #5766 from matrix-org/travis/block-bugs
...
Work around more cases where a rageshake server might not be present
2021-03-16 18:10:55 -06:00
Travis Ralston
c285b79a8d
Add possibility to delay rageshake persistence in app startup
...
Even if the app takes a moment to set up persistence, this will still capture any logs before persistence happened.
2021-03-16 14:19:49 -06:00
Travis Ralston
451a3aaa3f
Work around more cases where a rageshake server might not be present
...
We already do this for a number of other places (slash commands, help section of settings, etc) - these places appear to have been missed, though.
2021-03-16 13:50:43 -06:00
Michael Telatynski
0ce78f469f
Merge pull request #5761 from matrix-org/t3chguy/spaces4.8
...
Iterate space panel visually and functionally
2021-03-16 17:41:14 +00:00
Michael Telatynski
5ce3a05867
Update _SpacePanel.scss
2021-03-16 16:34:28 +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
Michael Telatynski
4ae6c2f808
Merge pull request #5762 from timokoesters/fix-servername-parsing
...
fix: make room directory correct when using a homeserver with explicit port
2021-03-16 10:12:58 +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
78f7711dfd
Merge pull request #5757 from matrix-org/travis/cleanup-login
...
Remove now-unused assets and CSS from CompleteSecurity step
2021-03-15 16:27:53 -06:00
Timo Kösters
f575625c7a
fix: make room directory correct when using a homeserver with explicit port
...
Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids
Therefore we can use change the regex to make sure the localpart is not
allowed to contain ':'.
2021-03-15 23:13:16 +01:00
RiotRobot
3154dd6cd4
Add SDK version to changelog
2021-03-15 14:48:40 +00:00
RiotRobot
a696c09e1e
Reset matrix-js-sdk back to develop branch
2021-03-15 14:47:08 +00:00
RiotRobot
1d1263c39a
Resetting package fields for development
2021-03-15 14:46:57 +00:00
RiotRobot
a9a50663a3
Merge branch 'master' into develop
2021-03-15 14:46:56 +00:00
RiotRobot
44fd41cb1e
v3.16.0
2021-03-15 14:45:36 +00:00
RiotRobot
2ef9f3327e
Prepare changelog for v3.16.0
2021-03-15 14:45:35 +00:00
