gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into matthew/dharma

This commit is contained in:
Matthew Hodgson 2018-08-03 17:15:14 -07:00
parent 3bcd8529fa dcaea6d78f
commit 488eadc63e
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CHANGELOG.md
View File

@ -1,3 +1,24 @@
Changes in [0.16.0](https://github.com/vector-im/riot-web/releases/tag/v0.16.0) (2018-07-30)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.2...v0.16.0)
* Update react-sdk version for bugfixes with Jitsi widgets and the new composer
Changes in [0.16.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.2) (2018-07-24)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.1...v0.16.0-rc.2)
* Update to react-sdk rc.2 to remove Jitsi conference calling from labs
Changes in [0.16.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.1) (2018-07-24)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7...v0.16.0-rc.1)
* Update from Weblate.
[\#7082](https://github.com/vector-im/riot-web/pull/7082)
* Sample config for jitsi integration URL
[\#7055](https://github.com/vector-im/riot-web/pull/7055)
Changes in [0.15.7](https://github.com/vector-im/riot-web/releases/tag/v0.15.7) (2018-07-09)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.2...v0.15.7)

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "0.15.7",
"version": "0.16.0",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {

8
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.15.7",
"version": "0.16.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -64,13 +64,13 @@
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"matrix-js-sdk": "0.10.6",
"matrix-react-sdk": "0.12.9",
"matrix-js-sdk": "0.10.7",
"matrix-react-sdk": "0.13.0",
"modernizr": "^3.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.0",
"react-dom": "^15.6.0",
"sanitize-html": "^1.11.1",
"sanitize-html": "^1.18.4",
"ua-parser-js": "^0.7.10",
"url": "^0.11.0"
},

1
res/themes/status/css/_status.scss
View File

@ -76,6 +76,7 @@ $focus-brightness: 125%;
// red warning colour
$warning-color: #F69E98;
$warning-bg-color: #DF2A8B;
$mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);