Commit Graph

8874 Commits

Author SHA1 Message Date
Weblate
0f0073033b Merge remote-tracking branch 'origin/develop' into develop 2018-03-15 09:20:20 +00:00
stuve20
12d2bab544 Translated using Weblate (Swedish)
Currently translated at 42.5% (423 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-03-15 09:20:20 +00:00
random
8af3bfa8f3 Translated using Weblate (Italian)
Currently translated at 17.6% (176 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-03-15 09:20:19 +00:00
Osoitz
f788ef280f Translated using Weblate (Basque)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-15 09:20:19 +00:00
Luke Barnard
99f092e65f
Merge pull request #1802 from matrix-org/luke/group-view-change-delay-warning
Add change delay warning in GroupView settings
2018-03-15 09:20:15 +00:00
Osoitz
117129bcac Translated using Weblate (Basque)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-15 08:52:59 +00:00
Luke Barnard
bc5699b3d7 Add change delay warning in GroupView settings 2018-03-14 18:17:15 +00:00
Krombel
0b974979e2 Translated using Weblate (German)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-03-14 14:34:10 +00:00
Weblate
3011ffcdc2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-14 09:37:20 +00:00
István
fa966971e7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-14 09:37:19 +00:00
Osoitz
57d4ae6e0e Translated using Weblate (Basque)
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-14 09:37:19 +00:00
David Baker
c614810096
Merge pull request #1799 from matrix-org/luke/perf-bodyToHtml
Only use `dangerouslySetInnerHTML` for HTML messages
2018-03-14 09:37:14 +00:00
Luke Barnard
4f4441fb07 Only use dangerouslySetInnerHTML for HTML messages
...and plain messages with emoji that we replace with <img> tags
amonst the html-escaped `content.body`.
2018-03-13 17:15:16 +00:00
Weblate
5d8e2c066c Merge remote-tracking branch 'origin/develop' into develop 2018-03-13 11:50:19 +00:00
István
65e60676eb Translated using Weblate (Hungarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-13 11:50:19 +00:00
Ralitsa Bozhkova
917960449b Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-13 11:50:18 +00:00
David Baker
59bb5ce9d8
Merge pull request #1798 from matrix-org/luke/limit-group-requests
Limit group requests to 3 at once
2018-03-13 11:50:14 +00:00
Luke Barnard
35cc443562 Limit group requests to 3 at once
using a FIFO queue.

This is needed in order to lower the priority of getting group
state and prioritise everything else, namely initial sync.

It should be noted that this by no means guarantees that the
first incremental sync will happen sooner; the client could
end up doing some other requests first instead.
2018-03-13 11:35:19 +00:00
Andrey
8ddbd09f4f Translated using Weblate (Russian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-12 19:52:49 +00:00
Weblate
502cba0be5 Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 17:54:05 +00:00
Luke Barnard
99b3922998
Merge pull request #1796 from matrix-org/luke/fix-group-invite-flow
Show GroupMemberList after inviting a group member
2018-03-12 17:53:59 +00:00
Luke Barnard
0a480b05aa Show GroupMemberList after inviting a group member
because we might be looking at a member when inviting a new
member.

See https://github.com/vector-im/riot-web/pull/6303
2018-03-12 17:23:31 +00:00
Weblate
05cdd8098b Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 15:33:08 +00:00
Slavi Pantaleev
791ef02715 Translated using Weblate (Russian)
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-12 15:33:07 +00:00
Slavi Pantaleev
5885104c3a Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-12 15:33:06 +00:00
Luke Barnard
0341b299ae
Merge pull request #1794 from matrix-org/dbkr/baseavatar_syntax
Fix syntax fail
2018-03-12 15:33:00 +00:00
David Baker
d416b9d7d1 Copyright 2018-03-12 15:24:32 +00:00
David Baker
ac85938186 Fix syntax fail 2018-03-12 15:23:22 +00:00
Andrey
5854c5f42c Translated using Weblate (Russian)
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-12 12:09:57 +00:00
Ralitsa Bozhkova
d1961ab111 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-12 12:02:44 +00:00
Марко М. Костић
46d1328af4 Translated using Weblate (Serbian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-03-11 14:09:30 +00:00
Ralitsa Bozhkova
bf41b7b91f Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-10 10:37:27 +00:00
Szimszon
b92e74bc60 Translated using Weblate (Hungarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-09 19:15:05 +00:00
Nathan van Beelen
d4d8ed7797 Translated using Weblate (Dutch)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-03-09 14:23:08 +00:00
Weblate
9524d1c313 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 17:30:21 +00:00
David Baker
e87f8ee7b8
Merge pull request #1793 from matrix-org/luke/fix-tag-panel-clear-filter-tinting
Use TintableSvg for TagPanel clear filter button
2018-03-08 17:30:17 +00:00
Luke Barnard
5ba55858e8 Use TintableSvg for TagPanel clear filter button 2018-03-08 17:06:48 +00:00
Kévin C
99c15be766 Translated using Weblate (French)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-03-08 16:57:54 +00:00
Weblate
3d34596162 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 16:47:50 +00:00
Luke Barnard
a03778388d
Merge pull request #1792 from matrix-org/luke/fix-privileged-users-cosmetics
Fix missing space between "...is a" and user ID
2018-03-08 16:47:46 +00:00
Luke Barnard
a1d0cf65d6 Fix missing space between "...is a" and user ID 2018-03-08 16:34:19 +00:00
Weblate
b5c44e6b36 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 15:08:05 +00:00
Luke Barnard
5148ca1a88
Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button
E2E "fudge-button"
2018-03-08 15:07:58 +00:00
Luke Barnard
3a3cced905 E2E "fudge-button"
Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.

This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.

Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
2018-03-08 14:13:33 +00:00
Osoitz
e864dc97ba Translated using Weblate (Basque)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-08 10:16:51 +00:00
Weblate
e0798af09d Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 09:59:02 +00:00
Марко М. Костић
7f44f236e0 Translated using Weblate (Serbian)
Currently translated at 99.8% (989 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-03-08 09:59:01 +00:00
Tirifto
d5ced62b90 Translated using Weblate (Esperanto)
Currently translated at 97.7% (968 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-03-08 09:59:01 +00:00
Luke Barnard
441a8c722c
Merge pull request #1790 from matrix-org/dbkr/hello_trace_why_are_you_here
Remove spurious console.trace
2018-03-08 09:58:57 +00:00
David Baker
d919c1a41d Remove spurious console.trace
There's no comment to say why this is here and the commit that
add it (e91e94fd4) doesn't mention it either, so it's presumably
unintentional.
2018-03-08 09:47:42 +00:00