Develop

CHANGELOG.md

@@ -1,10 +1,29 @@
+Changes in [0.16.4](https://github.com/vector-im/riot-web/releases/tag/v0.16.4) (2018-09-10)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4-rc.1...v0.16.4)
+
+ * No changes since rc.1
+
+Changes in [0.16.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.4-rc.1) (2018-09-07)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3...v0.16.4-rc.1)
+
+ * Update from Weblate.
+ [\#7296](https://github.com/vector-im/riot-web/pull/7296)
+ * Fix config not loading & mobileguide script being loaded in riot
+ [\#7288](https://github.com/vector-im/riot-web/pull/7288)
+ * Instructions for installing mobile apps
+ [\#7272](https://github.com/vector-im/riot-web/pull/7272)
+ * Tidy up index.js
+ [\#7265](https://github.com/vector-im/riot-web/pull/7265)
+
 Changes in [0.16.3](https://github.com/vector-im/riot-web/releases/tag/v0.16.3) (2018-09-03)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3-rc.2...v0.16.3)
 
  * SECURITY FIX: This version (and release candidates) pull in an upstream security
  fix from electron to fix CVE-2018-15685. Electron users should update as soon as
- possible. Riot-web run outsiude of Electron is unaffected.
+ possible. Riot-web run outside of Electron is unaffected.
 
 Changes in [0.16.3-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.3-rc.2) (2018-08-31)
 ======================================================================================================

README.md

@@ -241,18 +241,6 @@ apps using React.
 After creating a new component you must run `npm run reskindex` to regenerate
 the `component-index.js` for the app (used in future for skinning)
 
-**However, as of July 2016 this layering abstraction is broken due to rapid
-development on Riot forcing `matrix-react-sdk` to move fast at the expense of
-maintaining a clear abstraction between the two.** Hacking on Riot inevitably
-means hacking equally on `matrix-react-sdk`, and there are bits of
-`matrix-react-sdk` behaviour incorrectly residing in the `riot-web` project
-(e.g. matrix-react-sdk specific CSS), and a bunch of Riot specific behaviour
-in the `matrix-react-sdk` (grep for `vector` / `riot`). This separation problem will be
-solved asap once development on Riot (and thus matrix-react-sdk) has
-stabilised. Until then, the two projects should basically be considered as a
-single unit. In particular, `matrix-react-sdk` issues are currently filed
-against `riot-web` in github.
-
 Please note that Riot is intended to run correctly without access to the public
 internet. So please don't depend on resources (JS libs, CSS, images, fonts)
 hosted by external CDNs or servers but instead please package all dependencies

electron_app/package.json

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

package.json

@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron_app/src/electron-main.js",
- "version": "0.16.3",
+ "version": "0.16.4",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -64,8 +64,8 @@
  "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
  "gfm.css": "^1.1.1",
  "highlight.js": "^9.0.0",
- "matrix-js-sdk": "0.10.9",
- "matrix-react-sdk": "0.13.3",
+ "matrix-js-sdk": "0.11.0",
+ "matrix-react-sdk": "0.13.4",
  "modernizr": "^3.1.0",
  "prop-types": "^15.5.10",
  "react": "^15.6.0",
@@ -122,7 +122,7 @@
  "minimist": "^1.2.0",
  "mkdirp": "^0.5.1",
  "mocha": "^2.4.5",
- "parallelshell": "^3.0.2",
+ "parallelshell": "3.0.1",
  "postcss-extend": "^1.0.5",
  "postcss-import": "^9.0.0",
  "postcss-loader": "^1.2.2",

src/i18n/strings/en_US.json

@@ -33,5 +33,7 @@
  "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!",
  "Riot/Android & matrix-android-sdk chat": "Riot/Android & matrix-android-sdk chat",
  "Riot/Web & Desktop chat": "Riot/Web & Desktop chat",
- "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk chat"
+ "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk chat",
+ "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
+ "Co-ordination for Riot translators": "Co-ordination for Riot translators"
 }

src/i18n/strings/id.json

@@ -34,5 +34,6 @@
  "Dev chat for the Riot/Web dev team": "Obrolan Developer untuk tim developer Riot/Web",
  "Dev chat for the Dendrite dev team": "Obrolan Developer untuk tim developer Dendrite",
  "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Banyak ruang sudah tersedia di Matrix, terhubung ke jaringan yang sudah ada (Slack, IRC, Gitter dls) atau independen. Cek direktori!",
- "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Anda dapat menggunakan opsi lain untuk mendaftar pada server Matrix yang berbeda dengan memasukkan URL server yang sesuai. <br/>Hal ini memungkinkan anda untuk menggunakan Riot dengan akun matrix yang telah tersedia pada Home server yang berbeda.<br/><br/>Anda juga dapat melakukan pengubahan identitas server akan tetapi akan berakibat tidak dapat mengundang pengguna melalui email, atau diundang melalui email."
+ "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Anda dapat menggunakan opsi lain untuk mendaftar pada server Matrix yang berbeda dengan memasukkan URL server yang sesuai. <br/>Hal ini memungkinkan anda untuk menggunakan Riot dengan akun matrix yang telah tersedia pada Home server yang berbeda.<br/><br/>Anda juga dapat melakukan pengubahan identitas server akan tetapi akan berakibat tidak dapat mengundang pengguna melalui email, atau diundang melalui email.",
+ "Co-ordination for Riot translators": "Koordinasi dengan penerjemah Riot"
 }