1977 commits

Author	SHA1	Message	Date
Luke Barnard	b54e563cb6	Merge branch 'develop' into luke/linting-keyword-spacing	2017-11-16 13:23:42 +00:00
Luke Barnard	dad797d4a2	Run linting --fix	2017-11-16 13:19:36 +00:00
Matthew Hodgson	f62b04c3be	Merge branch 'develop' into travis/granular_bugs	2017-11-16 13:12:03 +00:00
Travis Ralston	10a1d9cb29	Language is a local setting ... Fixes https://github.com/vector-im/riot-web/issues/5611 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 21:16:12 -07:00
Travis Ralston	022e40a127	Use SettingsStore for default theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 19:04:49 -07:00
Stefan Parviainen	2c1618bc10	Fix conflict and update strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-15 20:40:51 +01:00
Matthew Hodgson	060a890275	Merge pull request #1516 from turt2live/travis/granular-settings ... Granular settings	2017-11-15 10:55:55 +00:00
Matthew Hodgson	e91e94fd42	fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601	2017-11-15 09:56:44 +00:00
Travis Ralston	bd4102eb3d	Merge branch 'develop' into travis/granular-settings	2017-11-14 19:12:48 -07:00
Matthew Hodgson	546b062d82	automatically and correctly retint when changing theme	2017-11-15 01:45:51 +00:00
Matthew Hodgson	f05958e334	Merge pull request #1482 from turt2live/travis/presence ... Implement user-controlled presence	2017-11-14 23:53:16 +00:00
Stefan Parviainen	df6d5cc2b4	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
Matthew Hodgson	7c98558b6a	fix neglible race when loading CSS	2017-11-14 16:07:48 +00:00
Matthew Hodgson	1fd7ac30e4	turns out i made up the .complete property on link elements	2017-11-14 16:04:11 +00:00
Matthew Hodgson	8d6e3dd27d	fix lint	2017-11-14 15:37:03 +00:00
Matthew Hodgson	dcfbe93409	fix race when loading CSS ... fixes https://github.com/vector-im/riot-web/issues/5590	2017-11-14 15:28:34 +00:00
Matthew Hodgson	8c218557df	fix disable_custom_urls	2017-11-14 15:17:50 +00:00
Travis Ralston	d92cba25ef	Use the SettingsStore to get the theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 13:14:00 -07:00
Travis Ralston	63bebe9dfd	Split out avatar and display name hiding ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 12:58:10 -07:00
Travis Ralston	0648b3eae7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:29:36 -07:00
Stefan Parviainen	3afbaf61e7	Refactor i18n stuff a bit	2017-11-13 20:19:33 +01:00
Travis Ralston	c5c346f0b7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:18:41 -07:00
Matthew Hodgson	46387e135e	Merge branch 'develop' into matthew/status	2017-11-11 23:50:48 +00:00
Matthew Hodgson	2827bc0718	replace some of the status.im theme with general config options	2017-11-11 23:46:43 +00:00
David Baker	39763d668c	Revert "Lowercase all usernames"	2017-11-11 15:59:43 +00:00
Matthew Hodgson	a0cdaf29f9	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-10 15:29:42 -08:00
Luke Barnard	0d174ffe9a	Fix tests	2017-11-10 11:13:52 +00:00
Luke Barnard	f4428267a1	Refactor onboarding redirect, add groups to the onboarding starters	2017-11-10 10:51:28 +00:00
Luke Barnard	266a504981	Use the same MatrixClient for the duration of GroupView lifecycle ... Using the pegged matrix client would lead to trying to call removeListener on `null` when GroupView is unmounted during logout.	2017-11-10 10:49:14 +00:00
Travis Ralston	030633fa90	Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings	2017-11-08 17:43:38 -07:00
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
Matthew Hodgson	58ee4d0a76	rewrite the tinter to be ES6, and correctly cache fixups per theme	2017-11-08 06:55:07 -08:00
Matthew Hodgson	e729bc431d	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-08 04:29:52 -08:00
Luke Barnard	120e7b821f	Merge pull request #1585 from matrix-org/luke/groups-inviter-profile ... Use the getProfileInfo API for group inviter profile	2017-11-08 10:24:00 +00:00
Luke Barnard	10778e075e	Merge branch 'develop' into luke/groups-inviter-profile	2017-11-08 10:10:43 +00:00
Luke Barnard	4bb083d959	Style	2017-11-08 10:08:04 +00:00
Luke Barnard	f53f9ed8ca	inviterProfile = null initially	2017-11-08 10:07:43 +00:00
Luke Barnard	4c47f75918	Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility ... Add checkbox to GroupAddressPicker for determining visibility of group rooms	2017-11-08 10:04:41 +00: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
Luke Barnard	edc744067f	Add checkbox to GroupAddressPicker for determining visibility of group rooms	2017-11-07 18:51:41 +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
Luke Barnard	ed709f52d1	Use the getProfileInfo API for group inviter profile	2017-11-07 16:42:43 +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	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