8388 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
lukebarnard	f7e2e91df5	Workaround for travis-ci/travis-ci#8836	2018-01-16 09:38:16 +00:00
lukebarnard	16c13fb079	Replace TagPanel react-dnd with react-beautiful-dnd ... This new library handles the simple case of an ordered vertical (or horizontal) list of items that can be reordered. It provides animations, handles positioning of items mid-drag and exposes a much simpler API to react-dnd (with a slight loss of potential function, but we don't need this flexibility here anyway). Apart from this, TagOrderStore had to be changed in a highly coupled way, but arguably for the better. Instead of being updated incrementally every time an item is dragged over another and having a separate "commit" action, the asyncronous action `moveTag` is used to reposition the tag in the list and both dispatch an optimistic update and carry out the request as before. (The MatrixActions.accountData is still used to indicate a successful reordering of tags). The view is updated instantly, in an animated way, and this is handled at the layer "above" React by the DND library.	2018-01-15 18:12:27 +00:00
David Baker	0a6018a945	Merge pull request #1704 from matrix-org/luke/perf-room-list ... Only set selected tags state when updating rooms	2018-01-15 15:01:57 +00:00
lukebarnard	408f13f68c	Only set selected tags state when updating rooms ... instead of every time we get an update from a GroupStore/otherwise. This was leading to many setStates and renders at startup when we receive many group /members /rooms etc. responses. Also, use the rate limited version of refreshRoomList.	2018-01-15 14:42:41 +00:00
David Baker	ba9f03ce5e	Merge pull request #1702 from matrix-org/t3chguy/datesep ... Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep	2018-01-15 13:45:11 +00:00
Michael Telatynski	b526fc057c	Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep	2018-01-14 18:32:17 +00:00
David Baker	e42bea6277	Don't paginate whilst decrypting events ... As comment hopefully explains. This meant loading the app on an e2e room would often be very slow as it tried to pull hundreds of events into the timeline.	2018-01-12 18:17:03 +00:00
David Baker	3cadb9b587	Fall back for missing i18n plurals ... Counterpart doesn't do fallback if there is a translation for the base string in the preferred language but not the required pluralisation. This meant that if someone added some plurals to a language or a string, but not all, you'd get completely empty strings in the interface. Work around this in the wrapper function.	2018-01-12 16:21:30 +00:00
David Baker	952f2c6a21	Merge pull request #1698 from matrix-org/dbkr/fix_autofocus ... Fix autofocus on QuestionDialog	2018-01-12 13:56:24 +00:00
David Baker	99a72b5b2b	Fix autofocus broken in https://github.com/matrix-org/matrix-react-sdk/pull/1674 ... 'focus' attribute was on the wrong thing	2018-01-12 10:52:51 +00:00
David Baker	aa5d42d045	Remove spurious dot	2018-01-12 10:32:36 +00:00
David Baker	3371506960	Merge pull request #1697 from matrix-org/t3chguy/nvl/rich_quoting ... Iterative fixes on Rich Quoting	2018-01-12 09:41:14 +00:00
Michael Telatynski	23bd612730	Focus composer when clicking Reply (quote event) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-11 19:29:00 +00:00
Michael Telatynski	192cba2b79	allow text&onSenderProfileClick for tileShape===quote ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-11 19:25:43 +00:00
Matthew Hodgson	e187ec6a2f	Merge pull request #1696 from matrix-org/t3chguy/fix_missing_negation ... Fix missing negation	2018-01-11 12:06:48 +00:00
Michael Telatynski	8ad4da54cb	Fix missing negation ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-11 12:04:53 +00:00
David Baker	b152bd4ab9	Merge pull request #1625 from matrix-org/t3chguy/analytics_info ... Add Analytics Info and add Piwik to SdkConfig.DEFAULTS	2018-01-11 11:02:34 +00:00
David Baker	84da19c544	Merge pull request #1668 from turt2live/travis/re-register-scalar-token ... Attempt to re-register for a scalar token if ours is invalid	2018-01-11 11:01:04 +00:00
David Baker	292a6c5767	Merge pull request #1674 from aidalgol/rebase-dialogs ... Normalise dialogs	2018-01-11 10:49:40 +00:00
David Baker	efb96cdd2a	Merge pull request #1695 from matrix-org/dbkr/send_without_verifying ... Add 'send without verifying' to status bar	2018-01-11 10:34:56 +00:00
David Baker	4524e227d2	Merge pull request #1660 from matrix-org/t3chguy/nvl/rich_quoting ... Implement Rich Quoting/Replies	2018-01-11 10:34:39 +00:00
David Baker	57e11cea1c	Fix jsdoc	2018-01-11 10:27:15 +00:00
Michael Telatynski	007715aeaa	Run prune-i18n.js ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 12:54:00 +00:00
Michael Telatynski	94167e2b8b	Run gen-i18n.js and embed the ellipsis into the base string ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 12:52:20 +00:00
Michael Telatynski	f5bad8bb10	Regenerate ESLintIgnore file ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 12:50:12 +00:00