PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
8077 commits 1 branch 0 tags 338 MiB
Commit graph

8077 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
1675737e7d Merge remote-tracking branch 'origin/master' into develop 2017-11-17 17:48:42 +00:00
David Baker
394e450526 v0.11.1 2017-11-17 16:03:50 +00:00
David Baker
c32b42886b Prepare changelog for v0.11.1 2017-11-17 16:03:50 +00:00
David Baker
8bd040a443 Released js-sdk 2017-11-17 15:58:05 +00:00
David Baker
89f7357a36
Merge pull request #1621 from matrix-org/dbkr/fix_force_turn 
Fix the force TURN option
 2017-11-17 15:51:09 +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
Luke Barnard
d222992bef
Merge pull request #1619 from matrix-org/rav/fix_flairstore 
Flairstore: Fix broken reference
 2017-11-17 14:51:00 +00:00
Richard van der Hoff
4e7fd55fb4 MemberPresenceAvatar: fix null references 
avoid assuming that `member` has a `user`
 2017-11-17 14:35:33 +00:00
Richard van der Hoff
c48994e981 Flairstore: Fix broken reference 2017-11-17 13:56:56 +00:00
Stefan Parviainen
8090aadb0e Add aria-labels to ActionButtons 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-17 14:33:39 +01: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
414ee82582 Perform substitution on all parts, not just the last one 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

This way the substitutions don't need to appear in the same order in the
translated string.
 2017-11-17 08:47:31 +01:00
Travis Ralston
33a3b07d88 Pull the theme through the default process 
This is to ensure the `config` level is respected.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-16 20:52:12 -07: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
David Baker
65e1d49f37 More sensible buttons in UnknownDeviceDialog 
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
 2017-11-16 17:59:42 +00:00
Stefan Parviainen
df921438f3 Make PresenceLabel more easily translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-16 18:36:54 +01:00
David Baker
3c8645871f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 16:47:15 +00:00
David Baker
eea8a41ef9 Unused import 2017-11-16 16:20:13 +00:00
David Baker
196eafdc7f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 15:59:16 +00:00
David Baker
8ba9d26d4b Don't set the call state to ended on error 
This isn't always the case, eg. just because we fail to pick up,
the call is still ringing.
 2017-11-16 15:42:46 +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
David Baker
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
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
Luke Barnard
c429b13b05 Add eslint rule keyword-spacing 
Because we follow it almost all of the time.
 2017-11-16 13:18:58 +00:00
Weblate
e96f96d1f2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 13:13:13 +00:00
Matthew Hodgson
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
Matthew Hodgson
52e2c987e8
Merge branch 'develop' into travis/granular_bugs 2017-11-16 13:13:00 +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