Merge branch 'master' into develop
This commit is contained in:
David Baker
commit
814b5297ad
6 changed files with 119 additions and 18 deletions
21
.babelrc
21
.babelrc
|
|
@ -1,4 +1,21 @@
|
|||
{
|
||||
"presets": ["react", "es2015", "es2016"],
|
||||
"plugins": ["transform-class-properties", "transform-object-rest-spread", "transform-async-to-bluebird", "transform-runtime", "add-module-exports"]
|
||||
"presets": [
|
||||
"react",
|
||||
"es2015",
|
||||
"es2016"
|
||||
],
|
||||
"plugins": [
|
||||
[
|
||||
"transform-builtin-extend",
|
||||
{
|
||||
"globals": ["Error"]
|
||||
}
|
||||
],
|
||||
"transform-class-properties",
|
||||
"transform-object-rest-spread",
|
||||
"transform-async-to-bluebird",
|
||||
"transform-runtime",
|
||||
"add-module-exports",
|
||||
"syntax-dynamic-import"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
60
CHANGELOG.md
60
CHANGELOG.md
|
|
@ -1,3 +1,63 @@
|
|||
Changes in [1.1.0](https://github.com/vector-im/riot-web/releases/tag/v1.1.0) (2019-05-07)
|
||||
==========================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0-rc.1...v1.1.0)
|
||||
|
||||
* Add Dockerfile
|
||||
[\#9632](https://github.com/vector-im/riot-web/pull/9632)
|
||||
* Add Dockerfile (part 2)
|
||||
[\#9426](https://github.com/vector-im/riot-web/pull/9426)
|
||||
* Add new scalar staging url
|
||||
[\#9601](https://github.com/vector-im/riot-web/pull/9601)
|
||||
|
||||
Changes in [1.1.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.0-rc.1) (2019-04-30)
|
||||
====================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.8...v1.1.0-rc.1)
|
||||
|
||||
* Convert redeploy.py to buildkite
|
||||
[\#9577](https://github.com/vector-im/riot-web/pull/9577)
|
||||
* Add package step to buildkite pipeline
|
||||
[\#9568](https://github.com/vector-im/riot-web/pull/9568)
|
||||
* Don't fail if there's no local config to remove
|
||||
[\#9571](https://github.com/vector-im/riot-web/pull/9571)
|
||||
* Change jenkins script to package script
|
||||
[\#9567](https://github.com/vector-im/riot-web/pull/9567)
|
||||
* Remove config.json from package dir
|
||||
[\#9555](https://github.com/vector-im/riot-web/pull/9555)
|
||||
* use the release version of olm 3.1.0
|
||||
[\#9550](https://github.com/vector-im/riot-web/pull/9550)
|
||||
* Fix default for --include arg
|
||||
[\#9517](https://github.com/vector-im/riot-web/pull/9517)
|
||||
* update installation instructions with new repo
|
||||
[\#9500](https://github.com/vector-im/riot-web/pull/9500)
|
||||
* Use packages.matrix.org for Olm
|
||||
[\#9498](https://github.com/vector-im/riot-web/pull/9498)
|
||||
* Add separate platform electron build commands
|
||||
[\#9412](https://github.com/vector-im/riot-web/pull/9412)
|
||||
* Add support for custom profile directory
|
||||
[\#9408](https://github.com/vector-im/riot-web/pull/9408)
|
||||
* Improved mobile install guide
|
||||
[\#9410](https://github.com/vector-im/riot-web/pull/9410)
|
||||
* Remove vector-electron-desktop from README
|
||||
[\#9404](https://github.com/vector-im/riot-web/pull/9404)
|
||||
* Update from Weblate
|
||||
[\#9398](https://github.com/vector-im/riot-web/pull/9398)
|
||||
* bump olm version to 3.1.0-pre3
|
||||
[\#9392](https://github.com/vector-im/riot-web/pull/9392)
|
||||
* Add expiration to mobile guide cookie
|
||||
[\#9383](https://github.com/vector-im/riot-web/pull/9383)
|
||||
* Fix autolaunch setting appearing toggled off
|
||||
[\#9368](https://github.com/vector-im/riot-web/pull/9368)
|
||||
* Don't try to save files the user didn't want to save
|
||||
[\#9352](https://github.com/vector-im/riot-web/pull/9352)
|
||||
* Setup crypto store for restore session tests
|
||||
[\#9325](https://github.com/vector-im/riot-web/pull/9325)
|
||||
* Update from Weblate
|
||||
[\#9333](https://github.com/vector-im/riot-web/pull/9333)
|
||||
* Add "Save image as..." button to context menu on images
|
||||
[\#9326](https://github.com/vector-im/riot-web/pull/9326)
|
||||
* Configure auth footer links through Riot config
|
||||
[\#9297](https://github.com/vector-im/riot-web/pull/9297)
|
||||
|
||||
Changes in [1.0.8](https://github.com/vector-im/riot-web/releases/tag/v1.0.8) (2019-04-16)
|
||||
==========================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.7...v1.0.8)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "1.0.8",
|
||||
"version": "1.1.0",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"integrations_ui_url": "https://scalar.vector.im/",
|
||||
"integrations_rest_url": "https://scalar.vector.im/api",
|
||||
"integrations_widgets_urls": [
|
||||
"https://scalar-staging.vector.im/api",
|
||||
"https://scalar-staging.riot.im/scalar/api",
|
||||
"https://scalar.vector.im/api"
|
||||
],
|
||||
|
|
|
|||
10
package.json
10
package.json
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "electron_app/src/electron-main.js",
|
||||
"version": "1.0.8",
|
||||
"version": "1.1.0",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
|
@ -73,8 +73,8 @@
|
|||
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
|
||||
"gfm.css": "^1.1.2",
|
||||
"highlight.js": "^9.13.1",
|
||||
"matrix-js-sdk": "1.0.4",
|
||||
"matrix-react-sdk": "1.0.7",
|
||||
"matrix-js-sdk": "1.1.0",
|
||||
"matrix-react-sdk": "1.1.0",
|
||||
"modernizr": "^3.6.0",
|
||||
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
|
||||
"prop-types": "^15.6.2",
|
||||
|
|
@ -91,7 +91,9 @@
|
|||
"babel-eslint": "^8.1.1",
|
||||
"babel-loader": "^7.1.5",
|
||||
"babel-plugin-add-module-exports": "^0.2.1",
|
||||
"babel-plugin-syntax-dynamic-import": "^6.18.0",
|
||||
"babel-plugin-transform-async-to-bluebird": "^1.1.1",
|
||||
"babel-plugin-transform-builtin-extend": "^1.1.2",
|
||||
"babel-plugin-transform-class-properties": "^6.24.1",
|
||||
"babel-plugin-transform-object-rest-spread": "^6.26.0",
|
||||
"babel-plugin-transform-runtime": "^6.23.0",
|
||||
|
|
@ -152,7 +154,7 @@
|
|||
},
|
||||
"build": {
|
||||
"appId": "im.riot.app",
|
||||
"electronVersion": "4.1.3",
|
||||
"electronVersion": "4.1.5",
|
||||
"files": [
|
||||
"node_modules/**",
|
||||
"src/**",
|
||||
|
|
|
|||
43
yarn.lock
43
yarn.lock
|
|
@ -1055,6 +1055,14 @@ babel-plugin-transform-async-to-generator@^6.24.1:
|
|||
babel-plugin-syntax-async-functions "^6.8.0"
|
||||
babel-runtime "^6.22.0"
|
||||
|
||||
babel-plugin-transform-builtin-extend@^1.1.2:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/babel-plugin-transform-builtin-extend/-/babel-plugin-transform-builtin-extend-1.1.2.tgz#5e96fecf58b8fa1ed74efcad88475b2af3c9116e"
|
||||
integrity sha1-Xpb+z1i4+h7XTvytiEdbKvPJEW4=
|
||||
dependencies:
|
||||
babel-runtime "^6.2.0"
|
||||
babel-template "^6.3.0"
|
||||
|
||||
babel-plugin-transform-class-properties@^6.24.1:
|
||||
version "6.24.1"
|
||||
resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
|
||||
|
|
@ -1452,7 +1460,7 @@ babel-register@^6.26.0:
|
|||
mkdirp "^0.5.1"
|
||||
source-map-support "^0.4.15"
|
||||
|
||||
babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2:
|
||||
babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2:
|
||||
version "6.26.0"
|
||||
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
|
||||
integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
|
||||
|
|
@ -1460,7 +1468,7 @@ babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtim
|
|||
core-js "^2.4.0"
|
||||
regenerator-runtime "^0.11.0"
|
||||
|
||||
babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.9.0:
|
||||
babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0, babel-template@^6.9.0:
|
||||
version "6.26.0"
|
||||
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
|
||||
integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
|
||||
|
|
@ -2495,6 +2503,11 @@ cpx@^1.3.2:
|
|||
shell-quote "^1.6.1"
|
||||
subarg "^1.0.0"
|
||||
|
||||
crc-32@^0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-0.3.0.tgz#6a3d3687f5baec41f7e9b99fe1953a2e5d19775e"
|
||||
integrity sha1-aj02h/W67EH36bmf4ZU6Ll0Zd14=
|
||||
|
||||
crc32-stream@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
|
||||
|
|
@ -5731,10 +5744,10 @@ math-random@^1.0.1:
|
|||
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
|
||||
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
|
||||
|
||||
matrix-js-sdk@1.0.4:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.0.4.tgz#dbfa8399f750a23b020c1ec8f037a2f5c36d4672"
|
||||
integrity sha512-FPx7U1a0SmLbDXhXlR4XHlC+FVKTnK2/+ZBtyOWGLi3nxw4x8hCSSzJ82gzStya1qvhHvbf/y7eblYFVE1l7SQ==
|
||||
matrix-js-sdk@1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.1.0.tgz#f0db49de2aa0b0d50c1fe49da538beb4926ce59c"
|
||||
integrity sha512-ECoMN6DkwPdKiMa/jSoMkSDngFCo6x7oH84rLd1NtD7lBPl3Ejj6ARa0iIELE7u0OUO6J0FzdWh7Hd0ZnVTmww==
|
||||
dependencies:
|
||||
another-json "^0.2.0"
|
||||
babel-runtime "^6.26.0"
|
||||
|
|
@ -5756,10 +5769,10 @@ matrix-mock-request@^1.2.3:
|
|||
bluebird "^3.5.0"
|
||||
expect "^1.20.2"
|
||||
|
||||
matrix-react-sdk@1.0.7:
|
||||
version "1.0.7"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.0.7.tgz#4dc6db50f9bf3c6dd5c1fdea8fa3d4eec2e58125"
|
||||
integrity sha512-sJpu87itcAbMFaWeLEfpfNbQ4uJ+MIvmHw6RfbgHvBw4VtFAOgg/SypIoMjEEzk1KCgAUSV9k0CodwKsXHo0Jw==
|
||||
matrix-react-sdk@1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.0.tgz#3f1c139cb4c33190b9dcb36a6e776d3ad53334f6"
|
||||
integrity sha512-3JjyzbrmokzCl5Ss/0dWjUyc8EuO3uWvD3LBHZhTkFHe1uSiHjC2+Oy8hiJha8tubJtCWnQPE7tXIffkYmvdAQ==
|
||||
dependencies:
|
||||
babel-plugin-syntax-dynamic-import "^6.18.0"
|
||||
babel-runtime "^6.26.0"
|
||||
|
|
@ -5785,9 +5798,10 @@ matrix-react-sdk@1.0.7:
|
|||
linkifyjs "^2.1.6"
|
||||
lodash "^4.13.1"
|
||||
lolex "2.3.2"
|
||||
matrix-js-sdk "1.0.4"
|
||||
matrix-js-sdk "1.1.0"
|
||||
optimist "^0.6.1"
|
||||
pako "^1.0.5"
|
||||
png-chunks-extract "^1.0.0"
|
||||
prop-types "^15.5.8"
|
||||
qrcode-react "^0.1.16"
|
||||
qs "^6.6.0"
|
||||
|
|
@ -6795,6 +6809,13 @@ portfinder@^1.0.20:
|
|||
debug "^2.2.0"
|
||||
mkdirp "0.5.x"
|
||||
|
||||
png-chunks-extract@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/png-chunks-extract/-/png-chunks-extract-1.0.0.tgz#fad4a905e66652197351c65e35b92c64311e472d"
|
||||
integrity sha1-+tSpBeZmUhlzUcZeNbksZDEeRy0=
|
||||
dependencies:
|
||||
crc-32 "^0.3.0"
|
||||
|
||||
posix-character-classes@^0.1.0:
|
||||
version "0.1.1"
|
||||
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
|
||||
|
|
|
|||
Loading…
Reference in a new issue