PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into develop

Browse source
This commit is contained in:
David Baker 2017-09-06 13:36:11 +01:00
commit 8b250bda64
3 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
CHANGELOG.md
View file

@ -1,3 +1,40 @@
Changes in [0.12.3](https://github.com/vector-im/riot-web/releases/tag/v0.12.3) (2017-09-06)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3-rc.3...v0.12.3)
* No changes
Changes in [0.12.3-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.12.3-rc.3) (2017-09-05)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3-rc.2...v0.12.3-rc.3)
* Fix plurals in translations
[\#4971](https://github.com/vector-im/riot-web/pull/4971)
* Update from Weblate.
[\#4968](https://github.com/vector-im/riot-web/pull/4968)
Changes in [0.12.3-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.12.3-rc.2) (2017-09-05)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3-rc.1...v0.12.3-rc.2)
* New react-sdk version to pull in new translations and fix some translation bugs.
Changes in [0.12.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.3-rc.1) (2017-09-01)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.2...v0.12.3-rc.1)
* Fix overflowing login/register buttons on some languages issue #4804
[\#4858](https://github.com/vector-im/riot-web/pull/4858)
* Update vector-im to riot-im on Login
[\#4943](https://github.com/vector-im/riot-web/pull/4943)
* lets let people know that the bug report actually sent properly :)
[\#4910](https://github.com/vector-im/riot-web/pull/4910)
* another s/vector/riot/ in README
[\#4934](https://github.com/vector-im/riot-web/pull/4934)
* fix two room list regressions
[\#4907](https://github.com/vector-im/riot-web/pull/4907)
Changes in [0.12.2](https://github.com/vector-im/riot-web/releases/tag/v0.12.2) (2017-08-24)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.1...v0.12.2)

2
electron_app/package.json
View file

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

4
package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.12.2",
"version": "0.12.3",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"repository": {
@ -67,7 +67,7 @@
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
"matrix-js-sdk": "0.8.2",
"matrix-react-sdk": "0.10.2",
"matrix-react-sdk": "0.10.3",
"modernizr": "^3.1.0",
"pako": "^1.0.5",
"react": "^15.6.0",