Luke Barnard
1c6c180908
Merge branch 'master' into develop
2018-04-11 11:55:24 +01:00
Luke Barnard
1adb82b985
v0.12.1
2018-04-11 11:54:54 +01:00
Luke Barnard
d392eef6a8
Prepare changelog for v0.12.1
2018-04-11 11:54:53 +01:00
Luke Barnard
478c2bab33
Bump js-sdk version to 0.10.0
2018-04-11 11:51:16 +01:00
Weblate
fd73e8ce9e
Merge remote-tracking branch 'origin/develop' into develop
2018-04-11 10:33:06 +00:00
Luke Barnard
428cae34eb
Merge branch 'master' into develop
...
(Releasing v0.12.0)
2018-04-11 11:32:05 +01:00
Luke Barnard
87d0c4b45a
v0.12.0
2018-04-11 11:31:31 +01:00
Luke Barnard
f4d3e6fabf
Prepare changelog for v0.12.0
2018-04-11 11:31:30 +01:00
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
Luke Barnard
a142f4405a
Revert "Use GeminiScrollbarWrapper in Flair settings of UserSettings"
...
This reverts commit 3b5fb3ae30
2018-04-11 10:41:11 +01:00
Matthew Hodgson
8b2446f803
rename createGroupButton to not be a total misnomer...
2018-04-11 10:24:28 +01:00
Luke Barnard
3b5fb3ae30
Use GeminiScrollbarWrapper in Flair settings of UserSettings
2018-04-11 10:09:49 +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
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
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
Luke Barnard
98c76a891c
Change comments
2018-04-10 16:08:09 +01:00
Luke Barnard
b0818df329
Add 500ms delay to show membershipBusy for longer
...
to avoid a UI that flashes quickly
2018-04-10 16:08:02 +01:00
Weblate
ab6ac22a5d
Merge remote-tracking branch 'origin/develop' into develop
2018-04-10 15:05:59 +00: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
Luke Barnard
f2e60b1526
v0.12.0-rc.7
2018-04-10 14:27:38 +01:00
Luke Barnard
b4ea03f823
Prepare changelog for v0.12.0-rc.7
2018-04-10 14:27:38 +01:00
Luke Barnard
f721038942
Reword group setting delay
2018-04-10 14:05:53 +01:00
Luke Barnard
e616dbac33
Factor out _closeSettings for cleanliness
2018-04-10 13:56:54 +01:00
Luke Barnard
9e6841df09
Show membership spinner next to Leave/Join button when leaving/joining
2018-04-10 13:56:49 +01:00
Luke Barnard
1da56d9e98
Hide settings after leaving a group
2018-04-10 13:56:42 +01:00
Luke Barnard
6f10b5a410
Fetch group data when leaving or joining to update the view
2018-04-10 13:56:36 +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
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
