Merge branch 'master' into develop
This commit is contained in:
commit
3d8d66547f
5 changed files with 67 additions and 6 deletions
52
CHANGELOG.md
52
CHANGELOG.md
|
@ -1,3 +1,55 @@
|
||||||
|
Changes in [0.17.0](https://github.com/vector-im/riot-web/releases/tag/v0.17.0) (2018-10-16)
|
||||||
|
============================================================================================
|
||||||
|
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0-rc.1...v0.17.0)
|
||||||
|
|
||||||
|
* Phased rollout of lazyloading
|
||||||
|
[\#7503](https://github.com/vector-im/riot-web/pull/7503)
|
||||||
|
* Update to latest electron builder
|
||||||
|
[\#7501](https://github.com/vector-im/riot-web/pull/7501)
|
||||||
|
|
||||||
|
Changes in [0.17.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.0-rc.1) (2018-10-11)
|
||||||
|
======================================================================================================
|
||||||
|
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.17.0-rc.1)
|
||||||
|
|
||||||
|
* Revert "also commit the lock file when bumping version as it is now
|
||||||
|
committed to the repo"
|
||||||
|
[\#7483](https://github.com/vector-im/riot-web/pull/7483)
|
||||||
|
* Update from Weblate.
|
||||||
|
[\#7478](https://github.com/vector-im/riot-web/pull/7478)
|
||||||
|
* Fix riot-web Promise.defer warnings (#7409)
|
||||||
|
[\#7444](https://github.com/vector-im/riot-web/pull/7444)
|
||||||
|
* Use HTTPS cloning for riot-web too
|
||||||
|
[\#7459](https://github.com/vector-im/riot-web/pull/7459)
|
||||||
|
* Disable webpack-dev-server auto reload
|
||||||
|
[\#7463](https://github.com/vector-im/riot-web/pull/7463)
|
||||||
|
* Silence bluebird warnings
|
||||||
|
[\#7462](https://github.com/vector-im/riot-web/pull/7462)
|
||||||
|
* Fix reskindex on matrix-react-side not being called if using build script
|
||||||
|
[\#7443](https://github.com/vector-im/riot-web/pull/7443)
|
||||||
|
* Fix double-closed tags
|
||||||
|
[\#7454](https://github.com/vector-im/riot-web/pull/7454)
|
||||||
|
* Document how to turn off Piwik and bug reports (#6738)
|
||||||
|
[\#7435](https://github.com/vector-im/riot-web/pull/7435)
|
||||||
|
* also commit the lock file when bumping version as it is now committed to the
|
||||||
|
repo
|
||||||
|
[\#7429](https://github.com/vector-im/riot-web/pull/7429)
|
||||||
|
* Update a bunch of deps
|
||||||
|
[\#7393](https://github.com/vector-im/riot-web/pull/7393)
|
||||||
|
* Don't show mobile guide if deep linking
|
||||||
|
[\#7415](https://github.com/vector-im/riot-web/pull/7415)
|
||||||
|
* Don't show custom server bit on matrix.org
|
||||||
|
[\#7408](https://github.com/vector-im/riot-web/pull/7408)
|
||||||
|
* Update Webpack to version 4
|
||||||
|
[\#6620](https://github.com/vector-im/riot-web/pull/6620)
|
||||||
|
* Webpack4
|
||||||
|
[\#7387](https://github.com/vector-im/riot-web/pull/7387)
|
||||||
|
|
||||||
|
Changes in [0.16.6](https://github.com/vector-im/riot-web/releases/tag/v0.16.6) (2018-10-08)
|
||||||
|
============================================================================================
|
||||||
|
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.16.6)
|
||||||
|
|
||||||
|
* Update to matrix-react-sdk v0.13.6
|
||||||
|
|
||||||
Changes in [0.16.5](https://github.com/vector-im/riot-web/releases/tag/v0.16.5) (2018-10-01)
|
Changes in [0.16.5](https://github.com/vector-im/riot-web/releases/tag/v0.16.5) (2018-10-01)
|
||||||
============================================================================================
|
============================================================================================
|
||||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5-rc.1...v0.16.5)
|
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5-rc.1...v0.16.5)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"name": "riot-web",
|
"name": "riot-web",
|
||||||
"productName": "Riot",
|
"productName": "Riot",
|
||||||
"main": "src/electron-main.js",
|
"main": "src/electron-main.js",
|
||||||
"version": "0.16.5",
|
"version": "0.17.0",
|
||||||
"description": "A feature-rich client for Matrix.org",
|
"description": "A feature-rich client for Matrix.org",
|
||||||
"author": "Vector Creations Ltd.",
|
"author": "Vector Creations Ltd.",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -21,6 +21,15 @@
|
||||||
"siteId": 1,
|
"siteId": 1,
|
||||||
"policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy"
|
"policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy"
|
||||||
},
|
},
|
||||||
|
"phasedRollOut": {
|
||||||
|
"feature_lazyloading": {
|
||||||
|
"offset": 1539684000000,
|
||||||
|
"period": 604800000
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"features": {
|
||||||
|
"feature_lazyloading": "enable"
|
||||||
|
},
|
||||||
"enable_presence_by_hs_url": {
|
"enable_presence_by_hs_url": {
|
||||||
"https://matrix.org": false
|
"https://matrix.org": false
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"name": "riot-web",
|
"name": "riot-web",
|
||||||
"productName": "Riot",
|
"productName": "Riot",
|
||||||
"main": "electron_app/src/electron-main.js",
|
"main": "electron_app/src/electron-main.js",
|
||||||
"version": "0.16.5",
|
"version": "0.17.0",
|
||||||
"description": "A feature-rich client for Matrix.org",
|
"description": "A feature-rich client for Matrix.org",
|
||||||
"author": "New Vector Ltd.",
|
"author": "New Vector Ltd.",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
@ -70,8 +70,8 @@
|
||||||
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
|
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
|
||||||
"gfm.css": "^1.1.2",
|
"gfm.css": "^1.1.2",
|
||||||
"highlight.js": "^9.0.0",
|
"highlight.js": "^9.0.0",
|
||||||
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
|
"matrix-js-sdk": "0.12.0",
|
||||||
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
|
"matrix-react-sdk": "0.14.0",
|
||||||
"modernizr": "^3.6.0",
|
"modernizr": "^3.6.0",
|
||||||
"prop-types": "^15.6.2",
|
"prop-types": "^15.6.2",
|
||||||
"react": "^15.6.0",
|
"react": "^15.6.0",
|
||||||
|
|
|
@ -100,7 +100,7 @@ mkdir -p "$projdir/electron_app/dist/unsigned/"
|
||||||
# Install packages: what the user downloads the first time,
|
# Install packages: what the user downloads the first time,
|
||||||
# (DMGs for mac, exe installer for windows)
|
# (DMGs for mac, exe installer for windows)
|
||||||
mkdir -p "$pubdir/install/macos"
|
mkdir -p "$pubdir/install/macos"
|
||||||
cp $distdir/mac/*.dmg "$pubdir/install/macos/"
|
cp $distdir/*.dmg "$pubdir/install/macos/"
|
||||||
|
|
||||||
# Windows installers go to the dist dir because they need signing
|
# Windows installers go to the dist dir because they need signing
|
||||||
mkdir -p "$pubdir/install/win32/ia32/"
|
mkdir -p "$pubdir/install/win32/ia32/"
|
||||||
|
@ -111,7 +111,7 @@ cp $distdir/win/*.exe "$projdir/electron_app/dist/unsigned/"
|
||||||
|
|
||||||
# Packages for auto-update
|
# Packages for auto-update
|
||||||
mkdir -p "$pubdir/update/macos"
|
mkdir -p "$pubdir/update/macos"
|
||||||
cp $distdir/mac/*.zip "$pubdir/update/macos/"
|
cp $distdir/*-mac.zip "$pubdir/update/macos/"
|
||||||
echo "$vername" > "$pubdir/update/macos/latest"
|
echo "$vername" > "$pubdir/update/macos/latest"
|
||||||
|
|
||||||
mkdir -p "$pubdir/update/win32/ia32/"
|
mkdir -p "$pubdir/update/win32/ia32/"
|
||||||
|
|
Loading…
Reference in a new issue