00dc077271 
								
							
								 
							
						 
						
							
							
								
								Remove react-dnd, revert  fa14bc9 as no longer needed  
							
							
							
						 
						
							2018-01-19 13:34:56 +00:00  
				
					
						
							
							
								 
						
							
							
								6f0d799912 
								
							
								 
							
						 
						
							
							
								
								Fix indentation  
							
							
							
						 
						
							2018-01-18 18:15:34 +00:00  
				
					
						
							
							
								 
						
							
							
								59f4661bfd 
								
							
								 
							
						 
						
							
							
								
								Add comment  
							
							
							
						 
						
							2018-01-18 18:01:31 +00:00  
				
					
						
							
							
								 
						
							
							
								dfecad181a 
								
							
								 
							
						 
						
							
							
								
								Swap RoomList to react-beautiful-dnd  
							
							
							
						 
						
							2018-01-18 17:59:29 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f19dcd8114 
								
							
								 
							
						 
						
							
							
								
								Comment workaround to  atlassian/react-beautiful-dnd#273  
							
							
							
						 
						
							2018-01-16 11:07:25 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f391375dea 
								
							
								 
							
						 
						
							
							
								
								Alter comment on travis-ci#8836 workaround  
							
							
							
						 
						
							2018-01-16 10:09:11 +00:00  
				
					
						
							
							
								 
						
							
							
								d2e5b12271 
								
							
								 
							
						 
						
							
							
								
								Update jsdoc for moveTag  
							
							
							
						 
						
							2018-01-16 09:46:48 +00:00  
				
					
						
							
							
								 
						
							
							
								f7e2e91df5 
								
							
								 
							
						 
						
							
							
								
								Workaround for  travis-ci/travis-ci#8836  
							
							
							
						 
						
							2018-01-16 09:38:16 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b526fc057c 
								
							
								 
							
						 
						
							
							
								
								Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep  
							
							
							
						 
						
							2018-01-14 18:32:17 +00:00  
				
					
						
							
							
								 
						
							
							
								952f2c6a21 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1698  from matrix-org/dbkr/fix_autofocus  
							
							... 
							
							
							
							Fix autofocus on QuestionDialog 
							
						 
						
							2018-01-12 13:56:24 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								aa5d42d045 
								
							
								 
							
						 
						
							
							
								
								Remove spurious dot  
							
							
							
						 
						
							2018-01-12 10:32:36 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								23bd612730 
								
									
								
							
								 
							
						 
						
							
							
								
								Focus composer when clicking `Reply` (quote event)  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-11 19:29:00 +00:00  
				
					
						
							
							
								 
						
							
							
								192cba2b79 
								
									
								
							
								 
							
						 
						
							
							
								
								allow text&onSenderProfileClick for tileShape===quote  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-11 19:25:43 +00:00  
				
					
						
							
							
								 
						
							
							
								e187ec6a2f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1696  from matrix-org/t3chguy/fix_missing_negation  
							
							... 
							
							
							
							Fix missing negation 
							
						 
						
							2018-01-11 12:06:48 +00:00  
				
					
						
							
							
								 
						
							
							
								8ad4da54cb 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix missing negation  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-11 12:04:53 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								292a6c5767 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1674  from aidalgol/rebase-dialogs  
							
							... 
							
							
							
							Normalise dialogs 
							
						 
						
							2018-01-11 10:49:40 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4524e227d2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1660  from matrix-org/t3chguy/nvl/rich_quoting  
							
							... 
							
							
							
							Implement Rich Quoting/Replies 
							
						 
						
							2018-01-11 10:34:39 +00:00  
				
					
						
							
							
								 
						
							
							
								57e11cea1c 
								
							
								 
							
						 
						
							
							
								
								Fix jsdoc  
							
							
							
						 
						
							2018-01-11 10:27:15 +00:00  
				
					
						
							
							
								 
						
							
							
								007715aeaa 
								
									
								
							
								 
							
						 
						
							
							
								
								Run prune-i18n.js  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-10 12:54:00 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f5bad8bb10 
								
									
								
							
								 
							
						 
						
							
							
								
								Regenerate ESLintIgnore file  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-10 12:50:12 +00:00  
				
					
						
							
							
								 
						
							
							
								1a7dc22a8d 
								
									
								
							
								 
							
						 
						
							
							
								
								make wantsDateSeparator generic and throw into DateUtils  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-10 12:06:24 +00:00  
				
					
						
							
							
								 
						
							
							
								e45fcf10c7 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor DateUtils to ES6  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-10 12:00:11 +00:00  
				
					
						
							
							
								 
						
							
							
								9e2238e884 
								
									
								
							
								 
							
						 
						
							
							
								
								remove unused imports  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-10 11:56:36 +00:00  
				
					
						
							
							
								 
						
							
							
								1bc9d344ae 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
#	src/components/views/messages/TextualBody.js 
							
						 
						
							2018-01-10 11:54:58 +00:00  
				
					
						
							
							
								 
						
							
							
								454fd23f25 
								
									
								
							
								 
							
						 
						
							
							
								
								fix typo shsape->shape  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-10 11:51:48 +00:00  
				
					
						
							
							
								 
						
							
							
								a977ab9be4 
								
									
								
							
								 
							
						 
						
							
							
								
								change handler name to suit convention  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-10 11:51:23 +00:00  
				
					
						
							
							
								 
						
							
							
								e2b2818555 
								
							
								 
							
						 
						
							
							
								
								Empty to force re-test  
							
							
							
						 
						
							2018-01-10 11:03:38 +00:00  
				
					
						
							
							
								 
						
							
							
								9dd9a5be4b 
								
							
								 
							
						 
						
							
							
								
								Wording tweak  
							
							
							
						 
						
							2018-01-09 17:59:49 +00:00  
				
					
						
							
							
								 
						
							
							
								dbb8f878cb 
								
							
								 
							
						 
						
							
							
								
								Tidy up imports  
							
							
							
						 
						
							2018-01-09 17:57:18 +00:00  
				
					
						
							
							
								 
						
							
							
								4c101628b5 
								
							
								 
							
						 
						
							
							
								
								Add 'send without verifying' to status bar  
							
							... 
							
							
							
							Fixes other part of https://github.com/vector-im/riot-web/issues/5936  
							
						 
						
							2018-01-09 13:52:37 +00:00  
				
					
						
							
							
								 
						
							
							
								9365860075 
								
							
								 
							
						 
						
							
							
								
								Update copyright line  
							
							
							
						 
						
							2018-01-09 18:40:12 +13:00  
				
					
						
							
							
								 
						
							
							
								d0897dc8f3 
								
									
								
							
								 
							
						 
						
							
							
								
								update wording to not imply exhaustiveness  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-01-08 13:29:27 +00:00  
				
					
						
							
							
								 
						
							
							
								76ce40715d 
								
							
								 
							
						 
						
							
							
								
								bump commonmark dep to try to fix  https://github.com/vector-im/riot-web/issues/3428  better  
							
							
							
						 
						
							2018-01-07 20:32:57 +00:00  
				
					
						
							
							
								 
						
							
							
								bcc3a4870a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1694  from matrix-org/revert-1270-luke/fix-md-unescaped-tokens  
							
							... 
							
							
							
							Revert "MD-escape URLs/alises/user IDs prior to parsing markdown" 
							
						 
						
							2018-01-07 20:31:07 +00:00  
				
					
						
							
							
								 
						
							
							
								a88f92c3e3 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"  
							
							
							
						 
						
							2018-01-07 20:30:18 +00:00  
				
					
						
							
							
								 
						
							
							
								6902cb5648 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1693  from matrix-org/luke/pref-tag-panel-selected2  
							
							... 
							
							
							
							Cache isConfCallRoom 
							
						 
						
							2018-01-05 16:16:10 +00:00