7ffb542cb5
Do something more sensible for sender profile name/aux opacity
...
- If no translation is needed, don't do it.
- For now, ignore the fact that this doens't allow us easily to put
Flair into "luke sent an image" but we don't kow where the flair
should go for this anyway.
2017-11-16 15:24:36 +00:00
2962a9f181
Merge remote-tracking branch 'origin/develop' into develop
2017-11-16 15:12:40 +00:00
c9a66d375f
Translated using Weblate (Slovak)
...
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/sk/
2017-11-16 15:12:40 +00:00
6f8427a5af
Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584
...
Because apparently the revert did not revert this part
2017-11-16 15:11:47 +00:00
b0f83dda03
Merge remote-tracking branch 'origin/develop' into develop
2017-11-16 13:36:20 +00:00
1d2e13f91d
Translated using Weblate (Russian)
...
Currently translated at 98.7% (920 of 932 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-16 13:36:20 +00:00
55867688a5
Merge pull request #1614 from matrix-org/luke/linting-keyword-spacing
...
Add eslint rule keyword-spacing
2017-11-16 13:36:16 +00:00
b54e563cb6
Merge branch 'develop' into luke/linting-keyword-spacing
2017-11-16 13:23:42 +00:00
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
c429b13b05
Add eslint rule keyword-spacing
...
Because we follow it almost all of the time.
2017-11-16 13:18:58 +00:00
e96f96d1f2
Merge remote-tracking branch 'origin/develop' into develop
2017-11-16 13:13:13 +00:00
30b8d0e807
Merge pull request #1613 from turt2live/travis/granular_bugs
...
Fix various issues surrounding granular settings to date
2017-11-16 13:13:09 +00:00
52e2c987e8
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:13:00 +00:00
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
3e13a919ed
remove rogue debug
2017-11-16 13:09:53 +00:00
e0e21efcf4
Merge remote-tracking branch 'origin/develop' into develop
2017-11-16 13:06:41 +00:00
f4b7741449
Translated using Weblate (Slovak)
...
Currently translated at 99.7% (928 of 930 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-16 13:06:41 +00:00
02ffa919c4
Translated using Weblate (Russian)
...
Currently translated at 98.7% (918 of 930 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-16 13:06:41 +00:00
44e8a2cd54
Translated using Weblate (German)
...
Currently translated at 99.6% (927 of 930 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-16 13:06:40 +00:00
f99755378a
Merge pull request #1612 from matrix-org/t3chguy/state_events
...
differentiate between state events and message events
2017-11-16 13:06:36 +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
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
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
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
022e40a127
Use SettingsStore for default theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:04:49 -07: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
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
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
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
750e64deee
Pass required props to TintableSvg.
2017-11-15 15:17:21 +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
7bab7813bb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour
2017-11-15 13:26:29 +00:00
59d405d4fa
Use TintableSvgButtons for widget menubar icons.
2017-11-15 13:24:38 +00:00
Luke Barnard