gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
David Baker 2017-06-19 13:24:58 +01:00
parent 9f7cf463b9 448e33bb65
commit 5b5e6d83d9
3 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
CHANGELOG.md
View File

@ -1,3 +1,53 @@
Changes in [0.11.2](https://github.com/vector-im/riot-web/releases/tag/v0.11.2) (2017-06-19)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.2-rc.2...v0.11.2)
* Add more languages and translations
* Add a 'register' button
Changes in [0.11.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.11.2-rc.2) (2017-06-16)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.2-rc.1...v0.11.2-rc.2)
* Update react-sdk to pull in fixes for URL previews, CAS
login, h2 in markdown and CAPTCHA forms.
* Enable Korean translation
* Update from Weblate.
[\#4323](https://github.com/vector-im/riot-web/pull/4323)
* Fix h2 in markdown being weird
[\#4332](https://github.com/vector-im/riot-web/pull/4332)
Changes in [0.11.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.2-rc.1) (2017-06-15)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.1...v0.11.2-rc.1)
* Attempts to deflakify the joining test
[\#4313](https://github.com/vector-im/riot-web/pull/4313)
* Add a test for the login flow when there is a teamserver
[\#4315](https://github.com/vector-im/riot-web/pull/4315)
* Remove onload simulator from loading test
[\#4314](https://github.com/vector-im/riot-web/pull/4314)
* Update from Weblate.
[\#4305](https://github.com/vector-im/riot-web/pull/4305)
* Test that we handle stored mx_last_room_id correctly
[\#4292](https://github.com/vector-im/riot-web/pull/4292)
* Ask for email address after setting password for the first time
[\#4301](https://github.com/vector-im/riot-web/pull/4301)
* i18n for setting email after password flow
[\#4299](https://github.com/vector-im/riot-web/pull/4299)
* Update from Weblate.
[\#4290](https://github.com/vector-im/riot-web/pull/4290)
* Don't show the tooltips when filtering rooms
[\#4282](https://github.com/vector-im/riot-web/pull/4282)
* Update from Weblate.
[\#4272](https://github.com/vector-im/riot-web/pull/4272)
* Add missing VOIP Dropdown width
[\#4266](https://github.com/vector-im/riot-web/pull/4266)
* Update import and directory path in the Translations dev guide
[\#4261](https://github.com/vector-im/riot-web/pull/4261)
* Use Thai string for Thai in Language-Chooser
[\#4260](https://github.com/vector-im/riot-web/pull/4260)
Changes in [0.11.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.1) (2017-06-14)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0...v0.11.1)

2
electron_app/package.json
View File

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

6
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.11.1",
"version": "0.11.2",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"repository": {
@ -65,8 +65,8 @@
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
"matrix-js-sdk": "0.7.11",
"matrix-react-sdk": "0.9.4",
"matrix-js-sdk": "0.7.12",
"matrix-react-sdk": "0.9.5",
"modernizr": "^3.1.0",
"pako": "^1.0.5",
"q": "^1.4.1",