Commit Graph

18307 Commits (9e14e2d77be2bc75e87a1f50110f44ccda848c1e)

Author SHA1 Message Date
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 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 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 8736867dcf fix /invite Slash Command
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 16:53:25 +01:00
David Baker 8aa24f8987 Fix jitsi popout URL
Needs the template variables filled in
2020-04-01 14:42:17 +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 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
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
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
Bruno Windels 6dc7bf4bdf fix legacy verify user 2020-04-01 11:22:22 +02:00
Michael Telatynski 6bb6dbc0ff Fix Ctrl+/ for Finnish keyboard where it includes Shift
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:14:15 +01:00
Michael Telatynski 8bc54ae205 Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:08:26 +01:00
David Baker 538147f7fa 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 10:00:33 +01:00
Travis Ralston 6d0d77f98e Disable the linter on lines it complaints about UNSAFE_componentWillMount 2020-03-31 14:21:12 -06:00
Travis Ralston 0a6f54da33 Label and use UNSAFE_componentWillMount to minimize warnings
These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.

For https://github.com/vector-im/riot-web/issues/12877

These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
2020-03-31 14:15:23 -06:00
Travis Ralston 3f99332f4b Use componentDidMount in place of componentWillMount where possible
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
2020-03-31 14:14:17 -06:00
Travis Ralston c86d75693b Fix a number of minor code quality issues
Most of these are complaints from my IDE. Discovered by going through nearly every file looking for React warnings.
2020-03-31 14:05:56 -06:00
Michael Telatynski 56dda3895c
Merge pull request #4302 from matrix-org/t3chguy/cmds
rework SlashCommands to better expose aliases
2020-03-31 17:04:31 +01:00
Travis Ralston 64c11c3565 Move ssoUrl to a class property 2020-03-31 09:26:17 -06:00
Hubert Chathi 6596b7223a Merge branch 'develop' into uhoreg/check_sssss_passphrase 2020-03-31 10:39:56 -04:00
Travis Ralston 4a9bc5e5bf
Update src/components/views/auth/InteractiveAuthEntryComponents.js
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
2020-03-31 08:29:42 -06:00
Michael Telatynski 9ed08e76f8
Merge pull request #4310 from matrix-org/t3chguy/fix_peeking
Fix peeking keeping two timeline update mechanisms in play
2020-03-31 14:21:42 +01:00
Michael Telatynski 2624017ab9 Also stop peeking on unmount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:51:03 +01:00
Michael Telatynski 80479195c8 iterate PR based on feedback. Remove newballsplease cmd alias
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 11:53:26 +01:00
Michael Telatynski 6e61761012 Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds
 Conflicts:
	src/SlashCommands.tsx
2020-03-31 11:49:53 +01:00
J. Ryan Stinnett 223a4e285d
Merge pull request #4308 from matrix-org/jryans/4s-prompt-overload
Pass new secret storage key to bootstrap path
2020-03-31 11:04:58 +01:00
J. Ryan Stinnett 24c09cc4c8 Convert secret storage key creation to object 2020-03-31 10:45:53 +01:00
Michael Telatynski a2a9dc6cd0 Fix peeking keeping two timeline update mechanisms in play
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 10:37:56 +01:00
J. Ryan Stinnett 2455c5a850
Merge pull request #4303 from matrix-org/jryans/id-change-red
Show red shield for users that become unverified
2020-03-31 10:07:28 +01:00
Michael Telatynski c094afbbe6
Merge pull request #4295 from matrix-org/t3chguy/a11y2
Accessibility fixed for Event List Summary and Composer Format Bar
2020-03-31 09:41:20 +01:00
Michael Telatynski 1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso
Support $riot: Templates for SSO/CAS urls in the welcome.html page
2020-03-31 09:39:40 +01:00
Travis Ralston 2557875fd2
Merge pull request #4296 from waylon531/upstream
Added the /html command
2020-03-30 20:56:24 -06:00
Travis Ralston d899576578 Appease the linter 2020-03-30 20:24:53 -06:00
Travis Ralston de79520150 Add SSO dialog copy for 3PID adding (email/phone) 2020-03-30 20:18:52 -06:00
Travis Ralston 6112d92f80 Remove debugging 2020-03-30 20:11:23 -06:00