66 commits

Author	SHA1	Message	Date
David Baker	bf7633250a	Revert "Fix showing peek preview while LL members are loading"	2018-08-22 16:16:17 +01:00
Bruno Windels	860c6355f0	do self membership checks with getMyMembership elsewhere as well	2018-08-22 14:06:28 +02:00
Matthew Hodgson	efdc5430d7	merge develop	2018-07-09 17:50:07 +01:00
Michael Telatynski	6e0db5bfb6	use enum constants for EventStatus and correct isSent check ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 17:41:50 +01:00
David Baker	e67dae704a	Take replies out of labs!	2018-06-20 09:57:11 +01:00
David Baker	6904c2bafe	Merge pull request #1948 from matrix-org/export_Group ... Share Dialog	2018-06-15 10:52:27 +01:00
Michael Telatynski	4e216714b5	remove commented code and move modal.close into a finally block ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 13:53:02 +01:00
Michael Telatynski	7d7a6f3d9c	ShareDialog share Message, link to timestamp and permalink in ctx menu ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 13:35:35 +01:00
Michael Telatynski	9dd2184b33	remove unused imports ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 15:29:05 +01:00
Michael Telatynski	c820836bcc	make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 15:23:11 +01:00
Matthew Hodgson	7de45f8b7b	make quoting work	2018-05-21 03:48:59 +01:00
Michael Telatynski	97fecaedc2	improve wording ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:26:42 +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	32dd7f976f	merge vector-im/riot-web#5881 into matrix-react-sdk	2018-04-16 00:04:04 +01:00
Matthew Hodgson	40a67ca8fe	point imports at the new locations	2018-04-13 00:43:44 +01:00
Matthew Hodgson	8ab8f76254	move non-Riot-specific components over from riot-web	2018-04-11 23:58:04 +01:00