Travis Ralston
ab6bd4104f
Flag componentWillUpdate as UNSAFE in MatrixChat
...
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:32:35 -06:00
Travis Ralston
0bb8973ee6
Move rendering of PersistedElements into other lifecycle stages
...
For https://github.com/vector-im/riot-web/issues/12877
Original error:
```
Warning: Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate.
Check the render method of PersistedElement.
in PersistedElement (created by AppTile)
in div (created by AppTile)
in div (created by AppTile)
in AppTile (created by AppsDrawer)
in div (created by AppsDrawer)
in div (created by AppsDrawer)
in AppsDrawer (created by AuxPanel)
in div (created by AutoHideScrollbar)
in AutoHideScrollbar (created by AuxPanel)
in AuxPanel (created by RoomView)
in div (created by RoomView)
in div (created by MainSplit)
in MainSplit (created by RoomView)
in ErrorBoundary (created by RoomView)
in main (created by RoomView)
in RoomView (created by LoggedInView)
in div (created by LoggedInView)
in DragDropContext (created by LoggedInView)
in div (created by LoggedInView)
in LoggedInView (created by MatrixChat)
in ErrorBoundary (created by MatrixChat)
in MatrixChat
```
2020-04-01 14:30:57 -06:00
Travis Ralston
05b58dc81d
Merge pull request #4330 from matrix-org/travis/react-warnings/4-false-positives
...
Use console.log in place of console.warn for less warnings
2020-04-01 14:14:51 -06:00
Travis Ralston
9e14e2d77b
Merge pull request #4329 from matrix-org/travis/fix-breadcrumbs
...
Revert componentDidMount changes on breadcrumbs
2020-04-01 14:13:39 -06:00
Hubert Chathi
8680e50dd1
Merge pull request #4309 from matrix-org/uhoreg/check_sssss_passphrase
...
Use new method for checking secret storage key
2020-04-01 16:02:06 -04:00
Travis Ralston
ba0a9c8439
Use console.log in place of console.warn for less warnings
...
These aren't react warnings, but they are distracting in the logs.
2020-04-01 13:59:48 -06:00
Travis Ralston
620c2effda
Appease the linter by turning it off
2020-04-01 13:52:49 -06:00
Travis Ralston
e741d0d577
Revert componentDidMount changes on breadcrumbs
...
Fixes https://github.com/vector-im/riot-web/issues/12990
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4313
2020-04-01 13:41:24 -06:00
Travis Ralston
c0ffa8b59a
Fix merge conflict between react warnings and SSO
2020-04-01 11:32:13 -06:00
Travis Ralston
36ccb7e752
Merge pull request #4315 from matrix-org/travis/react-warnings/3-componentCannotDidMount
...
Label and use UNSAFE_componentWillMount to minimize warnings
2020-04-01 11:14:26 -06:00
Travis Ralston
07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount
2020-04-01 11:14:19 -06:00
Travis Ralston
0fcbe40bec
Merge pull request #4314 from matrix-org/travis/react-warnings/2-code-quality
...
Fix a number of minor code quality issues
2020-04-01 11:13:46 -06:00
Travis Ralston
59a99bbad8
Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount
...
Use componentDidMount in place of componentWillMount where possible
2020-04-01 11:13:04 -06:00
Travis Ralston
8f04746e4e
Revert to UNSAFE_componentWillMount where componentDidMount will not work
2020-04-01 11:05:49 -06:00
Damir Jelić
47ee7e6ec2
Merge branch 'poljar/eventindex-initial-full-crawl' into develop
2020-04-01 18:52:35 +02:00
Michael Telatynski
544bd09667
Merge pull request #4320 from matrix-org/t3chguy/user_info_buttons
...
Fix UserInfo e2e buttons to match Figma
2020-04-01 17:47:05 +01:00
Michael Telatynski
7143c91d16
Merge pull request #4316 from matrix-org/t3chguy/room-tile-auto-scroll
...
Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
2020-04-01 17:46:41 +01:00
Travis Ralston
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia
...
Support SSO for interactive authentication
2020-04-01 10:27:24 -06:00
Michael Telatynski
138d280e4e
Merge pull request #4328 from matrix-org/t3chguy/slashcommands
...
fix /invite Slash Command
2020-04-01 17:02:47 +01:00
Michael Telatynski
8736867dcf
fix /invite Slash Command
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 16:53:25 +01:00
RiotRobot
84da483264
Reset matrix-js-sdk back to develop branch
2020-04-01 15:00:05 +01:00
RiotRobot
d8d48275c3
Merge branch 'master' into develop
2020-04-01 14:59:01 +01:00
RiotRobot
adb2fc89e2
v2.3.1
2020-04-01 14:57:53 +01:00
RiotRobot
abb8564c5d
Prepare changelog for v2.3.1
2020-04-01 14:57:53 +01:00
David Baker
c027c5da41
Merge pull request #4327 from matrix-org/dbkr/template_popout_url_rel
...
Fix jitsi popout URL
2020-04-01 14:45:02 +01:00
J. Ryan Stinnett
4be08a901a
Merge pull request #4326 from matrix-org/dbkr/template_popout_url
...
Fix jitsi popout URL
2020-04-01 14:44:22 +01:00
David Baker
53c854efba
Fix jitsi popout URL
...
Needs the template variables filled in
2020-04-01 14:44:01 +01:00
David Baker
8aa24f8987
Fix jitsi popout URL
...
Needs the template variables filled in
2020-04-01 14:42:17 +01:00
J. Ryan Stinnett
3f93bdb329
Merge pull request #4324 from matrix-org/jryans/conf-under-release
...
Remove underscore from Jitsi conference names
2020-04-01 14:24:09 +01:00
Travis Ralston
cf635c66db
Remove underscore from Jitsi conference names
...
Fixes https://github.com/vector-im/riot-web/issues/12929
Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
2020-04-01 14:22:14 +01:00
Damir Jelić
bec061239a
EventIndex: Mark the initial checkpoints for a full crawl.
...
The logic determining if a batch of events is already in the database
has been reported to be faulty. Since we know that when we add initial
checkpoints they need to go to the start of the timeline we can mark
them to do a full crawl which will skip the test if the events are
already in the database.
This is a quick fix for this and checkpoints that are added after a gap
in the timeline might incorrectly conclude the same resulting in missing
events if there was a gap and the issue is triggered.
2020-04-01 15:17:59 +02:00
David Baker
144c657b61
Merge pull request #4323 from matrix-org/dbkr/use_own_jitsi_widget_for_popout
...
Use our own jitsi widget for the popout URL
2020-04-01 14:07:53 +01:00
David Baker
66d292f722
Use our own jitsi widget for the popout URL
...
rather than the URL supplied by the widget
2020-04-01 14:01:01 +01:00
David Baker
f3e2ab6098
Merge pull request #4322 from matrix-org/dbkr/jitsi_fix_popout_rel
...
Fix popout support for jitsi widgets
2020-04-01 13:59:43 +01:00
David Baker
ce68b960f4
Use our own jitsi widget for the popout URL
...
rather than the URL supplied by the widget
2020-04-01 13:58:44 +01:00
David Baker
2cc938a576
Remove unintentional changes
2020-04-01 13:36:26 +01:00
David Baker
293c8f0e7c
lint
2020-04-01 13:36:20 +01:00
David Baker
3087f816fe
Use URL without wurl params for popout
...
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 13:36:13 +01:00
David Baker
d92a19ecff
Remove get-config API
...
which is no longer necessary now the jitsi wrapper has its own
external-api script
2020-04-01 13:36:06 +01:00
David Baker
6df4a44cc1
Better support for widgets overriding their URLs
...
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
2020-04-01 13:36:00 +01:00
Michael Telatynski
759de88b43
match padding too
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:25:48 +01:00
Michael Telatynski
4a4a13ac75
Fix UserInfo e2e buttons to match Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:21:18 +01:00
David Baker
a76b089cf3
Merge pull request #4319 from matrix-org/dbkr/jitsi_fix_popout
...
Fix popout support for jitsi widgets
2020-04-01 11:57:25 +01:00
David Baker
072d9f12c7
Remove unintentional changes
2020-04-01 11:41:32 +01:00
David Baker
9b4ce02eaf
lint
2020-04-01 11:28:02 +01:00
David Baker
a2f92e93a7
Use URL without wurl params for popout
...
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 11:18:45 +01:00
Bruno Windels
7a92c90b79
Merge pull request #4318 from matrix-org/bwindels/fixlegacyuserverif
...
Fix: legacy verify user throwing error
2020-04-01 10:03:53 +00:00
Bruno Windels
775ba0f74e
Merge pull request #3046 from matrix-org/bwindels/settings-config-doc
...
document settingDefaults
2020-04-01 09:57:43 +00:00
Bruno Windels
66aea5eea5
Merge branch 'develop' into bwindels/settings-config-doc
2020-04-01 11:43:03 +02:00
David Baker
274eb75c38
Remove get-config API
...
which is no longer necessary now the jitsi wrapper has its own
external-api script
2020-04-01 10:40:03 +01:00