14 commits

Author	SHA1	Message	Date
Travis Ralston	3e5cc9550b	Fix import merge conflicts, removing any that aren't needed anymore ... Many imports were removed as part of refactoring work, so here we are.	2020-01-09 14:17:33 -07:00
Travis Ralston	fde32f13a5	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
Travis Ralston	d56f0f2a25	Convert many imports to handle ES6 exports ... Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761	2019-12-22 21:04:42 -07:00
Michael Telatynski	937b32663c	Migrate away from Legacy React Contexts	2019-12-17 17:26:12 +00:00
Michael Telatynski	d4d51dc61f	Rip out the remainder of Bluebird	2019-11-18 10:03:05 +00:00
Michael Telatynski	168b1b68bb	Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions" ... This reverts commit 09a8fec2	2019-11-12 11:56:21 +00:00
Michael Telatynski	09a8fec261	s/.done(/.then(/ since modern es6 track unhandled promise exceptions	2019-11-12 11:51:23 +00:00
Michael Telatynski	d5db67be38	Switch to createReactClass: views/elements & views/groups. React 16 :D ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-09-06 18:35:52 +01:00
Travis Ralston	57e45e7e7c	Proof of concept for a flair tab in user settings	2019-01-25 15:35:32 -07:00
Travis Ralston	677b3ca7b5	Bring flair into the new settings ... Makes the flair options in old settings look broken (cosmetic issues), but it's fine because we're ripping that out in due time.	2019-01-23 09:27:04 -07:00
Luke Barnard	edb754b76b	Use GeminiScrollbarWrapper in Flair settings of UserSettings	2018-04-10 18:08:19 +01:00
Luke Barnard	d4f5e7e6d7	Deal with errors, lack of groups, loading	2017-11-28 10:46:20 +00:00
Luke Barnard	0d5f7ef246	Avoid NPE	2017-11-28 10:12:46 +00:00
lukebarnard	9ed9422af8	Move group publication toggles to UserSettings	2017-11-27 17:24:42 +00:00