6625 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	45c4eeba01	Merge pull request #1411 from matrix-org/dbkr/delint_truncatedlist ... De-lint TruncatedList	2017-09-22 10:20:26 +01:00
David Baker	29d8df2c9e	De-lint TruncatedList	2017-09-22 10:00:46 +01:00
David Baker	77efe6a6d0	Merge pull request #1409 from pafcu/develop ... Remove unneeded strings	2017-09-22 09:46:50 +01:00
David Baker	78e806f7f9	Merge branch 'master' into develop	2017-09-21 21:48:08 +01:00
David Baker	3552f08aad	v0.10.6	2017-09-21 21:47:28 +01:00
David Baker	c40a3b9aab	Prepare changelog for v0.10.6	2017-09-21 21:47:28 +01:00
David Baker	daac0ebdc0	js-sdk v0.8.4	2017-09-21 21:43:35 +01:00
Matthew Hodgson	946c439c28	hopefully fix https://github.com/vector-im/riot-web/issues/4166	2017-09-21 18:56:47 +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
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
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
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
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	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
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
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
Luke Barnard	515222c25f	Track action button click event	2017-09-20 17:16:49 +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
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	6ad4ba767b	Merge pull request #1401 from matrix-org/luke/fix-separate-sender-profile ... Separate sender profile into elements with classes	2017-09-19 17:21:52 +01:00
David Baker	173370dfc2	Merge pull request #1399 from matrix-org/luke/fix-ugly-integ-button ... Fix ugly integration button, use hover to show error	2017-09-19 17:21:42 +01:00
Luke Barnard	979b580e1f	Merge branch 'develop' into luke/fix-ugly-integ-button	2017-09-19 17:04:06 +01:00
Luke Barnard	e2ae6e6235	Separate sender profile into elements with classes ... For separate CSS manipulation so that we can vary opacity independently for flair/name/aux	2017-09-19 16:56:14 +01:00
Luke Barnard	668e096194	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-09-19 16:36:51 +01:00