mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-10 07:05:14 +00:00
Merge remote-tracking branch 'origin/develop' into dbkr/wasm
This commit is contained in:
commit
e277d02f83
5 changed files with 23 additions and 9 deletions
18
README.md
18
README.md
|
@ -90,7 +90,7 @@ to build.
|
||||||
npm install
|
npm install
|
||||||
npm run build
|
npm run build
|
||||||
```
|
```
|
||||||
Or just use https://riot.im/develop - the continuous integration release of the
|
Or just use https://riot.im/develop - the continuous integration release of the
|
||||||
develop branch. (Note that we don't reference the develop versions in git directly
|
develop branch. (Note that we don't reference the develop versions in git directly
|
||||||
due to https://github.com/npm/npm/issues/3055.)
|
due to https://github.com/npm/npm/issues/3055.)
|
||||||
1. Install the prerequisites: `npm install`.
|
1. Install the prerequisites: `npm install`.
|
||||||
|
@ -134,7 +134,9 @@ For a good example, see https://riot.im/develop/config.json
|
||||||
1. `integrations_rest_url`: URL to the REST interface for the integrations server.
|
1. `integrations_rest_url`: URL to the REST interface for the integrations server.
|
||||||
1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
|
1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
|
||||||
1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
|
1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
|
||||||
https://github.com/matrix-org/rageshake server)
|
https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
|
||||||
|
"Send Logs" within the application. Bug reports can be disabled by leaving the
|
||||||
|
`bug_report_endpoint_url` out of your config file.
|
||||||
1. `roomDirectory`: config for the public room directory. This section is optional.
|
1. `roomDirectory`: config for the public room directory. This section is optional.
|
||||||
1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
|
1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
|
||||||
down list. Optional.
|
down list. Optional.
|
||||||
|
@ -147,11 +149,13 @@ For a good example, see https://riot.im/develop/config.json
|
||||||
anything else since it is used to isolate the privileges of file attachments to this
|
anything else since it is used to isolate the privileges of file attachments to this
|
||||||
domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
|
domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
|
||||||
https://github.com/matrix-org/usercontent/blob/master/v1.html
|
https://github.com/matrix-org/usercontent/blob/master/v1.html
|
||||||
1. `piwik`: an object containing the following properties:
|
1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
|
||||||
1. `url`: The URL of the Piwik instance to use for collecting Analytics
|
option out of your config file. If you want to enable analytics, set `piwik` to be an object
|
||||||
1. `whitelistedHSUrls`: a list of HS URLs to not redact from the Analytics
|
containing the following properties:
|
||||||
1. `whitelistedISUrls`: a list of IS URLs to not redact from the Analytics
|
1. `url`: The URL of the Piwik instance to use for collecting analytics
|
||||||
1. `siteId`: The Piwik Site ID to use when sending Analytics to the Piwik server configured above
|
1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
|
||||||
|
1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
|
||||||
|
1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
|
||||||
1. `teamServerConfig`, `teamTokenMap`, `referralBaseUrl`: an obsolete precursor to communities
|
1. `teamServerConfig`, `teamTokenMap`, `referralBaseUrl`: an obsolete precursor to communities
|
||||||
with referral tracking; please ignore it.
|
with referral tracking; please ignore it.
|
||||||
1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
|
1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
"build:bundle": "cross-env NODE_ENV=production webpack-cli -p --progress --bail --mode production",
|
"build:bundle": "cross-env NODE_ENV=production webpack-cli -p --progress --bail --mode production",
|
||||||
"build:bundle:dev": "webpack-cli --progress --bail --mode development",
|
"build:bundle:dev": "webpack-cli --progress --bail --mode development",
|
||||||
"build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
|
"build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
|
||||||
"build:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run start:init",
|
"build:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run build",
|
||||||
"build:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:init",
|
"build:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:init",
|
||||||
"build": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle",
|
"build": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle",
|
||||||
"build:dev": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle:dev",
|
"build:dev": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle:dev",
|
||||||
|
|
|
@ -81,6 +81,6 @@
|
||||||
</audio>
|
</audio>
|
||||||
<audio id="remoteAudio"></audio>
|
<audio id="remoteAudio"></audio>
|
||||||
<!-- let CSS themes pass constants to the app -->
|
<!-- let CSS themes pass constants to the app -->
|
||||||
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"/></div><div id="mx_theme_tertiaryAccentColor"/></div>
|
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -62,6 +62,10 @@ import CallHandler from 'matrix-react-sdk/lib/CallHandler';
|
||||||
|
|
||||||
import {getVectorConfig} from './getconfig';
|
import {getVectorConfig} from './getconfig';
|
||||||
|
|
||||||
|
// Disable warnings for now: we use deprecated bluebird functions
|
||||||
|
// and need to migrate, but they spam the console with warnings.
|
||||||
|
Promise.config({warnings: false});
|
||||||
|
|
||||||
let lastLocationHashSet = null;
|
let lastLocationHashSet = null;
|
||||||
|
|
||||||
function initRageshake() {
|
function initRageshake() {
|
||||||
|
|
|
@ -154,5 +154,11 @@ module.exports = {
|
||||||
// don't fill the console up with a mahoosive list of modules
|
// don't fill the console up with a mahoosive list of modules
|
||||||
chunks: false,
|
chunks: false,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// hot mdule replacement doesn't work (I think we'd need react-hot-reload?)
|
||||||
|
// so webpack-dev-server reloads the page on every update which is quite
|
||||||
|
// tedious in Riot since that can take a while.
|
||||||
|
hot: false,
|
||||||
|
inline: false,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue