263 commits

Author	SHA1	Message	Date
Bruno Windels	928b6d47c8	add resize handles between 3 main app columns	2018-09-24 16:07:42 +01:00
Matthew Hodgson	efdc5430d7	merge develop	2018-07-09 17:50:07 +01:00
Michael Telatynski	7225f7372c	Revert " make click to insert nick work on join/parts, /me's etc"	2018-07-03 10:30:08 +01:00
Michael Telatynski	2c537a8dff	update styling ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 15:28:36 +01:00
Michael Telatynski	6021c3a634	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev	2018-06-29 14:56:18 +01:00
Michael Telatynski	32ab997230	properly style Group Pill ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-22 14:38:06 +01:00
Michael Telatynski	c1e608f1a8	show permalinks to communities as Pills ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-19 11:53:17 +01:00
Michael Telatynski	c91e6cb530	make click to insert nick work on join/parts, /me's etc ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-07 01:02:34 +01:00
Matthew Hodgson	b60ccad29b	Merge branch 'develop' into matthew/slate	2018-05-15 01:00:07 +01:00
Matthew Hodgson	c1000a7cd5	emojioneify the composer ... and also fix up the selectedness CSS for pills and emoji	2018-05-14 03:02:12 +01:00
Michael Telatynski	ee0e6c5913	Remove margins when in a ReplyThread to stop them taking so much space ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-09 11:53:37 +01:00
Michael Telatynski	06408f843b	post BigMerge fixup - merge in stuff from riot-web PR ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 09:23:27 +01:00
Matthew Hodgson	79d3cca6e9	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00