7319 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stefan Parviainen	d6f1e12bee	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 15:50:45 +01:00
Luke Barnard	44aea85792	Merge pull request #1562 from matrix-org/luke/redact-group-ids ... Redact group IDs from analytics	2017-11-01 11:44:27 +00:00
Luke Barnard	047bf6e4dd	Redact group IDs from analytics	2017-11-01 11:30:25 +00:00
David Baker	273aae207a	Merge pull request #1560 from matrix-org/luke/groups-expose-ready-state ... Display whether the group summary/room list is loading	2017-10-31 17:29:36 +00:00
Luke Barnard	16dca08b77	Use constants instead of string literals	2017-10-31 16:13:13 +00:00
Luke Barnard	5bfed67463	Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state	2017-10-31 14:25:10 +00:00
Luke Barnard	d6cbc44e0f	If groupRoomsLoading, replace RoomDetailList entirely with Spinner	2017-10-31 14:21:00 +00:00
David Baker	f24c64f071	Merge pull request #1558 from matrix-org/luke/fix-client-side-validation-group-id ... Change client-side validation of group IDs to match synapse	2017-10-31 13:27:38 +00:00
Luke Barnard	45e15fd865	Merge branch 'develop' into luke/groups-expose-ready-state	2017-10-31 11:50:12 +00:00
Luke Barnard	302bd6c3e9	Escape dash in regex	2017-10-31 11:48:56 +00:00
Luke Barnard	a7170ef73c	Merge pull request #1559 from matrix-org/luke/fix-block-group-settings-if-non-member ... Prevent non-members from opening group settings	2017-10-31 11:47:18 +00:00
Luke Barnard	775468e71a	Display whether the group summary/room list is loading ... This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.	2017-10-31 11:42:09 +00:00
Luke Barnard	20bf69c3c2	Prevent non-members from opening group settings	2017-10-31 10:54:44 +00:00
Luke Barnard	f53a12d904	Generate en_EN translations	2017-10-31 10:25:48 +00:00
Luke Barnard	53938f7998	Change client-side validation of group IDs to match synapse	2017-10-31 10:25:06 +00:00
Travis Ralston	6f8523081b	Some documentation ... Far from complete, and probably needs a bit of work, but it's a start. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 21:09:24 -06:00
Travis Ralston	f070604350	Rename SettingsCheckbox to be a bit more generic ... Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 20:08:27 -06:00
Travis Ralston	3efb0fdeeb	Support default theme at config level ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 19:53:36 -06:00
Travis Ralston	9c846e4dd9	Fix URL preview options ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 19:49:44 -06:00
David Baker	deebd4cbcf	Merge pull request #1556 from matrix-org/luke/groups-disinvite ... Alter UI for disinviting a group member	2017-10-30 18:23:11 +00:00
Luke Barnard	4e234cfc3b	Alter UI for disinviting a group member ... The same API as kicking is used for disinviting, so only cosmetic changes needed here.	2017-10-30 18:17:35 +00:00
Luke Barnard	19b798be10	Merge pull request #1555 from matrix-org/luke/groups-fix-admin-tools ... Only show admin tools to privileged users	2017-10-30 18:03:24 +00:00
Luke Barnard	c655e82867	Merge pull request #1550 from matrix-org/dbkr/try_lowercase_username ... Try lowercase username on login	2017-10-30 17:28:00 +00:00
David Baker	5ea19e2751	Log errors from other login attempts	2017-10-30 17:15:27 +00:00
David Baker	6874f313e3	log login errors	2017-10-30 17:04:21 +00:00
Luke Barnard	3e64333ada	Only show admin tools to privileged users	2017-10-30 16:45:45 +00:00
David Baker	dfa782280c	Merge pull request #1554 from matrix-org/dbkr/pw_change_prevent_default ... Don't refresh page on password change prompt	2017-10-30 16:35:32 +00:00
David Baker	57d516f042	Don't refresh page on password change prompt ... It's on the form submit but missing a preventDefault	2017-10-30 16:28:27 +00:00
David Baker	9dd77af5ef	Merge pull request #1553 from matrix-org/luke/groups-fix-initial-avatar ... Fix initial in GroupAvatar in GroupView	2017-10-30 15:12:19 +00:00
Luke Barnard	14d600a69f	Fix initial in GroupAvatar in GroupView	2017-10-30 15:04:12 +00:00
Travis Ralston	72517f95bb	Don't explode if the SdkConfig isn't available ... This can happen prior to logging in, for some reason. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:53:59 -06:00
Travis Ralston	99ee58d13a	Don't break the room settings page ... A later commit will make the URL preview settings behave like the rest of the settings page. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:18:03 -06:00
Travis Ralston	c056f4faa6	Make URL preview checkboxes pretty again ... Works for all other settings too! Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:17:15 -06:00
Travis Ralston	b139c8d01c	Generate unique IDs for SettingsCheckbox ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:16:46 -06:00
Travis Ralston	f44622b3d8	i18n for URL previews ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 21:50:22 -06:00
Travis Ralston	786bd87fec	Support URL previews (with bugs) ... Known issues at this point: * The room-level setting accepts the current user's default, which is wrong * The checkboxes on RoomSettings are not independent * The checkboxes in RoomSettings need some layout fixes Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 21:48:29 -06:00
Travis Ralston	9fdc1be7bd	Make getLevelAt() return more generic responses ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 20:44:00 -06:00
Travis Ralston	b5d5c81f32	Add a new component to back various settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 20:43:27 -06:00
Travis Ralston	52f227cb3b	Drop the idea of "config" being automatically supported ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 17:08:39 -06:00
Travis Ralston	0d3f0eaf98	Convert local settings to granular settings ... This breaks language selection. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:53:00 -06:00
Travis Ralston	b3d17a7b51	Support legacy settings on the device ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:08:45 -06:00
Travis Ralston	e8acb0e102	Use getValueAt() ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:02:51 -06:00
Travis Ralston	ae10a11ac4	Convert synced settings to granular settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 01:43:52 -06:00
Travis Ralston	bf815f4be9	Support labs features ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 20:21:50 -06:00
Travis Ralston	7dda5e9196	Appease the linter round 1 ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 19:53:12 -06:00
Travis Ralston	23d159e21c	Make reading settings synchronous ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 19:45:48 -06:00
Travis Ralston	989bdcf5fb	Rebuild SettingsStore to be better supported ... This does away with the room- and account-style settings, and just replaces them with `supportedLevels`. The handlers have also been moved out to be in better support of the other options, like SdkConfig and per-room-per-device. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 19:13:06 -06:00
Travis Ralston	c43bf336a9	Appease the linter ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 11:26:40 -06:00
Travis Ralston	e02dcae3b6	Change wording to better describe the class ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 11:26:40 -06:00
Travis Ralston	8c3e5ebbad	Create GranularSettingStore ... GranularSettingStore is a class to manage settings of varying granularity, such as URL previews at the device, room, and account levels. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 11:26:40 -06:00