Commit Graph

22961 Commits (24a5d8355fb3e69cf649e8c8de118859edbe16c1)

Author SHA1 Message Date
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 6293684218 Fix Room Settings Dialog Notifications tab icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:57:28 +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
Bruno Windels ce8f7eaace
Apply suggestions from code review
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-01 09:37:17 +00:00
Bruno Windels 50bb556bc7
Update docs/settings.md
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-01 09:36:50 +00:00
Michael Telatynski 7ba6462a5d
Merge pull request #4317 from matrix-org/t3chguy/fix_kbd_finnish
Fix Ctrl+/ for Finnish keyboard where it includes Shift
2020-04-01 10:30:39 +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
Michael Telatynski c75475f3f5
Merge pull request #4311 from matrix-org/t3chguy/fix_els
Fix EventListSummary when RR rendering is disabled
2020-03-31 16:18:16 +01:00
Michael Telatynski eb901441cd Fix alignment of e2e icon in userinfo and expose full displayname in title
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 16:14:18 +01:00
Jorik Schellekens 6da01a9cf7
Merge pull request #4299 from JorikSchellekens/joriks/css-location
Update link to css location.
2020-03-31 16:00:11 +01: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
Jorik Schellekens e2685b1cf0 Licensing info 2020-03-31 15:29:40 +01:00
Jorik Schellekens 6cf9166c4a Use variables for the rem values.
It's become obvious that these random floating points everywhere
are unwieldy. Now they're all in one place with some fairly logical
variable names which will help out in design->implementation phase.
2020-03-31 15:26:23 +01: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