Merge remote-tracking branch 'origin/develop' into develop

docs/translating.md

@@ -6,6 +6,11 @@
 - Be able to understand English
 - Be able to understand the language you want to translate riot-web into
 
+## Step 0: Join #riotweb-translations:matrix.org
+
+1. Come and join https://riot.im/develop/#/room/#riotweb-translations:matrix.org
+2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)
+
 ## Step 1: Preparing your Weblate Profile
 
 1. Head to https://translate.nordgedanken.de and register either via Github or email
@@ -45,12 +50,15 @@ The yellow button has to be used if you are unsure about the translation but you
 
 ### What are "%(something)s"?
 
-These things are variables that are filled inside the code. They can be room names, usernames or similiar. If you find one use it for changing the word order but do not delete it as thing are missing if you do so.
+These things are variables that are expanded when displayed by Riot. They can be room names, usernames or similar. If you find one, you can move to the right place for your language, but not delete it as the variable will be missing if you do.
+
+A special case is `%(urlStart)s` and `%(urlEnd)s` which are used to mark the beginning of a hyperlink (i.e. `<a href="/somewhere">` and `</a>`.  You must keep these markers surrounding the equivalent string in your language that needs to be hyperlinked.
 
 ### "I want to come back to this string. How?"
 
 You can use inside the translation field "Review needed" checkbox. It will be shown as Strings that need to be reviewed.
 
+
 ### Further reading
 
-The official Doc provides some more in-deepth explanation on how to do translations and talks about do and don't's. You can find it at: https://docs.weblate.org/en/latest/user/translating.html
+The official Weblate doc provides some more in-deepth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html

package.json

@@ -104,6 +104,7 @@
     "emojione": "^2.2.7",
     "eslint": "^3.14.0",
     "eslint-config-google": "^0.7.1",
+    "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-react": "^6.9.0",
     "expect": "^1.16.0",

scripts/fetch-develop.deps.sh

@@ -40,11 +40,13 @@ dodep matrix-org matrix-react-sdk
 mkdir -p node_modules
 cd node_modules
 
+rm -r matrix-js-sdk 2> /dev/null
 ln -s ../matrix-js-sdk ./
 pushd matrix-js-sdk
 npm install
 popd
 
+rm -r matrix-react-sdk 2> /dev/null
 ln -s ../matrix-react-sdk ./
 pushd matrix-react-sdk
 mkdir -p node_modules

scripts/jenkins.sh

@@ -34,11 +34,9 @@ npm run lintall -- -f checkstyle -o eslint.xml || true
 
 rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
 
- # node_modules deps from 'npm install' don't have a .git dir so can't
+# Since the deps are fetched from git, we can rev-parse
- # rev-parse; but they do set the commit in package.json under 'gitHead' which
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
- # we're grabbing here.
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
-REACT_SHA=$(grep 'gitHead' node_modules/matrix-react-sdk/package.json | cut -d \" -f 4 | head -c 12)
-JSSDK_SHA=$(grep 'gitHead' node_modules/matrix-js-sdk/package.json | cut -d \" -f 4 | head -c 12)
 
 VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
 

src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss

@@ -183,6 +183,10 @@ limitations under the License.
     visibility: visible;
 }
 
+.mx_MessagePanel_alwaysShowTimestamps .mx_MessageTimestamp {
+    visibility: visible;
+}
+
 .mx_EventTile_selected .mx_MessageTimestamp {
     left: 3px;
 }