Commit graph

7890 commits

Author SHA1 Message Date
Weblate
6b9159f3fa Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 10:21:24 +00:00
Luke Barnard
d877384d64
Merge pull request #593 from matrix-org/luke/fix-render-1-1-avatars-when-others-leave
Use correct 1-1 room avatar after users leave
2018-04-11 11:21:18 +01:00
Weblate
d01751312a Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 08:45:23 +00:00
Tirifto
1eb732b22e Translated using Weblate (Esperanto)
Currently translated at 95.0% (961 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/

Superflua akuzativo!
2018-04-11 08:45:22 +00:00
Tirifto
787e0f4558 Translated using Weblate (Esperanto)
Currently translated at 95.0% (961 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/

»De via servilo« jam diras, ke temas pri certa URL. »La« ne  malĝustas, sed ankaŭ ne necesas (laŭ mi).
2018-04-11 07:35:55 +00:00
Tirifto
522db0c0fd Translated using Weblate (Esperanto)
Currently translated at 95.0% (961 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-04-11 07:35:19 +00:00
Luke Barnard
edb754b76b Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-10 18:08:19 +01:00
Weblate
ab6ac22a5d Merge remote-tracking branch 'origin/develop' into develop 2018-04-10 15:05:59 +00:00
Luke Barnard
fca7325b20 Change comments 2018-04-10 15:56:57 +01:00
Luke Barnard
31e9979285 Add 500ms delay to show membershipBusy for longer
to avoid a UI that flashes quickly
2018-04-10 15:31:04 +01:00
Weblate
c012cc1e4c Merge remote-tracking branch 'origin/develop' into develop 2018-04-10 12:40:55 +00:00
Morten Juhl-Johansen Zölde-Fej
018cf0b54d Translated using Weblate (Danish)
Currently translated at 24.2% (245 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2018-04-10 12:40:54 +00:00
David Baker
74c84addea
Merge pull request #1831 from matrix-org/luke/fix-group-join-or-leave-update
Improve group join/leave feedback
2018-04-10 13:40:50 +01:00
Luke Barnard
de1073aacb Factor out _closeSettings for cleanliness 2018-04-10 13:28:42 +01:00
Luke Barnard
24d4df87d1 Show membership spinner next to Leave/Join button when leaving/joining 2018-04-10 11:49:59 +01:00
Luke Barnard
0681df71b0 Hide settings after leaving a group 2018-04-10 11:49:35 +01:00
Luke Barnard
42141f7da7 Fetch group data when leaving or joining to update the view 2018-04-10 10:03:54 +01:00
Weblate
674f369d72 Merge remote-tracking branch 'origin/develop' into develop 2018-04-09 22:03:09 +00:00
Matthew Hodgson
0ff2837d7f rename createGroupButton to not be a total misnomer... 2018-04-09 23:02:59 +01:00
Matthew Hodgson
2d8880ec5f patch NPE on Pill when lazyloading members 2018-04-09 23:02:15 +01:00
Weblate
e7929fb281 Merge remote-tracking branch 'origin/develop' into develop 2018-04-09 21:59:56 +00:00
Matthew Hodgson
8537c1d625 rename createGroupButton to not be a total misnomer... 2018-04-09 22:59:46 +01:00
Weblate
09e94e07ae Merge remote-tracking branch 'origin/develop' into develop 2018-04-09 15:57:39 +00:00
Luke Barnard
2da45277cd Update group join button to match new API 2018-04-09 16:57:27 +01:00
Ralitsa Bozhkova
029b2335f4 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-04-09 15:04:18 +00:00
Daniel D
91efcd5453 Translated using Weblate (Spanish)
Currently translated at 57.9% (586 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-04-09 13:12:19 +00:00
John Huang
92703d008f Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-04-09 13:12:19 +00:00
Weblate
f13fd9ca7b Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 16:58:31 +00:00
David Baker
03016b9fc8
Merge pull request #1828 from matrix-org/luke/fix-redact-avatar
Make stickers/messages continuations of each other
2018-04-06 17:58:26 +01:00
Luke Barnard
01dd494f50 Make stickers/messages continuations of each other 2018-04-06 17:47:44 +01:00
Luke Barnard
008572afe1 Revert "Handle non-m.room.message event types."
This reverts commit f8d7ab10fa.
2018-04-06 16:42:59 +01:00
Weblate
9b11f2deaa Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 14:55:36 +00:00
Luke Barnard
1e586428ac Update to match is_openly_joinable API 2018-04-06 14:58:10 +01:00
Weblate
d1c7187db0 Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 10:24:36 +00:00
Luke Barnard
fb9b376cb8
Merge pull request #1826 from matrix-org/luke/fix-leaking-features-to-guests
Fix to prevent guests from seeing features
2018-04-06 11:24:32 +01:00
Weblate
40b71a681f Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 10:15:10 +00:00
Andrey
e2cc4691f1 Translated using Weblate (Russian)
Currently translated at 99.3% (1004 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-06 10:15:10 +00:00
John Huang
a1b13d22d1 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-04-06 10:15:09 +00:00
Kévin C
b03e5d32f3 Translated using Weblate (French)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-06 10:04:36 +00:00
Luke Barnard
0306c365cc Fix to prevent guests from seeing features 2018-04-06 11:03:17 +01:00
Luke Barnard
adb78c2931 Fix broken ForgotPassword component 2018-04-06 10:27:03 +01:00
Szimszon
ad9249b666 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-04-06 05:20:09 +00:00
John Huang
3cb0bd404c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-04-06 02:15:04 +00:00
Weblate
ec02e498cd Merge remote-tracking branch 'origin/develop' into develop 2018-04-05 16:49:39 +00:00
David Baker
28bf76b319
Merge pull request #1824 from matrix-org/luke/fix-wrappedRef-warning
Fix warning "Unknown prop `wrappedRef` on <div> tag..."
2018-04-05 17:49:35 +01:00
Luke Barnard
e20f223e78 Fix warning "Unknown prop wrappedRef on <div> tag..."
GeminiScrollbar should not receive wrappedRef as a property,
so remove it using object destructuring.
2018-04-05 17:39:25 +01:00
Weblate
3e1ff92bdd Merge remote-tracking branch 'origin/develop' into develop 2018-04-05 16:03:10 +00:00
Dudi Maroshi
e73018b333 Translated using Weblate (Hebrew)
Currently translated at 8.6% (87 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/he/
2018-04-05 16:03:10 +00:00
John Huang
027c7aab0e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1009 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-04-05 16:03:09 +00:00
Luke Barnard
59abfa6337
Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable
Add radio button for setting group m.join_policy
2018-04-05 17:03:04 +01:00