mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

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

Browse source
This commit is contained in:
Michael Telatynski 2019-11-22 14:00:02 +00:00
commit eac6c46d28
25 changed files with 527 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

12
package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "1.5.0",
"version": "1.5.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -73,8 +73,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "2.4.3",
"matrix-react-sdk": "1.7.2",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"prop-types": "^15.7.2",
@ -109,12 +109,14 @@
"electron-builder": "^21.2.0",
"electron-builder-squirrel-windows": "^21.2.0",
"electron-devtools-installer": "^2.2.4",
"electron-notarize": "^0.1.1",
"electron-notarize": "^0.2.0",
"eslint": "^5.8.0",
"eslint-config-google": "^0.7.1",
"eslint-plugin-babel": "^4.1.2",
"eslint-plugin-jest": "^23.0.4",
"eslint-plugin-flowtype": "^2.50.3",
"eslint-plugin-react": "^7.11.1",
"eslint-plugin-react-hooks": "^2.2.0",
"expect": "^1.16.0",
"file-loader": "^3.0.1",
"fs-extra": "^0.30.0",
@ -152,7 +154,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "6.1.12",
"electronVersion": "7.1.2",
"files": [
"node_modules/**",
"src/**"