Commit Graph

62959 Commits

Author SHA1 Message Date
Luke Barnard
16f5a667c6 Redesign membership section in GroupView 2017-09-21 15:03:30 +01:00
Luke Barnard
41a9ff22fb Rename profile object properties to camelCase
Also, add correct PropTypes for FlairAvatar
2017-09-21 14:22:43 +01:00
Walter
5f73fa5a77 Translated using Weblate (Russian)
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-09-21 13:20:04 +00:00
David Baker
60d444b841 Merge pull request #1402 from matrix-org/luke/groups-add-featured-rooms-and-users
GroupView: Add a User
2017-09-21 14:19:58 +01:00
Luke Barnard
e64cc3b666 Implement view_group dispatch when clicking flair 2017-09-21 13:25:36 +01:00
Luke Barnard
3f0e596e97 Only show "Add" button when editing the group 2017-09-21 12:44:17 +01:00
Luke Barnard
4d9c43b3c8 Display dialog when errors occur whilst featuring users 2017-09-21 12:34:16 +01:00
Luke Barnard
9cd4cdf6df Filter group users results based on query 2017-09-21 10:52:28 +01:00
Luke Barnard
03ddb63507 Remove redundant slice 2017-09-21 10:34:11 +01:00
Weblate
e968de12dd Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 09:26:37 +00:00
David Baker
1cca4c2133 Fix debug message to be clearer 2017-09-21 10:26:07 +01:00
Weblate
fcb705d79b Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 09:01:09 +00:00
David Baker
26ec25b2f7 Merge pull request #5090 from vector-im/dbkr/deploy_config_glob
Make --config accept globs
2017-09-21 10:01:05 +01:00
Weblate
88551afef3 Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 08:55:19 +00:00
David Baker
9b9073f0ed Merge pull request #5093 from vector-im/luke/groups-add-featured-rooms-and-users
CSS for GroupView: Add a User
2017-09-21 09:55:14 +01:00
David Baker
b4ea938be3 This is the default 2017-09-20 18:17:06 +01:00
David Baker
6ec26932af This is the default anyway 2017-09-20 17:54:52 +01:00
Luke Barnard
a0c5bbb3eb Merge pull request #1403 from matrix-org/luke/track-action-buttons
Track action button click event
2017-09-20 17:53:11 +01:00
David Baker
21d233b5af oops, leftover debug 2017-09-20 17:48:47 +01:00
Krombel
a8a9f5ec6b Translated using Weblate (German)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-09-20 16:24:04 +00:00
David Baker
b9b4ac3166 Rename symlink to 'include' & add to redeploy
Because redeploy.py already has a 'symlink' option that does
something else.
2017-09-20 17:22:47 +01:00
Luke Barnard
515222c25f Track action button click event 2017-09-20 17:16:49 +01:00
Luke Barnard
0d4b3b41f9 CSS for GroupView: Add a User
codep matrix-org/matrix-react-sdk#1402
2017-09-20 17:07:32 +01:00
David Baker
6ff91789b2 Rename 'config' option to 'symlink'
because that's really all it's doing and we can use it for other
things
2017-09-20 17:04:31 +01:00
Luke Barnard
7ef55946da Fix console error log statement 2017-09-20 17:04:05 +01:00
Luke Barnard
5471431ee5 Disable "Add a Room" button for when we have a room picker 2017-09-20 17:02:20 +01:00
Luke Barnard
adf0a79585 Implement avatar, displayname for featured users
Profile data has been added to the API response for users in the group summary
2017-09-20 16:54:12 +01:00
Luke Barnard
1c1bf82c2a Add users to group summary using new API 2017-09-20 16:32:02 +01:00
Luke Barnard
44c38652ab Implement UserPickerDialog for adding users
Also, use AccessibleButtons.
2017-09-20 15:44:42 +01:00
Weblate
9b988f1a19 Merge remote-tracking branch 'origin/develop' into develop 2017-09-20 14:24:22 +00:00
David Baker
8d9f06cc47 Merge branch 'master' into develop 2017-09-20 15:24:11 +01:00
David Baker
2ea9fc3f9a v0.12.4 v0.12.4 2017-09-20 15:19:10 +01:00
David Baker
d96759b8ad Prepare changelog for v0.12.4 2017-09-20 15:19:10 +01:00
David Baker
e814eb4555 v0.12.4 2017-09-20 15:18:17 +01:00
David Baker
d957f0cdd7 released js-sdk & react-sdk 2017-09-20 15:16:42 +01:00
David Baker
4dd83de6d1 Merge branch 'master' into develop 2017-09-20 15:14:10 +01:00
David Baker
6c5f4983da v0.10.4 2017-09-20 15:13:20 +01:00
David Baker
4a9886b4da Prepare changelog for v0.10.4 2017-09-20 15:13:19 +01:00
David Baker
22271ced0d released js-sdk 2017-09-20 15:09:14 +01:00
Luke Barnard
1c6cecbd43 Add "Add a User/Room" buttons and always display default lists 2017-09-20 14:41:29 +01:00
David Baker
be938ac0f4 Accept globs for the config location
and make the default config*.sjon so we'll automatically symlink
any config files in the current dir.
2017-09-20 14:38:41 +01:00
David Baker
e4082d4f45 Support multiple configs on the command line 2017-09-20 14:25:33 +01:00
Akcja Demokracja Open-Source
7f4695bba2 Translated using Weblate (Polish)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2017-09-20 10:30:04 +00:00
Szimszon
72bb08b99f Translated using Weblate (Hungarian)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-09-20 06:40:44 +00:00
Andrey
e8c3c2bc20 Translated using Weblate (Russian)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-09-20 05:40:09 +00:00
Jeff Huang
8561e43cb5 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2017-09-20 00:01:38 +00:00
Weblate
16123ff5db Merge remote-tracking branch 'origin/develop' into develop 2017-09-19 21:14:56 +00:00
Silke
546397e676 Translated using Weblate (Dutch)
Currently translated at 97.2% (214 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2017-09-19 21:14:55 +00:00
Matthew Hodgson
fbe1c82dfa Merge pull request #5074 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
2017-09-19 22:14:52 +01:00
Szimszon
37ccf3b93f Translated using Weblate (Hungarian)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-09-19 18:53:28 +00:00