cb235a29fa
Merge pull request #5613 from pafcu/simplify-translation
...
Refactor translations
2017-11-16 11:54:52 +00:00
68cb84700e
Merge remote-tracking branch 'origin/develop' into develop
2017-11-16 11:45:50 +00:00
a80935e181
JSX does not do comments in a way one might expect
2017-11-16 11:45:40 +00:00
1e2e4397f7
Fix typo
2017-11-16 12:41:26 +01:00
ba387f6287
Merge remote-tracking branch 'origin/develop' into develop
2017-11-16 11:29:08 +00:00
843bdd6e13
Translated using Weblate (German)
...
Currently translated at 99.5% (928 of 932 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-16 11:29:08 +00:00
29e6627a75
Merge pull request #1608 from pafcu/simplify-translation
...
Refactor translations
2017-11-16 11:29:03 +00:00
342378f48a
Add space after if
2017-11-16 12:19:56 +01:00
af8ff1b888
Don't blindly hangup on a call error.
...
Not all errors means we want to send a hangup (in fact most don't,
but the most notable being when we fail to answer a call: we should
not then automatically reject it).
2017-11-16 11:07:57 +00:00
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 22:33:23 -07:00
fb1f20b7d4
Treat the master push rule as authoritative
...
Previously the push rule was ignored, leading to all kinds of interesting issues regarding notifications. This fixes those issues by giving the master push rule the authority it deserves for reasonable defaults.
Part 2 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 22:33:23 -07:00
5976fb2eed
Treat null/undefined notification settings as "not set"
...
Otherwise we end up lying and saying notifications are disabled, despite the push rules saying otherwise.
Part 1 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 22:08:13 -07:00
10a1d9cb29
Language is a local setting
...
Fixes https://github.com/vector-im/riot-web/issues/5611
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 21:16:12 -07:00
84c5ce1b4e
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-11-16 02:39:02 +00:00
f141ee1944
Use the correct level order when getting arbitrary settings
...
This shouldn't currently be causing problems, but will in teh future. The bug can be exposed by having a setting where the level order is completely reversed, therefore causing LEVEL_ORDER[0] to actually be the most generic, not the most specific. Instead, we'll pull in the setting's level order and fallback to LEVEL_ORDER, therefore requesting the most specific value.
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 19:24:32 -07:00
cf8ff6aed3
Validate that URL previews are explicitly enabled/disabled
...
Otherwise `!null` ends up being "true", therefore forcing URL previews on for everyone.
Fixes https://github.com/vector-im/riot-web/issues/5607
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 19:22:30 -07:00
42e601005f
Use SettingsStore to get the default theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 19:09:03 -07:00
022e40a127
Use SettingsStore for default theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 19:04:49 -07:00
311bdf71fb
Added translation using Weblate (Serbian)
2017-11-15 22:56:22 +00:00
4949f2f763
Fix typo and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-15 20:43:45 +01:00
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-15 20:40:51 +01:00
0596925a86
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (932 of 932 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-15 19:05:56 +00:00
ae6c985d39
Add missing backtick
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-15 19:58:29 +01:00
509c833896
Merge remote-tracking branch 'origin/develop' into develop
2017-11-15 18:35:14 +00:00
53a793b8fd
Merge pull request #5605 from vector-im/rxl881/invertOutlineColour
...
TintableSvgButton styling
2017-11-15 18:35:09 +00:00
80b1a685a6
Merge remote-tracking branch 'origin/develop' into develop
2017-11-15 18:34:56 +00:00
45a90ef038
Translated using Weblate (Russian)
...
Currently translated at 98.3% (917 of 932 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-15 18:34:56 +00:00
1f1ca15219
Translated using Weblate (German)
...
Currently translated at 98.9% (922 of 932 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-15 18:34:55 +00:00
5104ebfd29
Merge pull request #1611 from matrix-org/rxl881/invertOutlineColour
...
Make TintableSvg links behave like normal image links
2017-11-15 18:34:51 +00:00
b0027525f3
Wire up Unknown Devices popup for outbound calls
2017-11-15 17:21:04 +00:00
b00cf8c939
add dark theme styling to devtools input box
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-11-15 17:13:39 +00:00
45ed5b13ca
Merge remote-tracking branch 'origin/develop' into develop
2017-11-15 16:33:06 +00:00
6f15c67d0b
Merge branch 'master' into develop
2017-11-15 16:32:52 +00:00
0a55c87dd3
Translated using Weblate (French)
...
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-11-15 16:30:48 +00:00
648be26fb7
Translated using Weblate (French)
...
Currently translated at 100.0% (932 of 932 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-15 16:27:32 +00:00
ed3a6d29ac
Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/invertOutlineColour
2017-11-15 16:25:14 +00:00
c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events
2017-11-15 16:03:07 +00:00
5563b71c47
differentiate between state events and message events
...
so that people can't fake state event types and have them rendered.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-11-15 15:56:54 +00:00
2893cee685
Merge remote-tracking branch 'origin/develop' into develop
2017-11-15 15:55:45 +00:00
bbcf74f774
fix @lampholder's NPE for real
2017-11-15 15:55:33 +00:00
aeca83ff2e
Unused import
2017-11-15 15:20:45 +00:00
750e64deee
Pass required props to TintableSvg.
2017-11-15 15:17:21 +00:00
93800be742
Factor out showing UnknownDeviceDialog
...
So we can re-use it for calls that fail due to unknwon devices
2017-11-15 15:15:21 +00:00
bfb4ae3083
Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/invertOutlineColour
2017-11-15 15:09:38 +00:00
24b9269ff5
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour
2017-11-15 15:08:28 +00:00
c5b5a78e86
Merge remote-tracking branch 'origin/develop' into develop
2017-11-15 14:47:28 +00:00
f4ecc7fa5d
speculatively fix @lampholder's NPE
2017-11-15 14:47:20 +00:00
e06ff8083d
Merge remote-tracking branch 'origin/develop' into develop
2017-11-15 14:30:40 +00:00
ec33806379
Merge pull request #1610 from matrix-org/rxl881/lintingErrors
...
Fix linting errors.
2017-11-15 14:30:36 +00:00
26231e458e
Add green cancel icon.
2017-11-15 13:42:36 +00:00
Luke Barnard
Weblate
Luke Barnard
pafcu
Bamstam
David Baker
Travis Ralston
忆年
Марко М. Костић
Szimszon
Richard Lewis
Andrey
Michael Telatynski
Kévin C
Matthew Hodgson
Matthew Hodgson