8413 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	cfd1f28258	Merge pull request #1722 from matrix-org/luke/load-tags-after-first-sync ... Use correct condition for getting account data after first sync	2018-01-30 15:21:12 +00:00
David Baker	c7afaed3a7	Merge pull request #1725 from matrix-org/luke/fix-room-list-reordering ... Fix order calculation logic when reordering a room	2018-01-30 10:27:13 +00:00
lukebarnard	c5a3a02e1d	Fix order calculation logic when reordering a room	2018-01-30 10:14:05 +00:00
lukebarnard	40907ecf29	Use correct condition for getting account data after first sync ... so that we can get tags sooner.	2018-01-26 19:39:06 +01:00
David Baker	ebfdd7c718	Merge pull request #1715 from matrix-org/t3chguy/rich_quoting_linear ... Linear Rich Quoting	2018-01-24 18:53:29 +01:00
Luke Barnard	f013ffd068	Merge pull request #1714 from matrix-org/t3chguy/group_create_dialog_fixes ... Fix CreateGroupDialog issues	2018-01-22 17:57:40 +00:00
Michael Telatynski	e3e3535072	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 17:02:20 +00:00
Michael Telatynski	4490715b60	Merge branch 'develop' into t3chguy/rich_quoting_linear	2018-01-22 16:46:20 +00:00
Michael Telatynski	a6cefb83f8	basic error handling for malformed quotes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 16:41:32 +00:00
Michael Telatynski	3b1d69edbb	Change Quotes to be linearly rendered rather than recursively nested ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 16:34:47 +00:00
Michael Telatynski	33995b053e	Add class to EventTile Line's that are quotes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 16:34:14 +00:00
Michael Telatynski	37dcb33b15	Reset quotingEvent on Room Change because inideal UX ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 14:45:04 +00:00
Matthew Hodgson	02824cfacf	fix i18n for show devices prompt	2018-01-22 12:16:11 +01:00
Michael Telatynski	61b3d050ab	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/group_create_dialog_fixes	2018-01-20 13:39:57 +00:00
Michael Telatynski	2705397bf6	Add local GID==='' check, because Synapse says Group rather than Community ... Reset createError when doing check because it is now stale Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-20 13:16:33 +00:00
Matthew Hodgson	5125683041	Merge pull request #1713 from Half-Shot/hs/leave-room-warnings ... Show a warning if the user attempts to leave a room that is invite only	2018-01-20 11:44:15 +00:00
Will Hunt	5206c9d18b	Show a warning if the user attempts to leave a room that is invite only	2018-01-19 22:52:43 +00:00
Luke Barnard	a8320fe7e2	Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd ... Swap RoomList to react-beautiful-dnd	2018-01-19 14:49:49 +00:00
lukebarnard	6106b3ce44	newOrder defaults null, allows check for newOrder on line 357	2018-01-19 14:12:27 +00:00
lukebarnard	54f6d305d7	Null-guard for newTag	2018-01-19 14:11:05 +00:00
lukebarnard	75a1922731	Fix linting	2018-01-19 14:07:13 +00:00
lukebarnard	00dc077271	Remove react-dnd, revert fa14bc9 as no longer needed	2018-01-19 13:34:56 +00:00
Matthew Hodgson	6c15bd8599	fix NPE when getGroupProfiles returns null	2018-01-19 10:39:38 +00:00
lukebarnard	6f0d799912	Fix indentation	2018-01-18 18:15:34 +00:00
lukebarnard	59f4661bfd	Add comment	2018-01-18 18:01:31 +00:00
lukebarnard	dfecad181a	Swap RoomList to react-beautiful-dnd	2018-01-18 17:59:29 +00:00
David Baker	c090c2e7df	Merge pull request #1710 from matrix-org/t3chguy/roomColor ... don't pass back {} when we have no `org.matrix.room.color_scheme`	2018-01-18 10:22:21 +00:00
Matthew Hodgson	80d3edfbb3	simplify the 'send anyway' text, as 'mark devices known' is meaningless to users	2018-01-18 09:57:29 +00:00
Matthew Hodgson	d3292d9388	fix typos and NPE. fixes #5999	2018-01-17 23:28:14 +00:00
David Baker	27b27e3759	Merge pull request #1700 from matrix-org/dbkr/dont_paginate_while_decrypting ... Don't paginate whilst decrypting events	2018-01-17 19:28:52 +00:00
David Baker	6b43b412ab	Merge pull request #1699 from matrix-org/dbkr/i18n_plural_fallback ... Fall back for missing i18n plurals	2018-01-17 19:28:38 +00:00
Michael Telatynski	2f42e69b57	Merge branches 'develop' and 't3chguy/roomColor' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomColor	2018-01-17 18:20:35 +00:00
Michael Telatynski	b7204e79a7	fallback after receiving settings rather than {} because its truthy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-17 18:17:26 +00:00
Michael Telatynski	43bb8c561d	add comment ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-17 18:10:19 +00:00
Michael Telatynski	b90a98b5c1	don't pass back {} when we have no org.matrix.room.color_scheme ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-17 18:06:19 +00:00
David Baker	bd81ed6587	Merge pull request #1709 from matrix-org/luke/fix-group-store-redundant-requests ... Fix group store redundant requests	2018-01-17 17:10:49 +00:00
lukebarnard	5f413ddf8b	Do not fetch GroupStore resources if already fetching	2018-01-17 17:01:42 +00:00
lukebarnard	3ebf278cf3	Refactor GroupStore based on existing STATE_KEY concept ... by factoring out a lot of repeated code.	2018-01-17 16:59:13 +00:00
David Baker	47f3e511b6	Retest please	2018-01-17 11:01:50 +00:00
David Baker	621682a2db	Retest please	2018-01-17 11:01:07 +00:00
David Baker	792db43007	Merge pull request #1708 from matrix-org/luke/fix-tag-order-store-ignore-self-remote-echos ... Ignore remote echos caused by this client	2018-01-17 10:57:39 +00:00
lukebarnard	2a1f8bd394	Ignore remote echos caused by this client ... by sending each tag_ordering with a _storeId and ignoring accout data that has a matching _storeId. This will tend to become out of sync with the server over time if requests continually fail, but subsequent successful requests will rectify any differences.	2018-01-17 10:51:28 +00:00
David Baker	f76186d743	Merge remote-tracking branch 'origin/develop' into dbkr/i18n_plural_fallback	2018-01-16 17:45:45 +00:00
David Baker	0557737f8d	Don't modify original options arg	2018-01-16 17:45:29 +00:00
David Baker	c64b4e1b1c	Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting	2018-01-16 17:38:32 +00:00
Luke Barnard	62caa4f096	Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd ... Replace TagPanel react-dnd with react-beautiful-dnd	2018-01-16 11:26:44 +00:00
lukebarnard	f19dcd8114	Comment workaround to atlassian/react-beautiful-dnd#273	2018-01-16 11:07:25 +00:00
lukebarnard	bda2d6b0a6	Work around atlassian/react-beautiful-dnd#273 ... For some reason, after dragging an item the parent draggable receives a mouse click. The workaround is to use onMouseDown for deselecting tags	2018-01-16 10:44:11 +00:00
lukebarnard	f391375dea	Alter comment on travis-ci#8836 workaround	2018-01-16 10:09:11 +00:00
lukebarnard	d2e5b12271	Update jsdoc for moveTag	2018-01-16 09:46:48 +00:00