David Baker
|
f450ce422e
|
v0.12.5
|
2017-09-21 18:06:03 +01:00 |
|
David Baker
|
874e88c4a8
|
react-sdk v0.10.5
|
2017-09-21 18:05:22 +01:00 |
|
David Baker
|
c6e4f606f9
|
Merge branch 'master' into develop
|
2017-09-21 18:02:16 +01:00 |
|
David Baker
|
99e4221e61
|
v0.10.5
|
2017-09-21 18:01:42 +01:00 |
|
David Baker
|
671743bcae
|
Prepare changelog for v0.10.5
|
2017-09-21 18:01:41 +01:00 |
|
David Baker
|
3ac67077f9
|
Merge pull request #1410 from matrix-org/dbkr/prerelease_clean
Clean on prerelease
|
2017-09-21 17:59:48 +01:00 |
|
Weblate
|
7e87964e82
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-21 16:49:59 +00:00 |
|
Luke Barnard
|
0eefae031f
|
Merge pull request #5096 from vector-im/luke/groups-membership-section-redesign
Redesign membership section of GroupView
|
2017-09-21 17:49:55 +01:00 |
|
Luke Barnard
|
c19ee66565
|
Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign
Redesign membership section in GroupView
|
2017-09-21 17:49:47 +01:00 |
|
David Baker
|
a0b4d8a9f8
|
Clean on prerelease
To avoid any further problems where we ship build files with the
wrong capitalisation because npm is dumb
|
2017-09-21 17:39:34 +01:00 |
|
Weblate
|
406f36a2d1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-21 16:31:14 +00:00 |
|
Luke Barnard
|
96b9570465
|
Update comment
|
2017-09-21 17:31:06 +01:00 |
|
Luke Barnard
|
b5f141456c
|
Merge pull request #1406 from matrix-org/luke/groups-add-feature-rooms
Implement adding rooms to the group summary
|
2017-09-21 17:27:40 +01:00 |
|
Luke Barnard
|
3351770b54
|
Fix dodgy merge
|
2017-09-21 17:26:16 +01:00 |
|
Stefan Parviainen
|
411a67c6b0
|
Remove unneeded strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
|
2017-09-21 18:25:45 +02:00 |
|
Luke Barnard
|
d75efb83f1
|
Merge branch 'develop' into luke/groups-membership-section-redesign
|
2017-09-21 17:25:12 +01:00 |
|
Luke Barnard
|
cf23ac5931
|
Merge branch 'develop' into luke/groups-add-feature-rooms
|
2017-09-21 17:20:12 +01:00 |
|
Carlos
|
22580b5fd3
|
Translated using Weblate (Portuguese)
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/pt/
|
2017-09-21 16:12:50 +00:00 |
|
David Baker
|
f27750e03e
|
Merge pull request #1407 from matrix-org/dbkr/groups_is_privileged
Honour the is_privileged flag in GroupView
|
2017-09-21 17:10:28 +01:00 |
|
David Baker
|
3c2e6fdf9e
|
Honour the is_privileged flag in GroupView
|
2017-09-21 16:55:56 +01:00 |
|
Luke Barnard
|
5f840a3031
|
Implement adding rooms to the group summary
This includes making UserPickerDialog more generic such that it can also pick rooms from groups.
|
2017-09-21 16:53:10 +01:00 |
|
David Baker
|
3f0ee4e6ad
|
Merge pull request #1405 from matrix-org/dbkr/update_on_group_invite
Update when a group arrives
|
2017-09-21 16:39:46 +01:00 |
|
David Baker
|
add91f9a7d
|
Update when a group arrives
|
2017-09-21 16:28:49 +01:00 |
|
Andrey
|
2bc2d30a0e
|
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 14:18:33 +00:00 |
|
David Baker
|
5940b11fd2
|
Merge pull request #1404 from matrix-org/luke/feature-flair-click-for-group
Implement `view_group` dispatch when clicking flair
|
2017-09-21 15:18:28 +01:00 |
|
Luke Barnard
|
96bb804eb8
|
Redesign membership section of GroupView
|
2017-09-21 15:11:57 +01:00 |
|
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 |
|