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

9480 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Weblate
48aa83da49 Merge remote-tracking branch 'origin/develop' into develop 2018-04-09 22:02:50 +00: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
Luke Barnard
d02dced246 v0.12.0-rc.6 2018-04-09 17:10:03 +01:00
Luke Barnard
0f9fd32962 Prepare changelog for v0.12.0-rc.6 2018-04-09 17:10:02 +01:00
Luke Barnard
ef104b762e Update group join button to match new API 2018-04-09 17:01:46 +01:00
Luke Barnard
560da03a9f run gen-i18n 2018-04-09 17:01:28 +01:00
Luke Barnard
18fcb1d6a6 Implement "Join this community" button 
for groups that have truthy summary.profile.is_joinable.
 2018-04-09 16:59:57 +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
Luke Barnard
9bab958a97 v0.12.0-rc.5 2018-04-09 15:41:02 +01:00
Luke Barnard
39cda80143 Prepare changelog for v0.12.0-rc.5 2018-04-09 15:41:01 +01:00
Luke Barnard
84635b715c Bump matrix-js-sdk to rc.2 2018-04-09 15:31:52 +01:00
Luke Barnard
76144b964a Update to match is_openly_joinable API 2018-04-09 15:07:07 +01:00
Luke Barnard
929718b032 Fix to prevent guests from seeing features 2018-04-09 15:06:48 +01:00
Luke Barnard
0da187c101 Fix broken ForgotPassword component 2018-04-09 15:06:41 +01:00
Luke Barnard
ef427eaf67 Add null-guard to prevent RoomAvatar NPE when room is null 
which may have been occuring when peeking into a room that the
client hasn't got a Room object for.

Fixes https://github.com/vector-im/riot-web/issues/6432
 2018-04-09 15:05:34 +01:00
David Baker
6cb9d28e75 Update to use new join_policy API 2018-04-09 14:56:43 +01:00
Luke Barnard
2a6d7e6e8e Use less confusing values on radio buttons 2018-04-09 14:56:27 +01:00
Luke Barnard
18ec690e2e Add radio button for setting group is_joinable 
which dictates whether the group can be joined without invitation.
 2018-04-09 14:56:05 +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