54561b655a
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
...
Conflicts:
src/i18n/strings/bg.json
src/i18n/strings/da.json
src/i18n/strings/de_DE.json
src/i18n/strings/eo.json
src/i18n/strings/eu.json
src/i18n/strings/gl.json
src/i18n/strings/it.json
src/i18n/strings/ja.json
src/i18n/strings/nl.json
src/i18n/strings/pl.json
src/i18n/strings/ru.json
src/i18n/strings/sk.json
src/i18n/strings/zh_Hans.json
2018-04-20 13:57:45 +00:00
105a0d6891
Translated using Weblate (Polish)
...
Currently translated at 76.9% (778 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-04-20 13:43:36 +00:00
53889706d7
Translated using Weblate (Japanese)
...
Currently translated at 8.8% (89 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2018-04-20 13:43:36 +00:00
e04c762a50
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-04-20 13:43:36 +00:00
a5f4782964
Translated using Weblate (French)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-20 13:43:36 +00:00
9685118f16
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 97.0% (981 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-20 13:43:35 +00:00
3b85920424
Use mxid as sender name on set display name
...
As it was, "<New name> set their display name to <New name>" which
is unhelpful because you never knew them as "<New name>" before.
They would previously have been displayed with their matrix ID, so
that's what should be here.
2018-04-20 14:28:20 +01:00
3ea5fc9185
Fix rageshake
...
aka. Module Variables Are Not Global Variables pt. 319
2018-04-20 14:06:09 +01:00
6177a42dbf
Translated using Weblate (German)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-20 12:07:18 +00:00
ccd295bc00
Translated using Weblate (French)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-20 06:21:09 +00:00
b0eb350c41
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-04-18 15:31:05 +00:00
7934c50407
Translated using Weblate (Russian)
...
Currently translated at 99.9% (1010 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-18 15:31:04 +00:00
7700df4c2d
Translated using Weblate (Japanese)
...
Currently translated at 7.4% (75 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2018-04-18 15:31:04 +00:00
8fc7cc4075
Translated using Weblate (Italian)
...
Currently translated at 99.5% (1006 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-04-18 15:31:04 +00:00
249edb7b76
Translated using Weblate (Galician)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-04-18 15:31:04 +00:00
895521f0e8
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 90.8% (918 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-18 15:31:03 +00:00
1aadaa3cc5
Merge pull request #1836 from matrix-org/matthew/fix_layering
...
move everything not explicitly riot (or status) branded into matrix-react-sdk
2018-04-18 16:30:55 +01:00
92c98aa3e5
displayName should be tracked as static
2018-04-18 16:19:37 +01:00
0571c596e3
move deps from vector-web to sdk; resolve version mismatches...
2018-04-18 10:53:01 +01:00
f84573ec9f
convert HomePage to ES6 and split out the vectory bit
2018-04-18 10:23:32 +01:00
6d1563449d
fix missing NLs
2018-04-17 16:57:08 +01:00
7b53e36698
retheming commentary
2018-04-17 16:55:32 +01:00
d91c7f5e54
Add comment about enum hijinks
2018-04-17 16:53:11 +01:00
ce809e16d9
fix i18n thinko on createTrackedDialog
2018-04-17 16:51:17 +01:00
eca5a965c5
add i18n which weren't correctly copied over from vector-web by copy-i18n
2018-04-17 16:50:24 +01:00
e746fc99d3
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-04-17 14:04:49 +00:00
1e61091423
Translated using Weblate (Basque)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-04-17 08:56:11 +00:00
22f5d5ba6a
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-04-16 08:27:51 +00:00
46f5c0d205
finish merging vector-im/riot-web#5881 into matrix-react-sdk
2018-04-16 01:13:03 +01:00
f1f7673037
ignore lint errors in stuff moved over from vector-web for now
2018-04-16 01:12:41 +01:00
32dd7f976f
merge vector-im/riot-web#5881 into matrix-react-sdk
2018-04-16 00:04:04 +01:00
4da804fd64
Merge branch 'develop' into matthew/fix_layering
2018-04-15 23:59:09 +01:00
fe5e68de29
fix tests
2018-04-15 23:48:52 +01:00
df564af8bd
run prune-i18n to bring the translations back in line with normalised en_EN
2018-04-15 23:18:47 +01:00
faa1924902
run gen-i18n to normalise en_EN and remove stuff still in vector-web
2018-04-15 23:18:18 +01:00
cb5ff404e1
fix missing i18n
2018-04-15 23:16:31 +01:00
a30fdaf293
copy all the i18n over from vector-web via copy-i18n.py
2018-04-15 23:00:38 +01:00
33632aaae6
Translated using Weblate (Galician)
...
Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-04-15 19:13:14 +00:00
610747e76a
fix paths and updateCheckStatusEnum
2018-04-13 16:49:59 +01:00
841bf4f894
Merge remote-tracking branch 'origin/develop' into develop
2018-04-13 09:58:49 +00:00
acf8ea1a65
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 81.0% (819 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-13 09:58:48 +00:00
19d3913e06
Merge pull request #1838 from matrix-org/dbkr/fix_velocity_exception
...
Null check node before we pass it to velocity
2018-04-13 10:58:43 +01:00
ce74099698
Null check node before we pass it to velocity
...
As presumably sometimes the node wasn't actually in the DOM for
whatever reason, so don't propagate exceptions out into the app.
Should fix https://github.com/vector-im/riot-web/issues/6515
2018-04-13 10:44:37 +01:00
13765632e9
use new rageshake location
2018-04-13 01:36:41 +01:00
efe466ef75
move rageshake to sdk
2018-04-13 01:34:16 +01:00
0336d99b9e
move VectorConferenceHandler over and use getUpdateCheckStatusEnum via field rather than export
2018-04-13 01:29:38 +01:00
5f3e4444d0
fix theme paths
2018-04-13 01:25:34 +01:00
5d03eabb15
rethemedex
2018-04-13 00:54:41 +01:00
40a67ca8fe
point imports at the new locations
2018-04-13 00:43:44 +01:00
cc904be379
add NVL
2018-04-12 20:27:16 +01:00
Weblate