Skip to content

Commit 17e84bf

Browse files
dbkrdbkr
committed
Merge branch 'release-v0.17.0'
2 parents 060a780 + 4154084 commit 17e84bf

File tree

18 files changed

+13152
-5829
lines changed

18 files changed

+13152
-5829
lines changed

‎CHANGELOG.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,49 @@
1+
Changes in [0.17.0](https://github.com/vector-im/riot-web/releases/tag/v0.17.0) (2018-10-16)
2+
============================================================================================
3+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0-rc.1...v0.17.0)
4+
5+
* Phased rollout of lazyloading
6+
[\#7503](https://github.com/vector-im/riot-web/pull/7503)
7+
* Update to latest electron builder
8+
[\#7501](https://github.com/vector-im/riot-web/pull/7501)
9+
10+
Changes in [0.17.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.0-rc.1) (2018-10-11)
11+
======================================================================================================
12+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.17.0-rc.1)
13+
14+
* Revert "also commit the lock file when bumping version as it is now
15+
committed to the repo"
16+
[\#7483](https://github.com/vector-im/riot-web/pull/7483)
17+
* Update from Weblate.
18+
[\#7478](https://github.com/vector-im/riot-web/pull/7478)
19+
* Fix riot-web Promise.defer warnings (#7409)
20+
[\#7444](https://github.com/vector-im/riot-web/pull/7444)
21+
* Use HTTPS cloning for riot-web too
22+
[\#7459](https://github.com/vector-im/riot-web/pull/7459)
23+
* Disable webpack-dev-server auto reload
24+
[\#7463](https://github.com/vector-im/riot-web/pull/7463)
25+
* Silence bluebird warnings
26+
[\#7462](https://github.com/vector-im/riot-web/pull/7462)
27+
* Fix reskindex on matrix-react-side not being called if using build script
28+
[\#7443](https://github.com/vector-im/riot-web/pull/7443)
29+
* Fix double-closed tags
30+
[\#7454](https://github.com/vector-im/riot-web/pull/7454)
31+
* Document how to turn off Piwik and bug reports (#6738)
32+
[\#7435](https://github.com/vector-im/riot-web/pull/7435)
33+
* also commit the lock file when bumping version as it is now committed to the
34+
repo
35+
[\#7429](https://github.com/vector-im/riot-web/pull/7429)
36+
* Update a bunch of deps
37+
[\#7393](https://github.com/vector-im/riot-web/pull/7393)
38+
* Don't show mobile guide if deep linking
39+
[\#7415](https://github.com/vector-im/riot-web/pull/7415)
40+
* Don't show custom server bit on matrix.org
41+
[\#7408](https://github.com/vector-im/riot-web/pull/7408)
42+
* Update Webpack to version 4
43+
[\#6620](https://github.com/vector-im/riot-web/pull/6620)
44+
* Webpack4
45+
[\#7387](https://github.com/vector-im/riot-web/pull/7387)
46+
147
Changes in [0.16.6](https://github.com/vector-im/riot-web/releases/tag/v0.16.6) (2018-10-08)
248
============================================================================================
349
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.16.6)

‎README.md‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ to build.
9090
npm install
9191
npm run build
9292
```
93-
Or just use https://riot.im/develop - the continuous integration release of the
93+
Or just use https://riot.im/develop - the continuous integration release of the
9494
develop branch. (Note that we don't reference the develop versions in git directly
9595
due to https://github.com/npm/npm/issues/3055.)
9696
1. Install the prerequisites: `npm install`.
@@ -134,7 +134,9 @@ For a good example, see https://riot.im/develop/config.json
134134
1. `integrations_rest_url`: URL to the REST interface for the integrations server.
135135
1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
136136
1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
137-
https://github.com/matrix-org/rageshake server)
137+
https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
138+
"Send Logs" within the application. Bug reports can be disabled by leaving the
139+
`bug_report_endpoint_url` out of your config file.
138140
1. `roomDirectory`: config for the public room directory. This section is optional.
139141
1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
140142
down list. Optional.
@@ -147,11 +149,13 @@ For a good example, see https://riot.im/develop/config.json
147149
anything else since it is used to isolate the privileges of file attachments to this
148150
domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
149151
https://github.com/matrix-org/usercontent/blob/master/v1.html
150-
1. `piwik`: an object containing the following properties:
151-
1. `url`: The URL of the Piwik instance to use for collecting Analytics
152-
1. `whitelistedHSUrls`: a list of HS URLs to not redact from the Analytics
153-
1. `whitelistedISUrls`: a list of IS URLs to not redact from the Analytics
154-
1. `siteId`: The Piwik Site ID to use when sending Analytics to the Piwik server configured above
152+
1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
153+
option out of your config file. If you want to enable analytics, set `piwik` to be an object
154+
containing the following properties:
155+
1. `url`: The URL of the Piwik instance to use for collecting analytics
156+
1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
157+
1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
158+
1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
155159
1. `teamServerConfig`, `teamTokenMap`, `referralBaseUrl`: an obsolete precursor to communities
156160
with referral tracking; please ignore it.
157161
1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
@@ -230,6 +234,10 @@ Before attempting to develop on Riot you **must** read the developer guide
230234
for `matrix-react-sdk` at https://github.com/matrix-org/matrix-react-sdk, which
231235
also defines the design, architecture and style for Riot too.
232236

237+
You should also familiarise yourself with the "Here be Dragons" guide to the
238+
tame & not-so-tame dragons (gotchas) which exist in the codebase:
239+
https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM
240+
233241
The idea of Riot is to be a relatively lightweight "skin" of customisations on
234242
top of the underlying `matrix-react-sdk`. `matrix-react-sdk` provides both the
235243
higher and lower level React components useful for building Matrix communication
@@ -270,7 +278,7 @@ Then similarly with `matrix-react-sdk`:
270278

271279
Finally, build and start Riot itself:
272280

273-
1. `git clone git@github.com:vector-im/riot-web.git`
281+
1. `git clone https://github.com/vector-im/riot-web.git`
274282
1. `cd riot-web`
275283
1. `git checkout develop`
276284
1. `npm install`

‎electron_app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "riot-web",
33
"productName": "Riot",
44
"main": "src/electron-main.js",
5-
"version": "0.16.6",
5+
"version": "0.17.0",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "Vector Creations Ltd.",
88
"dependencies": {

‎electron_app/riot.im/config.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@
2121
"siteId": 1,
2222
"policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy"
2323
},
24+
"phasedRollOut": {
25+
"feature_lazyloading": {
26+
"offset": 1539684000000,
27+
"period": 604800000
28+
}
29+
},
30+
"features": {
31+
"feature_lazyloading": "enable"
32+
},
2433
"enable_presence_by_hs_url": {
2534
"https://matrix.org": false
2635
}

‎karma.conf.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ const olm_entry = webpack_config.entry['olm'];
3232
// 'preprocessors' config below)
3333
delete webpack_config['entry'];
3434

35+
// make sure we're flagged as development to avoid wasting time optimising
36+
webpack_config.mode = 'development';
37+
3538
// add ./test as a search path for js
36-
webpack_config.module.loaders.unshift({
37-
test: /\.js$/, loader: "babel",
39+
webpack_config.module.rules.unshift({
40+
test: /\.js$/, use: "babel-loader",
3841
include: [path.resolve('./src'), path.resolve('./test')],
3942
});
4043

@@ -46,8 +49,9 @@ webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
4649
// ?
4750
webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';
4851

49-
webpack_config.resolve.root = [
52+
webpack_config.resolve.modules = [
5053
path.resolve('./test'),
54+
"node_modules"
5155
];
5256

5357
webpack_config.devtool = 'inline-source-map';

0 commit comments

Comments
 (0)