Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Luke Barnard 2018-05-09 13:32:06 +01:00
commit 7f50fb3023
4 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
CHANGELOG.md
View File

@ -1,3 +1,64 @@
Changes in [0.14.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2) (2018-04-30)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.3...v0.14.2)
* No changes since rc.3
Changes in [0.14.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.3) (2018-04-26)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.2...v0.14.2-rc.3)
* Fix CSS dependency versions to be the same as those in react-sdk to fix
left panel header positions.
Changes in [0.14.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.2) (2018-04-26)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.1...v0.14.2-rc.2)
* Fix Download of attachments in e2e encrypted rooms in Firefox
Changes in [0.14.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.1) (2018-04-25)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.1...v0.14.2-rc.1)
* Update from Weblate.
[\#6602](https://github.com/vector-im/riot-web/pull/6602)
* Add readme bit on cross-origin renderer
[\#6600](https://github.com/vector-im/riot-web/pull/6600)
* Update from Weblate.
[\#6573](https://github.com/vector-im/riot-web/pull/6573)
* Copy media from react-sdk
[\#6588](https://github.com/vector-im/riot-web/pull/6588)
* Fix favicon
[\#6580](https://github.com/vector-im/riot-web/pull/6580)
* Update from Weblate.
[\#6569](https://github.com/vector-im/riot-web/pull/6569)
* move everything not explicitly riot (or status) branded into matrix-react-
sdk
[\#6500](https://github.com/vector-im/riot-web/pull/6500)
* Remove presence management
[\#5881](https://github.com/vector-im/riot-web/pull/5881)
* change vector-web repo to riot-web in changelog
[\#6480](https://github.com/vector-im/riot-web/pull/6480)
* Update from Weblate.
[\#6473](https://github.com/vector-im/riot-web/pull/6473)
* Bump source-map-loader version to avoid bug /w inline base64 maps
[\#6472](https://github.com/vector-im/riot-web/pull/6472)
* Add CSS for new group admin radio button
[\#6415](https://github.com/vector-im/riot-web/pull/6415)
* Rxl881/sticker picker styling
[\#6447](https://github.com/vector-im/riot-web/pull/6447)
* Stickerpacks
[\#6242](https://github.com/vector-im/riot-web/pull/6242)
* Force gemini on HomePage
[\#6368](https://github.com/vector-im/riot-web/pull/6368)
* Rename the Riot-Web Translations Room
[\#6348](https://github.com/vector-im/riot-web/pull/6348)
* Add disable-presence-by-hs option to sample config
[\#6350](https://github.com/vector-im/riot-web/pull/6350)
* Reword the BugReportDialog.js as per @lampholder
[\#6354](https://github.com/vector-im/riot-web/pull/6354)
Changes in [0.14.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.1) (2018-04-12)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0...v0.14.1)

2
electron_app/package.json
View File

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

10
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.14.1",
"version": "0.14.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -58,10 +58,14 @@
"babel-runtime": "^6.11.6",
"bluebird": "^3.5.0",
"browser-request": "^0.3.3",
"draft-js": "^0.11.0-alpha",
"extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10",
"matrix-js-sdk": "0.10.1",
"matrix-react-sdk": "0.12.2",
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"matrix-js-sdk": "0.10.2",
"matrix-react-sdk": "0.12.3",
"modernizr": "^3.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.0",

8
src/vector/index.js
View File

@ -20,10 +20,10 @@ limitations under the License.
// Require common CSS here; this will make webpack process it into bundle.css.
// Our own CSS (which is themed) is imported via separate webpack entry points
// in webpack.config.js
require('matrix-react-sdk/node_modules/gemini-scrollbar/gemini-scrollbar.css');
require('matrix-react-sdk/node_modules/gfm.css/gfm.css');
require('matrix-react-sdk/node_modules/highlight.js/styles/github.css');
require('matrix-react-sdk/node_modules/draft-js/dist/Draft.css');
require('gemini-scrollbar/gemini-scrollbar.css');
require('gfm.css/gfm.css');
require('highlight.js/styles/github.css');
require('draft-js/dist/Draft.css');
const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
rageshake.init().then(() => {