v1.2.0

Update from Weblate

.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md

@@ -2,7 +2,7 @@
 name: User Interface or Usability Bug report
 about: Please include screenshots in UI/UX bug reports
 title: ''
-labels: ''
+labels: bug, ui/ux
 assignees: ''
 
 ---

.gitignore

@@ -1,7 +1,6 @@
 /build
 /cert.pem
 /dist
-/karma-reports
 /key.pem
 /lib
 /node_modules

CHANGELOG.md

@@ -1,3 +1,38 @@
+Changes in [1.2.0](https://github.com/vector-im/riot-web/releases/tag/v1.2.0) (2019-05-29)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0-rc.1...v1.2.0)
+
+ * Upgrade to JS SDK v1.2.0 and React SDK v1.2.0 to fix some regressions
+
+Changes in [1.2.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.0-rc.1) (2019-05-23)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.2...v1.2.0-rc.1)
+
+ * Update from Weblate
+   [\#9802](https://github.com/vector-im/riot-web/pull/9802)
+ * remove emojione
+   [\#9766](https://github.com/vector-im/riot-web/pull/9766)
+ * Make Dockerfile work for develop and other branches
+   [\#9736](https://github.com/vector-im/riot-web/pull/9736)
+ * add description of new labs feature for message editing
+   [\#9728](https://github.com/vector-im/riot-web/pull/9728)
+ * Remove karma junit output
+   [\#9628](https://github.com/vector-im/riot-web/pull/9628)
+ * yarn upgrade
+   [\#9626](https://github.com/vector-im/riot-web/pull/9626)
+ * Respond quickly to buildkite pokes
+   [\#9617](https://github.com/vector-im/riot-web/pull/9617)
+ * Delay creating the `Favico` instance
+   [\#9616](https://github.com/vector-im/riot-web/pull/9616)
+ * Add reactions feature to config sample
+   [\#9598](https://github.com/vector-im/riot-web/pull/9598)
+
+Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2)
+
+ * react-sdk v1.1.2 to fix single sign-on and GIF autoplaying
+
 Changes in [1.1.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.1) (2019-05-14)
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0...v1.1.1)

Dockerfile

@@ -15,7 +15,7 @@ WORKDIR /src
 
 COPY . /src
 RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh
-RUN yarn install
+RUN yarn --network-timeout=100000 install
 RUN yarn build
 
 # Copy the config now so that we don't create another layer in the app image

config.sample.json

@@ -12,7 +12,9 @@
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
         "feature_groups": "labs",
-        "feature_pinning": "labs"
+        "feature_pinning": "labs",
+        "feature_reactions": "labs",
+        "feature_message_editing": "labs"
     },
     "default_federate": true,
     "default_theme": "light",

docs/labs.md

@@ -1,4 +1,4 @@
-# riot-web Labs features
+# Labs features
 
 Some notes on the features you can enable by going to `Settings->Labs`. Not exhaustive, chat in
 [#riot-web:matrix.org] for more information.
@@ -29,4 +29,17 @@ Once enabled, send a custom state event to a room to set values:
 
 That's it. Now should see your new counter under the header.
 
-[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org
+## Reactions
+
+`feature_reactions` allows reacting to messages with emoji and displaying
+reactions from other people. This feature is currently under active development,
+and only portions have been implemented so far.
+
+## Message editing
+
+`feature_message_editing` allows editing messages after they have been sent,
+accessible from the reaction/context bar when hovering a message.
+This feature is currently under active development,
+and only portions have been implemented so far.
+
+[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org

electron_app/package.json

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

karma.conf.js

@@ -100,7 +100,7 @@ module.exports = function (config) {
 
         // test results reporter to use
         // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['logcapture', 'spec', 'junit', 'summary'],
+        reporters: ['logcapture', 'spec', 'summary'],
 
         specReporter: {
             suppressErrorSummary: false, // do print error summary
@@ -159,10 +159,6 @@ module.exports = function (config) {
         // how many browser should be started simultaneous
         concurrency: Infinity,
 
-        junitReporter: {
-            outputDir: 'karma-reports',
-        },
-
         webpack: webpack_config,
 
         webpackMiddleware: {

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -73,8 +73,8 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "1.1.0",
-    "matrix-react-sdk": "1.1.1",
+    "matrix-js-sdk": "1.2.0",
+    "matrix-react-sdk": "1.2.0",
     "modernizr": "^3.6.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
     "prop-types": "^15.6.2",
@@ -110,7 +110,6 @@
     "electron-builder": "^20.38.5",
     "electron-builder-squirrel-windows": "^20.38.5",
     "electron-devtools-installer": "^2.2.4",
-    "emojione": "^2.2.7",
     "eslint": "^5.8.0",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.1.2",
@@ -124,7 +123,6 @@
     "karma": "^3.1.2",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
-    "karma-junit-reporter": "^2.0.0",
     "karma-logcapture-reporter": "0.0.1",
     "karma-mocha": "^1.3.0",
     "karma-sourcemap-loader": "^0.3.7",
@@ -155,7 +153,7 @@
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "4.1.5",
+    "electronVersion": "4.2.2",
     "files": [
       "node_modules/**",
       "src/**",

scripts/copy-res.js

@@ -57,8 +57,6 @@ const COPY_LIST = [
     ["res/themes/**", "webapp/themes"],
     ["res/vector-icons/**", "webapp/vector-icons"],
     ["node_modules/matrix-react-sdk/res/media/**", "webapp/media"],
-    ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
-    ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
     ["node_modules/olm/olm_legacy.js", "webapp", { directwatch: 1 }],
     ["./config.json", "webapp", { directwatch: 1 }],
 ];

scripts/docker-link-repos.sh

@@ -13,7 +13,7 @@ git clone $JS_SDK_REPO js-sdk
 cd js-sdk
 git checkout $JS_SDK_BRANCH
 yarn link
-yarn install
+yarn --network-timeout=100000 install
 cd ../
 
 echo "Linking react-sdk"
@@ -22,7 +22,7 @@ cd react-sdk
 git checkout $REACT_SDK_BRANCH
 yarn link
 yarn link matrix-js-sdk
-yarn install
+yarn --network-timeout=100000 install
 cd ../
 
 echo "Setting up riot-web with react-sdk and js-sdk packages"

scripts/redeploy.py

@@ -19,6 +19,8 @@ from urlparse import urljoin
 import glob
 import re
 import shutil
+import threading
+from Queue import Queue
 
 from flask import Flask, jsonify, request, abort
 
@@ -32,6 +34,8 @@ arg_symlink = None
 arg_webhook_token = None
 arg_api_token = None
 
+workQueue = Queue()
+
 def create_symlink(source, linkname):
     try:
         os.symlink(source, linkname)
@@ -48,6 +52,16 @@ def req_headers():
         "Authorization": "Bearer %s" % (arg_api_token,),
     }
 
+# Buildkite considers a poke to have failed if it has to wait more than 10s for
+# data (any data, not just the initial response) and it normally takes longer than
+# that to download an artifact from buildkite. Apparently there is no way in flask
+# to finish the response and then keep doing stuff, so instead this has to involve
+# threading. Sigh.
+def worker_thread():
+    while True:
+        toDeploy = workQueue.get()
+        deploy_buildkite_artifact(*toDeploy)
+
 @app.route("/", methods=["POST"])
 def on_receive_buildkite_poke():
     got_webhook_token = request.headers.get('X-Buildkite-Token')
@@ -129,7 +143,16 @@ def on_receive_buildkite_poke():
         abort(400, "Refusing to deploy artifact from URL %s", artifact_to_deploy['url'])
         return
 
-    return deploy_buildkite_artifact(artifact_to_deploy, pipeline_name, build_num)
+    # there's no point building up a queue of things to deploy, so if there are any pending jobs,
+    # remove them
+    while not workQueue.empty():
+        try:
+            workQueue.get(False)
+        except:
+            pass
+    workQueue.put([artifact_to_deploy, pipeline_name, build_num])
+
+    return jsonify({})
 
 def deploy_buildkite_artifact(artifact, pipeline_name, build_num):
     artifact_response = requests.get(artifact['url'], headers=req_headers())
@@ -152,8 +175,6 @@ def deploy_buildkite_artifact(artifact, pipeline_name, build_num):
 
     create_symlink(source=extracted_dir, linkname=arg_symlink)
 
-    return jsonify({})
-
 def deploy_tarball(artifact, build_dir):
     """Download a tarball from jenkins and unpack it
 
@@ -281,4 +302,7 @@ if __name__ == "__main__":
              deployer.symlink_paths,
             )
         )
+        fred = threading.Thread(target=worker_thread)
+        fred.daemon = True
+        fred.start()
         app.run(port=args.port, debug=False)

src/i18n/strings/eo.json

@@ -41,5 +41,6 @@
     "Create Account": "Krei konton",
     "Need help?": "Ĉu vi bezonas helpon?",
     "Explore rooms": "Esplori ĉambrojn",
-    "Room Directory": "Ĉambra dosierujo"
+    "Room Directory": "Ĉambra dosierujo",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Vi povas uzi proprajn servilajn elekteblojn por saluti aliajn servilojn de Matrix, donante alian hejmeservilan URL-on. Tio povigos vin uzi programon Riot kun jama konto de Matrix en alia hejmservilo."
 }

src/i18n/strings/fi.json

@@ -37,7 +37,7 @@
     "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.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.<br/>Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.<br/><br/>Voit myös asettaa valinnaisen identiteettipalvelimen, mutta et voi kutsua käyttäjiä sähköpostiosoitteella tai tulla kutsutuksi.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi muihin Matrix-palvelimiin. Tämä mahdollistaa Riotin käyttämisen toisella kotipalvelimella olevalla Matrix-tilillä.",
     "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.": "Voit myös määrittää toisen identiteettipalvelimen, mutta et voi kutsua muita käyttäjiä sähköpostin perusteella tai saada itse kutsua sähköpostin perusteella.",
-    "Sign In": "Kirjaudu sisään",
+    "Sign In": "Kirjaudu",
     "Create Account": "Luo tili",
     "Need help?": "Tarvitsetko apua?",
     "Explore rooms": "Etsi huoneita",

src/i18n/strings/lv.json

@@ -34,5 +34,12 @@
     "Dev chat for the Riot/Web dev team": "Riot/Web izstrādātāju komandas čats",
     "Dev chat for the Dendrite dev team": "Dendrite izstrādatāju komandas čats",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix-ā pastāv daudzas neatkarīgas un/vai eksistējošiem tīmekļa resursiem (Slack, IRC, Gitter u.tml.) piesaistītas istabas. Ieskaties katalogā!",
-    "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.": "Tu vari lietot \"custom\" servera opcijas, lai ielogotos citos Matrix serveros, norādot citu Bāzes servera URL.<br> Tas atļaus tev lietot Riot ar esošo Matrix kontu uz cita Bāzes servera.<br/><br/>Tu arī vari uzstādīt atsevišķu Identitāšu serveri, taču tad Tev nebūs iespēju uzaicināt lietotājus, izmantojot epasta adresi, vai pašam tikt uzaicinātam, izmantojot epasta adresi."
+    "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.": "Tu vari lietot \"custom\" servera opcijas, lai ielogotos citos Matrix serveros, norādot citu Bāzes servera URL.<br> Tas atļaus tev lietot Riot ar esošo Matrix kontu uz cita Bāzes servera.<br/><br/>Tu arī vari uzstādīt atsevišķu Identitāšu serveri, taču tad Tev nebūs iespēju uzaicināt lietotājus, izmantojot epasta adresi, vai pašam tikt uzaicinātam, izmantojot epasta adresi.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Varat izmantot pielāgotās servera opcijas, lai pierakstītos citos Matrix serveros, norādot citu mājas servera URL. Tas ļauj jums izmantot Riot ar esošu Matrix kontu citā mājas serverī.",
+    "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.": "Varat arī iestatīt pielāgotu identitātes serveri, bet jūs nevarēsiet uzaicināt lietotājus izmantojot e-pasta adresi, kā arī tikt uzaicināts pēc e-pasta adreses.",
+    "Sign In": "Ienākt",
+    "Create Account": "Izveidot kontu",
+    "Need help?": "Nepieciešama palīdzība?",
+    "Explore rooms": "Atklāt istabas",
+    "Room Directory": "Istabu Katalogs"
 }

src/i18n/strings/pl.json

@@ -39,5 +39,6 @@
     "Create Account": "Stwórz konto",
     "Sign In": "Zaloguj",
     "Need help?": "Potrzebujesz pomocy?",
-    "Room Directory": "Katalog pokojów"
+    "Room Directory": "Katalog pokojów",
+    "Explore rooms": "Przeglądaj pokoje"
 }

src/i18n/strings/sl.json

@@ -1 +1,21 @@
-{}
+{
+    "Riot Desktop on %(platformName)s": "Namizni Riot za %(platformName)s",
+    "Unknown device": "Neznana naprava",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s s %(browserName)s na %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Za klic s skupno rabo zaslona potrebujete HTTPS.",
+    "powered by Matrix": "poganja Matrix",
+    "Custom Server Options": "Možnosti strežnika po meri",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Možnosti strežnika po meri lahko uporabite za prijavo v druge Matrix strežnike, s tem da podate drug URL domačega strežnika. To vam omogoča, da uporabljate Riot z obstoječim Matrix računom na drugem strežniku.",
+    "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.": "Nastavite lahko tudi strežnik za identiteto po meri, vendar ne boste mogli povabiti uporabnikov prek e-pošte, prav tako pa vas ne bodo mogli povabiti drugi.",
+    "Dismiss": "Opusti",
+    "Welcome to Riot.im": "Dobrodošli v Riot.im",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizirano šifrirano sporočanje & sodelovanje s pomočjo [matrix]",
+    "Sign In": "Prijava",
+    "Create Account": "Registracija",
+    "Need help?": "Potrebujete pomoč?",
+    "Chat with Riot Bot": "Klepetajte z Riot Botom",
+    "Explore rooms": "Raziščite sobe",
+    "Room Directory": "Imenik sob",
+    "Search the room directory": "Preiščite imenik sob",
+    "Get started with some tips from Riot Bot!": "Začnite z nekaterimi nasveti Riot Bota!"
+}

src/vector/platform/VectorBasePlatform.js

@@ -39,14 +39,7 @@ export default class VectorBasePlatform extends BasePlatform {
     constructor() {
         super();
 
-        // The 'animations' are really low framerate and look terrible.
-        // Also it re-starts the animation every time you set the badge,
-        // and we set the state each time, even if the value hasn't changed,
-        // so we'd need to fix that if enabling the animation.
-        this.favicon = new Favico({animation: 'none'});
         this.showUpdateCheck = false;
-        this._updateFavicon();
-
         this.startUpdateCheck = this.startUpdateCheck.bind(this);
         this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
     }
@@ -55,6 +48,24 @@ export default class VectorBasePlatform extends BasePlatform {
         return 'Vector Base Platform'; // no translation required: only used for analytics
     }
 
+    /**
+     * Delay creating the `Favico` instance until first use (on the first notification) as
+     * it uses canvas, which can trigger a permission prompt in Firefox's resist
+     * fingerprinting mode.
+     * See https://github.com/vector-im/riot-web/issues/9605.
+     */
+    get favicon() {
+        if (this._favicon) {
+            return this._favicon;
+        }
+        // The 'animations' are really low framerate and look terrible.
+        // Also it re-starts the animation every time you set the badge,
+        // and we set the state each time, even if the value hasn't changed,
+        // so we'd need to fix that if enabling the animation.
+        this._favicon = new Favico({ animation: 'none' });
+        return this._favicon;
+    }
+
     _updateFavicon() {
         try {
             // This needs to be in in a try block as it will throw

webpack.config.js

@@ -71,7 +71,7 @@ module.exports = {
                 },
             },
             {
-                test: /\.(gif|png|svg|ttf|xml|ico)$/,
+                test: /\.(gif|png|svg|ttf|woff|woff2|xml|ico)$/,
                 // Use a content-based hash in the name so that we can set a long cache
                 // lifetime for assets while still delivering changes quickly.
                 oneOf: [