7379 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	f7da5836e1	Make blacklistUnverifiedDevices override the level order ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-08 17:41:32 -07:00
Travis Ralston	c7d8f3931f	Revert notification toolbar setting ... It isn't a setting. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-08 17:06:36 -07:00
Travis Ralston	289b0c2b6a	Merge branch 'develop' into travis/granular-settings	2017-11-07 14:55:12 -07:00
Luke Barnard	8fbe50a1cf	Merge pull request #1580 from matrix-org/luke/groups-new-group-settings ... Improve group creation UX	2017-11-07 18:55:34 +00:00
Luke Barnard	d777e370f2	Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing ... Disable RoomDetailList in GroupView when editing	2017-11-07 18:53:04 +00:00
Matthew Hodgson	3b1726657f	Merge pull request #1586 from turt2live/travis/message-pinning-fix1 ... Default to no read pins if there is no applicable account data	2017-11-07 18:24:21 +00:00
David Baker	49a935881f	Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk ... UnknownDeviceDialog: get devices from SDK	2017-11-07 18:15:59 +00:00
Travis Ralston	e0ddd88ec9	Default to no read pins if there is no applicable account data ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-07 11:14:27 -07:00
Matthew Hodgson	e14e0bf200	Merge pull request #1486 from turt2live/travis/pinned-notice ... Add a small indicator for when a new event is pinned	2017-11-07 17:56:12 +00:00
David Baker	10f15dfc56	Unmounted guard	2017-11-07 17:10:40 +00:00
Luke Barnard	80d4873542	Disable RoomDetailList in GroupView when editing ... Otherwise the rooms can be clicked on.	2017-11-07 16:54:28 +00:00
David Baker	ec560345c7	UnknownDeviceDialog: get devices from SDK ... rather than having to have the error message passed in. This is in preparation for not having the dialog pop up straight away when a message isn't sent so we don't have to keep the error object knocking around somewhere.	2017-11-07 16:37:43 +00:00
Travis Ralston	142d23a099	Cap the read pin event IDs to 10 ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-07 09:16:19 -07:00
Luke Barnard	4d9f946388	Merge pull request #1582 from matrix-org/luke/group-rooms-tooltip ... Implement tooltip for group rooms	2017-11-07 15:22:35 +00:00
Luke Barnard	646cabf324	Add missing whitespace	2017-11-07 15:15:10 +00:00
Luke Barnard	ddc1ff2f23	Name things in a sane way	2017-11-07 15:13:26 +00:00
Luke Barnard	62305a1ccd	Implement tooltip for group rooms	2017-11-07 14:07:31 +00:00
Luke Barnard	9019fee49e	Adjust long desc placeholder text	2017-11-07 10:48:56 +00:00
Luke Barnard	47bf991471	Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills ... Room notifs in autocomplete & composer	2017-11-07 10:25:48 +00:00
David Baker	df5c6470e8	get dict syntax right	2017-11-06 22:01:23 +00:00
Luke Barnard	956c5ff343	Use a constant for easy reading of long desc placeholder	2017-11-06 18:52:55 +00:00
Luke Barnard	477051cfa6	Add placeholder for when a long desc hasn't been set ... this is only visible to group admins.	2017-11-06 18:35:52 +00:00
Luke Barnard	137f1311b3	Add useful placeholder for the long description textarea	2017-11-06 18:35:23 +00:00
Luke Barnard	36cd22663a	Open group settings when the group is created	2017-11-06 18:02:50 +00:00
Matthew Hodgson	17ae37bd3b	Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug ... Ignore img tags in HTML if src is not specified	2017-11-06 18:02:38 +00:00
Luke Barnard	d14f943629	Ignore img tags in HTML if src is not specified ... This applies to HTML messages and group summaries.	2017-11-06 17:52:46 +00:00
David Baker	029853d379	Merge pull request #1578 from matrix-org/luke/groups-admin-badges ... Indicate admins in the group member list with a sheriff badge	2017-11-06 17:16:34 +00:00
David Baker	08d006d112	PR feedback	2017-11-06 17:15:09 +00:00
Luke Barnard	d6a6e59d6c	Indicate admins in the group member list with a sheriff badge	2017-11-06 16:37:16 +00:00
David Baker	41e7496ff1	unused var	2017-11-06 15:25:25 +00:00
David Baker	adc4290451	Pillify room notif pills in composer	2017-11-06 15:11:42 +00:00
Richard Lewis	f1db564506	Merge pull request #1533 from anoadragon453/develop ... Remember whether widget drawer was hidden per-room	2017-11-06 14:29:25 +00:00
David Baker	48def50fec	Merge pull request #1576 from matrix-org/luke/throw-on-undefined-group ... Throw an error when trying to create a group store with falsey groupId	2017-11-06 13:02:46 +00:00
Luke Barnard	febeb0429e	Throw an error when trying to create a group store with falsey groupId	2017-11-06 10:18:10 +00:00
Travis Ralston	781b94c8f4	Appease the linter ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 15:37:06 -07:00
Travis Ralston	10519f9465	Fix the tests ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 14:56:41 -07:00
Travis Ralston	f0000f7400	Update documentation ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 14:33:40 -07:00
Travis Ralston	50807d498a	Use settings in slash commands too ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 13:06:55 -07:00
Travis Ralston	e31c89d360	Make the controller work for notifications ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 22:28:35 -07:00
Travis Ralston	7ce4316cc8	Initial support for notification settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 21:47:18 -07:00
Travis Ralston	8351ec7e73	Local echo on all setting levels ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 20:32:00 -07:00
Travis Ralston	3958e32672	Ensure blacklistUnverifiedDevices persists reloads ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 20:13:23 -07:00
Travis Ralston	45140cab69	Don't assume false means "use state" ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:42 -07:00
Travis Ralston	ef45d82ec6	Fix URL preview save calls ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:20 -07:00
Travis Ralston	b75be41f94	Fix split-brain for blacklistUnverifiedDevices ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:06 -07:00
Travis Ralston	cb17c0a379	Migrate blacklistUnverifiedDevicesPerRoom ... This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:15:55 -07:00
Travis Ralston	c7eee36990	Fix lanugage detection ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:38:26 -06:00
Travis Ralston	4f1ad974fc	Delay URL preview saving until the save button is pressed ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:32:13 -06:00
Travis Ralston	358298e4ee	Support room color in settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:10:25 -06:00
Travis Ralston	bb5f7bed85	Check the correct event type for the room ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 15:48:24 -06:00