Merge branch 'master' into develop

CHANGELOG.md

@@ -1,3 +1,49 @@
+Changes in [1.0.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2) (2019-03-06)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.3...v1.0.2)
+
+ * New react-sdk for minor hosting link fixes
+
+Changes in [1.0.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.3) (2019-03-05)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.2...v1.0.2-rc.3)
+
+ * Add modular.im hosting link to electron app config
+   [\#9051](https://github.com/vector-im/riot-web/pull/9051)
+
+Changes in [1.0.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.2) (2019-03-01)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.1...v1.0.2-rc.2)
+
+ * Update to react-sdk rc.3
+
+Changes in [1.0.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.1) (2019-03-01)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.1...v1.0.2-rc.1)
+
+ * Set a require alias for the webapp directory
+   [\#9014](https://github.com/vector-im/riot-web/pull/9014)
+ * Update from Weblate.
+   [\#8973](https://github.com/vector-im/riot-web/pull/8973)
+ * set chrome path for travis CI explicitly
+   [\#8987](https://github.com/vector-im/riot-web/pull/8987)
+ * Updated install spinner
+   [\#8984](https://github.com/vector-im/riot-web/pull/8984)
+ * Allow disabling update mechanism
+   [\#8911](https://github.com/vector-im/riot-web/pull/8911)
+ * Allow configuration of whether closing window closes or minimizes to tray
+   [\#8908](https://github.com/vector-im/riot-web/pull/8908)
+ * Fix language file path for Jenkins
+   [\#8854](https://github.com/vector-im/riot-web/pull/8854)
+ * Document and recommend `default_server_name`
+   [\#8832](https://github.com/vector-im/riot-web/pull/8832)
+ * Cache busting for icons & language files
+   [\#8710](https://github.com/vector-im/riot-web/pull/8710)
+ * Remove redesign issue template
+   [\#8722](https://github.com/vector-im/riot-web/pull/8722)
+ * Make scripts/make-icons.sh work on linux
+   [\#8550](https://github.com/vector-im/riot-web/pull/8550)
+
 Changes in [1.0.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.1) (2019-02-15)
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0...v1.0.1)

electron_app/package.json

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "riot-web",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -70,8 +70,8 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "1.0.0",
+    "matrix-js-sdk": "1.0.1",
-    "matrix-react-sdk": "1.0.1",
+    "matrix-react-sdk": "1.0.2",
     "modernizr": "^3.6.0",
     "prop-types": "^15.6.2",
     "react": "^15.6.0",

scripts/cleanup.sh

@@ -9,8 +9,11 @@ live=`dirname $(readlink -f "$HOME/live")`
 # currently live bundle (just the name of the bundle)
 live_bundle=`grep 'script src="bundles' live/index.html | sed -e 's#.*bundles/##' -e 's#/.*##'`
 
-# clean up 'extracted': find things which are older than 7 days, exclude the current live one, and remove
+# clean up 'extracted': find things which are older than 7 days, exclude the
-find $HOME/extracted -maxdepth 1 -type d -ctime +7 \! -path "$live" -exec rm -r {} \;
+# current live one, and remove
+find $HOME/extracted -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+     \! -path "$live" -exec rm -r {} \;
 
 # clean up 'bundles': ditto
-find $HOME/bundles -maxdepth 1 -type d -ctime +7 \! -name "$live_bundle" -exec rm -r {} \;
+find $HOME/bundles -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+     \! -name "$live_bundle" -exec rm -r {} \;

scripts/package.sh

@@ -14,11 +14,7 @@ else
 fi
 
 npm run clean
-# riot-web is at `workspace`.
+npm run build$dev
-# matrix-react-sdk is at `workspace/node_modules/matrix-react-sdk`, but this is
-# symlinked to a repo at `workspace/matrix-react-sdk`.
-# To get from `workspace/matrix-react-sdk/lib` up to the lang file, we use:
-RIOT_LANGUAGES_FILE="../../webapp/i18n/languages.json" npm run build$dev
 
 # include the sample config in the tarball. Arguably this should be done by
 # `npm run build`, but it's just too painful.

webpack.config.js

@@ -6,12 +6,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 let og_image_url = process.env.RIOT_OG_IMAGE_URL;
 if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/riot-im-logo-black-text.png';
 
-// relative to languageHandler.js in matrix-react-sdk
-let RIOT_LANGUAGES_FILE = process.env.RIOT_LANGUAGES_FILE;
-if (!RIOT_LANGUAGES_FILE) {
-    RIOT_LANGUAGES_FILE = "../../riot-web/webapp/i18n/languages.json";
-}
-
 module.exports = {
     entry: {
         // Load babel-polyfill first to avoid issues where some imports (namely react)
@@ -157,6 +151,8 @@ module.exports = {
 
             // same goes for js-sdk
             "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
+
+            "$webapp": path.resolve('./webapp'),
         },
     },
     plugins: [
@@ -164,7 +160,6 @@ module.exports = {
             'process.env': {
                 NODE_ENV: JSON.stringify(process.env.NODE_ENV),
             },
-            'LANGUAGES_FILE': JSON.stringify(RIOT_LANGUAGES_FILE),
         }),
         new ExtractTextPlugin("bundles/[hash]/[name].css", {
             allChunks: true,