Commit Graph

9293 Commits (91024007aaa576d2e029c195641a8b45a269037f)

Author SHA1 Message Date
David Baker 91024007aa Null check stylesheet href
As commented

Fixes https://github.com/vector-im/riot-web/issues/6489
2018-04-11 18:20:40 +01:00
David Baker 300e6877f5
Merge pull request #1833 from matrix-org/luke/fix-flair-settings-gemini-macOS
Use GeminiScrollbarWrapper in Flair settings of UserSettings
2018-04-11 09:45:14 +01:00
Luke Barnard edb754b76b Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-10 18:08:19 +01:00
Luke Barnard 1b01c30fce
Merge pull request #1832 from matrix-org/luke/delay-group-leave-or-join
Add 500ms delay to show `membershipBusy` for longer
2018-04-10 16:05:54 +01: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
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
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
Luke Barnard 2da45277cd Update group join button to match new API 2018-04-09 16:57:27 +01:00
Luke Barnard 767cd8ca10
Merge pull request #1830 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2018-04-09 14:40:50 +01:00
Weblate 6d2428f37f Merge remote-tracking branch 'origin/develop' into develop 2018-04-09 13:12:20 +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
Luke Barnard db9f50e814
Merge pull request #1829 from matrix-org/luke/fix-inline-source-map-warning
Bump source-map-loader version to avoid bug /w inline base64 maps
2018-04-09 14:12:15 +01:00
Luke Barnard ce80b82ab3 Bump source-map-loader version to avoid bug /w inline base64 maps 2018-04-09 13:53:02 +01: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 666f419dfd
Merge pull request #1827 from matrix-org/luke/openly_joinable
Update to match is_openly_joinable API
2018-04-06 15:55:31 +01: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
David Baker 5b8e75231d
Merge pull request #1825 from matrix-org/luke/fix-forgot-password-page
Fix broken ForgotPassword component
2018-04-06 11:15:01 +01: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
David Baker 03747b8287 Update to use new join_policy API 2018-04-05 16:56:35 +01:00
Szimszon 9da5e6692b Translated using Weblate (Hungarian)
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/hu/
2018-04-05 15:27:50 +00:00
Weblate d3f0d355b9 Merge remote-tracking branch 'origin/develop' into develop 2018-04-05 13:19:16 +00:00
random d05da36c52 Translated using Weblate (Italian)
Currently translated at 99.5% (1004 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-04-05 13:19:15 +00:00
John Huang ea82393b3e 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 13:19:14 +00:00