Commit Graph

44 Commits

Author SHA1 Message Date
Jorik Schellekens 3e21483b82 Try to silence the e2e test
Merge branch 'develop' of github.com:vector-im/riot-web into joriks/font-sclaing-slider
2020-04-23 10:19:45 +01:00
Jorik Schellekens 201053963d
Strings should be explicit
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-21 10:01:45 +01:00
Jorik Schellekens 4eb5de90a1 Add font scaling labs setting. 2020-04-16 11:23:17 +01:00
David Baker 421fcb115f Give the jitsi wrapper its own external api script 2020-04-01 10:38:49 +01:00
Travis Ralston e1eb16ce46 Use a local widget wrapper for Jitsi calls
Effectively fixes https://github.com/vector-im/riot-web/issues/11074
Effectively fixes https://github.com/vector-im/riot-web/issues/7112
Fixes https://github.com/vector-im/riot-web/issues/6930
Fixes Jitsi widgets not working for guests (https://github.com/vector-im/riot-web/issues/8933)
Fixes https://github.com/vector-im/riot-web/issues/5048

Previously we were relying on an integration manager to be defined, functional, and alive in order to join Jitsi calls. This commit changes this so we aren't reliant on an integration manager for Jitsi calls at all, and gives people the option of choosing a Jitsi server via the config.json.

This side is just the wrapper/shell: the logic is mostly in the react-sdk (to be linked via PRs). This layer simply has an HTML file exported that can be used to render a Jitsi widget, and the react-sdk constructs a URL to access it locally. This is similar to how the mobile apps handle Jitsi widgets: instead of iframing the widget URL directly into the app, they pull apart the widget information and natively render it. We're effectively doing the same here by parsing the widget options and using our local wrapper instead of whatever happens to be defined in the widget state event.

Integration managers should still continue to offer a widget URL for Jitsi widgets as this is what the spec requires.

A large part of this is based upon Dimension's handling of Jitsi and widgets in general: a license has been granted to allow Riot (and therefore the react-sdk) to use the code and be inspired by it.
2020-03-18 15:48:02 -06:00
Aaron Raimist 942b29c6d7
Update sample config
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-29 20:17:20 -06:00
Travis Ralston 4c92e0aa2c Update sample config for new matrix.org CS API URL
This was missed in https://github.com/vector-im/riot-web/pull/11112
2019-10-23 13:16:00 -06:00
Bruno Windels 57e597ec13
Merge pull request #9919 from vector-im/bwindels/settings-config-doc
add settingDefaults to sample config
2019-10-07 14:10:51 +00:00
Bruno Windels 259ca06f73 add example default setting 2019-10-07 14:46:50 +02:00
Jason Robinson 2b5fcbdcbd Provide our common integrations_widget_urls defaults for sample config
Closes #10454
2019-08-26 10:03:50 +03:00
Travis Ralston 83da5e6004 Update references to features 2019-07-25 14:53:53 -06:00
J. Ryan Stinnett 8398ec5358 Remove reactions feature flag from docs and config
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-18 10:48:43 +01:00
J. Ryan Stinnett 7731f93676 Remove edits feature flag from docs and config
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-18 10:46:19 +01:00
Travis Ralston f3e82b56e9 Remove unused disable_identity_server config flag
Fixes https://github.com/vector-im/riot-web/issues/10229
2019-07-11 15:11:59 -06:00
Travis Ralston cafae31827 Add docs for defaultCountryCode 2019-05-31 21:23:58 -06:00
Bruno Windels f1531d2b12 add settingDefaults to sample config 2019-05-31 14:52:29 +02:00
Travis Ralston 98f2d865b9 Add 'showLabsSettings' flag to docs+sample config 2019-05-30 20:03:42 -06:00
Travis Ralston 1ac5df3cd0 Merge branch 'develop' into travis/feature/wellknown2 2019-05-16 12:58:09 -06:00
J. Ryan Stinnett 5a6be9a665 Add message editing to sample also 2019-05-15 11:12:12 +01:00
Travis Ralston f08491cee8 Validate default homeserver config before loading the app
Implements the process described here: https://github.com/vector-im/riot-web/issues/9290#issuecomment-481966910

The expectation is that later layers (like the react-sdk) will make use of the `validated_discovery_config` option instead of interpreting the config themselves.

We intentionally block the UI from loading here to avoid races between discovery and the app loading.
2019-05-03 11:06:32 -06:00
J. Ryan Stinnett ea37e777cf Add reactions feature to config sample 2019-04-26 10:56:35 +01:00
J. Ryan Stinnett dee0258f44 Remove old welcome page from config sample 2019-02-08 16:46:22 +00:00
David Baker b2ae1926a6 Sample cionfig for jitsi integration URL 2018-07-18 12:06:07 +01:00
David Baker da25f49cd7 Add dosable-presence-by-hs option to sample config 2018-03-19 16:49:41 +00:00
Michael Telatynski 26269986f5
move piwik whitelists to conf and add piwik config.json info to readme
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 15:36:28 +00:00
Matthew Hodgson 5abee4fddc replace some of the status.im theme with general config options 2017-11-11 23:47:03 +00:00
David Baker b9e2b59504 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 19:01:34 +01:00
Matthew Hodgson 225c7ee621 Merge branch 'develop' into matthew/status 2017-10-26 01:46:06 +01:00
Matthew Hodgson f86b616769 status homepage 2017-10-26 01:38:07 +01:00
lub b5629ac3e6 fix comma error of features example
Signed-off-by: Simon Körner <github@lubiland.de>
2017-10-24 11:43:15 +02:00
Matthew Hodgson 508a850dec add features example to config.sample.json 2017-10-23 14:54:38 +01:00
Matthew Hodgson 6fa2d35630 support concept of default theme 2017-10-20 18:41:39 +01:00
Michael Telatynski 27a1038e8d
Merge branch 'master' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-08-02 11:48:20 +01:00
Matthew Hodgson d264426ece Merge branch 'develop' into new-guest-access 2017-05-30 21:06:45 +01:00
Michael Telatynski 8a59acb5c3 explicit protocol in configs, otherwise breaks in Electron
when it tries file://

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:32:44 +01:00
Matthew Hodgson a92d96347b Merge branch 'develop' into new-guest-access 2017-05-28 22:50:53 +01:00
Michael Telatynski 2e75640cdd sample piwik config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 11:27:33 +01:00
Luke Barnard f60be2d658 Add welcomeUserId to sample config 2017-05-12 16:12:17 +01:00
Richard van der Hoff f9ae456a64 Fix bug report endpoint in config.sample.json.
Not sure why this was like this - has vector.im/bugs *ever* worked?
2017-05-09 12:27:41 +01:00
Pablo Saavedra 53796f55be Added default_federate property 2017-05-08 12:25:45 +02:00
Kegan Dougal 3996d23b19 Inject bug report endpoint URL from config.json 2017-01-19 16:49:25 +00:00
David Baker 994bc9279f Remove the client side filtering from the room dir
This removes the ability for the client to filter remote room
directories by network, since the /thirdparty/protocols API does
not yet work for remote servers. They would only get the main list
now though anyway, so there is no point in us continuing to support
it.
2016-12-16 14:17:13 +00:00
David Baker 0df242e0e9 Add Freenode & Mozilla domains
So the join button works for them
2016-11-24 16:20:58 +00:00
David Baker 1e2cd9c2d1 Build all of the vector dir in the build process
So the whole vector/ directory can now be removed during the build
process and we don't ship random files that end up in the vector
directory.
2016-11-08 14:30:12 +00:00