gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'develop' and 't3chguy/react16' of github.com:vector-im/riot-web into t3chguy/react16

This commit is contained in:
Michael Telatynski 2019-08-28 11:02:53 +01:00
parent 7eefc9d856 bd20796509
commit 8b1fdc6b73
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.sample.json
View File

@ -15,6 +15,13 @@
"brand": "Riot", "brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/", "integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api", "integrations_rest_url": "https://scalar.vector.im/api",
"integrations_widgets_urls": [
"https://scalar.vector.im/_matrix/integrations/v1",
"https://scalar.vector.im/api",
"https://scalar-staging.vector.im/_matrix/integrations/v1",
"https://scalar-staging.vector.im/api",
"https://scalar-staging.riot.im/scalar/api"
],
"integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html", "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"defaultCountryCode": "GB", "defaultCountryCode": "GB",

4
docs/labs.md
View File

@ -50,3 +50,7 @@ That's it. Now should see your new counter under the header.
An experimental, faster, message composer which should be more reliable and less prone to problems when An experimental, faster, message composer which should be more reliable and less prone to problems when
using your chosen input method. using your chosen input method.
## Multiple integration managers (`feature_many_integration_managers`)
Exposes a way to access all the integration managers known to Riot. This is an implementation of [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957).

6
electron_app/riot.im/config.json
View File

@ -6,9 +6,11 @@
"integrations_ui_url": "https://scalar.vector.im/", "integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api", "integrations_rest_url": "https://scalar.vector.im/api",
"integrations_widgets_urls": [ "integrations_widgets_urls": [
"https://scalar.vector.im/_matrix/integrations/v1",
"https://scalar.vector.im/api",
"https://scalar-staging.vector.im/_matrix/integrations/v1",
"https://scalar-staging.vector.im/api", "https://scalar-staging.vector.im/api",
"https://scalar-staging.riot.im/scalar/api", "https://scalar-staging.riot.im/scalar/api"
"https://scalar.vector.im/api"
], ],
"hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",

4
riot.im/app/config.json
View File

@ -5,8 +5,10 @@
"integrations_ui_url": "https://scalar.vector.im/", "integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api", "integrations_rest_url": "https://scalar.vector.im/api",
"integrations_widgets_urls": [ "integrations_widgets_urls": [
"https://scalar-staging.vector.im/api", "https://scalar.vector.im/_matrix/integrations/v1",
"https://scalar.vector.im/api", "https://scalar.vector.im/api",
"https://scalar-staging.vector.im/_matrix/integrations/v1",
"https://scalar-staging.vector.im/api",
"https://scalar-staging.riot.im/scalar/api" "https://scalar-staging.riot.im/scalar/api"
], ],
"hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",

9
riot.im/develop/config.json
View File

@ -5,9 +5,11 @@
"integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_ui_url": "https://scalar-staging.vector.im/",
"integrations_rest_url": "https://scalar-staging.vector.im/api", "integrations_rest_url": "https://scalar-staging.vector.im/api",
"integrations_widgets_urls": [ "integrations_widgets_urls": [
"https://scalar-staging.riot.im/scalar/api", "https://scalar.vector.im/_matrix/integrations/v1",
"https://scalar.vector.im/api",
"https://scalar-staging.vector.im/_matrix/integrations/v1",
"https://scalar-staging.vector.im/api", "https://scalar-staging.vector.im/api",
"https://scalar.vector.im/api" "https://scalar-staging.riot.im/scalar/api"
], ],
"hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
@ -26,7 +28,8 @@
"feature_sas": "labs", "feature_sas": "labs",
"feature_room_breadcrumbs": "labs", "feature_room_breadcrumbs": "labs",
"feature_state_counters": "labs", "feature_state_counters": "labs",
"feature_cider_composer": "labs" "feature_cider_composer": "labs",
"feature_many_integration_managers": "labs"
}, },
"welcomeUserId": "@riot-bot:matrix.org", "welcomeUserId": "@riot-bot:matrix.org",
"piwik": { "piwik": {