mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 14:51:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
7857 commits 219 branches 562 tags 474 MiB
Commit graph

6549 commits

Author SHA1 Message Date
grrgui
07be7b6032 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-18 12:25:16 +00:00
Peter Vágner
f033ada5a3 Translated using Weblate (Slovak) 
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/sk/
 2017-11-18 12:00:13 +00:00
Walter
ca5ffb2029 Translated using Weblate (Russian) 
Currently translated at 99.4% (927 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-18 09:05:40 +00:00
Weblate
81bdb9c8ff Merge remote-tracking branch 'origin/develop' into develop 2017-11-17 17:48:52 +00:00
David Baker
1675737e7d Merge remote-tracking branch 'origin/master' into develop 2017-11-17 17:48:42 +00:00
David Baker
6d23182f5f Fix the force TURN option 
The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it.
 2017-11-17 14:54:44 +00:00
Weblate
ef2f13e45c Merge remote-tracking branch 'origin/develop' into develop 2017-11-17 14:51:07 +00:00
Andrey
1c8b306151 Translated using Weblate (Russian) 
Currently translated at 98.8% (921 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-17 14:51:07 +00:00
Brenno Martins
979d1194db Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 71.3% (665 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2017-11-17 14:51:07 +00:00
Bamstam
c60c4c3463 Translated using Weblate (German) 
Currently translated at 99.6% (929 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-17 14:51:06 +00:00
Kévin C
ee5d43385c 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-17 14:51:06 +00:00
Stefan Parviainen
4de4b5206b Translated using Weblate (Finnish) 
Currently translated at 89.0% (830 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2017-11-17 14:51:06 +00:00
Richard van der Hoff
c48994e981 Flairstore: Fix broken reference 2017-11-17 13:56:56 +00:00
Walter
99bb64915f Translated using Weblate (Russian) 
Currently translated at 98.8% (921 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-17 09:03:26 +00:00
Stefan Parviainen
bceb11cde9 Translated using Weblate (Finnish) 
Currently translated at 89.0% (830 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2017-11-16 20:23:47 +00:00
Szimszon
c025d50400 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-16 19:44:04 +00:00
Weblate
c87198b69f Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 15:35:21 +00:00
David Baker
02629d13d9
Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity 
Do something more sensible for sender profile name/aux opacity
 2017-11-16 15:35:16 +00:00
Luke Barnard
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
Weblate
2962a9f181 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 15:12:40 +00:00
Peter Vágner
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
David Baker
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
Weblate
b0f83dda03 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 13:36:20 +00:00
Andrey
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
Luke Barnard
b54e563cb6 Merge branch 'develop' into luke/linting-keyword-spacing 2017-11-16 13:23:42 +00:00
Luke Barnard
dad797d4a2 Run linting --fix 2017-11-16 13:19:36 +00:00
Weblate
e96f96d1f2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 13:13:13 +00:00
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs 2017-11-16 13:12:03 +00:00
Matthew Hodgson
3e13a919ed
remove rogue debug 2017-11-16 13:09:53 +00:00
Weblate
e0e21efcf4 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 13:06:41 +00:00
Peter Vágner
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
Walter
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
Bamstam
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
Luke Barnard
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
Weblate
68cb84700e Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 11:45:50 +00:00
Luke Barnard
a80935e181 JSX does not do comments in a way one might expect 2017-11-16 11:45:40 +00:00
Weblate
ba387f6287 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 11:29:08 +00:00
Bamstam
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
pafcu
342378f48a
Add space after if 2017-11-16 12:19:56 +01:00
Travis Ralston
d0a0a9ce7f Fix URL preview string not being translated 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 22:33:23 -07:00
Travis Ralston
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
022e40a127 Use SettingsStore for default theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 19:04:49 -07:00
Stefan Parviainen
2c1618bc10 Fix conflict and update strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-15 20:40:51 +01:00
Szimszon
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
Weblate
80b1a685a6 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 18:34:56 +00:00
Andrey
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