259 commits

Author	SHA1	Message	Date
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	e3c455e599	Style the ShareDialog ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 11:22:01 +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	3bf28a08ec	experiments in dharma	2018-05-25 03:17:29 +01:00
Luke Barnard	dca1217a45	Change wording and appearance of Deactivate Account dialog	2018-05-24 11:50:45 +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	46f5c0d205	finish merging vector-im/riot-web#5881 into matrix-react-sdk	2018-04-16 01:13:03 +01:00
Matthew Hodgson	5d03eabb15	rethemedex	2018-04-13 00:54:41 +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