Luke Barnard
							
						 
						
							 
							
							
							
								
							
								a78575929c 
								
							
								 
							
						 
						
							
							
								
								Document a few action creators  
							
							 
							
							
							
						 
						
							2018-02-21 10:15:52 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								644ddbf9b9 
								
							
								 
							
						 
						
							
							
								
								Regenerate room lists on Room event  
							
							 
							
							... 
							
							
							
							To make sure that we handle rooms that our
client has not seen previously, we regenerate
the room list when the room is stored -
which is indicated by the js-sdk by the
Room event. 
							
						 
						
							2018-02-20 17:57:46 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								b5146001d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1761  from matrix-org/luke/fix-direct-messages-with-self  
							
							 
							
							... 
							
							
							
							Fix DMs being marked as with the current user ("me") 
							
						 
						
							2018-02-20 14:22:17 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								bc15303358 
								
							
								 
							
						 
						
							
							
								
								Factor out updateDmState  
							
							 
							
							
							
						 
						
							2018-02-20 14:10:34 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								d21f55633d 
								
							
								 
							
						 
						
							
							
								
								Fix DMs being marked as with the current user ("me")  
							
							 
							
							... 
							
							
							
							Whilst testing various DM paths, @lukebarnard1 found that there were
many failures to add the room as a DM against the correct user. It
turned out most of the failures seen were because the user chosen
was the current user. If the user accepted an invite it would often
be marked as with themselves because we chose the sender of the
join event as the DM user.
This fix makes the DM room setting process the same for both the
inviting client and the invited client. A RoomState.members
event causes the DM room state to be set in the room, regardless
of whether we are currently `joining` (see previous impl.)
The two cases for setting a DM are:
 - this user accepting an invite with is_direct
 - this user inviting someone with is_direct
This should handle all cases for setting DM state. 
							
						 
						
							2018-02-20 14:03:43 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								fd90a8b23c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1756  from matrix-org/luke/fix-recent-ordering  
							
							 
							
							... 
							
							
							
							Make RoomListStore aware of Room.timeline events 
							
						 
						
							2018-02-20 10:17:16 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								715198dc17 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1760  from matrix-org/matthew/improve-postmessage-origin-check2  
							
							 
							
							... 
							
							
							
							improve origin check of ScalarMessaging postmessage API. 
							
						 
						
							2018-02-19 16:39:15 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
								
								
							
							
								
							
								5d1af70b96 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1759  from matrix-org/luke/feature-tag-panel-global-filter  
							
							 
							
							... 
							
							
							
							Implement global filter to deselect all tags 
							
						 
						
							2018-02-19 09:59:19 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								32130fbc28 
								
							
								 
							
						 
						
							
							
								
								Don't regenerate RoomListStore state for notifs/scrollback/etc.  
							
							 
							
							... 
							
							
							
							Only do so for the live timeline of rooms. 
							
						 
						
							2018-02-19 09:56:03 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								2d5a2a9d48 
								
							
								 
							
						 
						
							
							
								
								improve origin check of ScalarMessaging postmessage API.  
							
							 
							
							... 
							
							
							
							ensures that https://scalar.ve  can't access the API.
many thanks to @rugk for pointing out the potential vuln.
cc @rxl881 in case this bug has been transplanted elsewhere. 
							
						 
						
							2018-02-17 00:02:38 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								7a0c82a327 
								
							
								 
							
						 
						
							
							
								
								Fix click background to deselect  
							
							 
							
							
							
						 
						
							2018-02-16 18:08:29 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
								
								
							
							
								
							
								01546c7f61 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1758  from turt2live/patch-3  
							
							 
							
							... 
							
							
							
							Don't show empty custom tags when filtering tags 
							
						 
						
							2018-02-16 17:51:25 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								113fc696d8 
								
							
								 
							
						 
						
							
							
								
								Implement global filter to deselect all tags  
							
							 
							
							... 
							
							
							
							and make TagPanel scrollable whilst we're at it. 
							
						 
						
							2018-02-16 17:43:43 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								cbeee72062 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't show empty custom tags when filtering tags  
							
							 
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2018-02-16 10:11:04 -07:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								3f6c15506c 
								
							
								 
							
						 
						
							
							
								
								Remove unused `room` parameter of MatrixActions.Room.timeline  
							
							 
							
							
							
						 
						
							2018-02-16 16:17:47 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
								
								
							
							
								
							
								ad863afd6d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1757  from matrix-org/luke/fix-assumed-removed-tags  
							
							 
							
							... 
							
							
							
							Do not assume that tags have been removed 
							
						 
						
							2018-02-16 16:01:11 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								84ab1ae3e2 
								
							
								 
							
						 
						
							
							
								
								Do not assume that tags have been removed  
							
							 
							
							... 
							
							
							
							when moving tags 
							
						 
						
							2018-02-16 15:52:15 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								94a0a90457 
								
							
								 
							
						 
						
							
							
								
								Make RoomListStore aware of Room.timeline events  
							
							 
							
							... 
							
							
							
							so that we can do reorderings of lists ordered by most recent event.
No optimisations here; we only update for timeline events
on live timelines that could update the "unread count". 
							
						 
						
							2018-02-16 14:16:50 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								07b691a45d 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							 
							
							
							
						 
						
							2018-02-15 20:20:25 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
								
								
							
							
								
							
								1a880761e0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1747  from matrix-org/luke/fix-scrollbars-on-jump-to-first  
							
							 
							
							... 
							
							
							
							Change CSS class for message panel spinner 
							
						 
						
							2018-02-15 14:51:12 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								0c5b0fd52c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1752  from matrix-org/dbkr/roomliststore_unregister  
							
							 
							
							... 
							
							
							
							Remove RoomListStore listener 
							
						 
						
							2018-02-15 13:35:08 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								55dc49f4ff 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/roomliststore_unregister  
							
							 
							
							
							
						 
						
							2018-02-15 13:29:30 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								44964e80a9 
								
							
								 
							
						 
						
							
							
								
								undo unintentional commit  
							
							 
							
							
							
						 
						
							2018-02-15 11:25:40 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ceec405519 
								
							
								 
							
						 
						
							
							
								
								Remove RoomListStore listener  
							
							 
							
							... 
							
							
							
							This caused the the RoomList component to leak (although in practice
only accross logins because that's the only time it's unmounted) 
							
						 
						
							2018-02-15 11:23:00 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
								
								
							
							
								
							
								c8ccbed0b1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1751  from matrix-org/luke/dnd-group-view-tag-panel  
							
							 
							
							... 
							
							
							
							Implement GroupTile avatar dragging to TagPanel 
							
						 
						
							2018-02-15 11:05:28 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								3948ee8ca1 
								
							
								 
							
						 
						
							
							
								
								Give each GroupTile avatar its own droppable  
							
							 
							
							... 
							
							
							
							so that they can be dragged and dropped
without interacting with each other, as
they would do if GroupView contained
one droppable to contain them all. 
							
						 
						
							2018-02-14 17:53:54 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								389d96bc46 
								
							
								 
							
						 
						
							
							
								
								Use optimistic removedTagsAccountData state in TagOrderStore  
							
							 
							
							... 
							
							
							
							when receiving TagOrderActions.moveTag.pending, which now exposes
this state. 
							
						 
						
							2018-02-14 16:47:29 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								3850b552a5 
								
							
								 
							
						 
						
							
							
								
								Make GroupTile avatar draggable  
							
							 
							
							
							
						 
						
							2018-02-14 16:46:06 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								74c8a74e7d 
								
							
								 
							
						 
						
							
							
								
								Add Droppable to GroupView  
							
							 
							
							... 
							
							
							
							to contain the GroupTiles as Draggables 
							
						 
						
							2018-02-14 16:43:01 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b626420eb9 
								
							
								 
							
						 
						
							
							
								
								Move DND context to LoggedInView  
							
							 
							
							... 
							
							
							
							so that we can drag things from any part of the logged in app to
another. (Specifically GroupView and TagPanel). 
							
						 
						
							2018-02-14 16:40:58 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								db4f0cb0bf 
								
							
								 
							
						 
						
							
							
								
								Handle adding previously removed tags  
							
							 
							
							
							
						 
						
							2018-02-14 16:40:24 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								ca763faf96 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1750  from matrix-org/luke/fix-room-list-custom-tag-ordering2  
							
							 
							
							... 
							
							
							
							Fix custom tags not being ordered manually 
							
						 
						
							2018-02-14 11:40:59 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								46b8fb9a19 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1746  from matrix-org/luke/fix-room-settings-resets  
							
							 
							
							... 
							
							
							
							Store component state for editors 
							
						 
						
							2018-02-14 11:33:48 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								3020c8cd94 
								
							
								 
							
						 
						
							
							
								
								Fix custom tags not being ordered manually  
							
							 
							
							... 
							
							
							
							Actually fixes vector-im/riot-web#6135 unlike #1748 , which
incorrectly assumed that custom tags would be included in
listOrders.
This fix makes sure that the `default` case in the `switch`
is actually used. 
							
						 
						
							2018-02-14 11:23:29 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								47c232b5b3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first  
							
							 
							
							
							
						 
						
							2018-02-14 11:00:27 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								7cc82a682c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1745  from matrix-org/luke/fix-login-page-feedback  
							
							 
							
							... 
							
							
							
							Give the login page its spinner back 
							
						 
						
							2018-02-14 10:31:36 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
								
								
							
							
								
							
								c670b76ec8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1743  from matrix-org/luke/feature-tag-panel-tile-context-menu  
							
							 
							
							... 
							
							
							
							Add context menu to TagTile 
							
						 
						
							2018-02-13 17:28:43 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								a34fea8af8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu  
							
							 
							
							
							
						 
						
							2018-02-13 16:51:00 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
								
								
							
							
								
							
								e0d598fb19 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1748  from matrix-org/luke/fix-manually-ordered-custom-tagged-rooms  
							
							 
							
							... 
							
							
							
							If a tag is unrecognised, assume manual ordering 
							
						 
						
							2018-02-13 16:15:49 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								f16bc93fee 
								
							
								 
							
						 
						
							
							
								
								If a tag is unrecognised, assume manual ordering  
							
							 
							
							... 
							
							
							
							(as we did previously)
Fixes https://github.com/vector-im/riot-web/issues/6135  
							
						 
						
							2018-02-13 16:09:17 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								5af560f625 
								
							
								 
							
						 
						
							
							
								
								Make removedTags a Set for perf  
							
							 
							
							
							
						 
						
							2018-02-13 14:43:34 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								a0aa3df893 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1719  from matrix-org/luke/room-list-flux  
							
							 
							
							... 
							
							
							
							Move RoomList state to RoomListStore 
							
						 
						
							2018-02-13 14:18:46 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								36e8bf1f20 
								
							
								 
							
						 
						
							
							
								
								Change CSS class for message panel spinner  
							
							 
							
							... 
							
							
							
							to stop scrollbars appearing when we
 - jump to a message or,
 - permalink that is to an not paginated in event 
							
						 
						
							2018-02-13 14:13:47 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								8377abcd19 
								
							
								 
							
						 
						
							
							
								
								Store component state for editors  
							
							 
							
							... 
							
							
							
							to prevent a forceUpdate from /sync causing the editors to revert
before the user had a chance to hit "Save".
Part of fixing https://github.com/vector-im/riot-web/issues/6019  
							
						 
						
							2018-02-13 12:01:36 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								493116b17e 
								
							
								 
							
						 
						
							
							
								
								Give the login page its spinner back  
							
							 
							
							
							
						 
						
							2018-02-13 11:43:22 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								db0ea9eb0e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into luke/room-list-flux  
							
							 
							
							
							
						 
						
							2018-02-13 10:18:24 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								03921bad79 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1744  from matrix-org/luke/move-groups-button-tp  
							
							 
							
							... 
							
							
							
							Move groups button to TagPanel 
							
						 
						
							2018-02-13 11:00:49 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6d3634a06c 
								
							
								 
							
						 
						
							
							
								
								Move groups button to TagPanel  
							
							 
							
							
							
						 
						
							2018-02-13 09:44:00 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								322012cf88 
								
							
								 
							
						 
						
							
							
								
								Add comment to explain hacky optimism  
							
							 
							
							
							
						 
						
							2018-02-12 18:46:36 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								3eeef064bf 
								
							
								 
							
						 
						
							
							
								
								Remove unused asyncId  
							
							 
							
							
							
						 
						
							2018-02-12 18:37:54 +00:00