f1db564506 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1533  from anoadragon453/develop  
							
							... 
							
							
							
							Remember whether widget drawer was hidden per-room 
							
						 
						
							2017-11-06 14:29:25 +00:00  
				
					
						
							
							
								 
						
							
							
								4953d4de4d 
								
							
								 
							
						 
						
							
							
								
								Give autocomplete providers the room they're in  
							
							... 
							
							
							
							Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider. 
							
						 
						
							2017-11-02 17:51:08 +00:00  
				
					
						
							
							
								 
						
							
							
								b4868a6846 
								
									
								
							
								 
							
						 
						
							
							
								
								showWidget->hideWidgetDrawer and remove logs  
							
							... 
							
							
							
							Signed-off-by: Andrew (anoa) <anoa@openmailbox.org> 
							
						 
						
							2017-10-26 11:27:58 -07:00  
				
					
						
							
							
								 
						
							
							
								b1f2a6c1e9 
								
							
								 
							
						 
						
							
							
								
								Dramatically simplify use of mx_fadable  
							
							... 
							
							
							
							by applying it to parent elements of things that need to be faded. 
							
						 
						
							2017-10-25 15:15:49 +01:00  
				
					
						
							
							
								 
						
							
							
								2f8f2ce76e 
								
							
								 
							
						 
						
							
							
								
								Swap from `ui_opacity` to `panel_disabled`  
							
							... 
							
							
							
							to simplify the process of disabling panels in the UI. 
							
						 
						
							2017-10-25 11:23:51 +01:00  
				
					
						
							
							
								 
						
							
							
								f032284eff 
								
									
								
							
								 
							
						 
						
							
							
								
								Remember whether widget drawer was hidden per-room  
							
							... 
							
							
							
							Fixes  #4850 
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org> 
						
							2017-10-24 16:28:10 -07:00  
				
					
						
							
							
								 
						
							
							
								c34b55c6c7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/pinned_messages  
							
							
							
						 
						
							2017-10-14 16:10:32 -06:00  
				
					
						
							
							
								 
						
							
							
								9f64261707 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/alone_warning  
							
							
							
						 
						
							2017-10-14 22:43:36 +01:00  
				
					
						
							
							
								 
						
							
							
								df7f1b46bf 
								
							
								 
							
						 
						
							
							
								
								Stop peeking if anything went wrong, not just explicit failure  
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-10-12 07:24:20 -06:00  
				
					
						
							
							
								 
						
							
							
								f1032bb115 
								
							
								 
							
						 
						
							
							
								
								Set isPeeking to false if peeking failed  
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-10-12 07:05:09 -06:00  
				
					
						
							
							
								 
						
							
							
								f3b1baa3c0 
								
							
								 
							
						 
						
							
							
								
								Suggest to invite people when speaking in an empty room  
							
							... 
							
							
							
							Adds vector-im/riot-web#1053 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-10-11 21:15:00 -06:00  
				
					
						
							
							
								 
						
							
							
								6ce7eb952a 
								
							
								 
							
						 
						
							
							
								
								Don't send RR or RM when peeking at a room  
							
							... 
							
							
							
							Fixes  vector-im/riot-web#696 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
						
							2017-10-11 18:43:24 -06:00  
				
					
						
							
							
								 
						
							
							
								e0e5d51451 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1460  from matrix-org/dbkr/show_send_message_error  
							
							... 
							
							
							
							Show failures when sending messages 
							
						 
						
							2017-10-11 19:46:32 +02:00  
				
					
						
							
							
								 
						
							
							
								d3f9a3aeb5 
								
							
								 
							
						 
						
							
							
								
								Run eslint --fix  
							
							... 
							
							
							
							Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase. 
							
						 
						
							2017-10-11 17:56:17 +01:00  
				
					
						
							
							
								 
						
							
							
								5626c06b3c 
								
							
								 
							
						 
						
							
							
								
								Show failures when sending messages  
							
							... 
							
							
							
							This is useful for the spam checking where otherwise you don't
really know why your message has failed to send 
							
						 
						
							2017-10-11 17:42:54 +01:00  
				
					
						
							
							
								 
						
							
							
								f71e07670d 
								
							
								 
							
						 
						
							
							
								
								Send toggle handler for the cancel button in the pinned events pane  
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-09-29 08:56:21 -06:00  
				
					
						
							
							
								 
						
							
							
								874d383a8f 
								
							
								 
							
						 
						
							
							
								
								Add dock for pinned messages at the top of the room  
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-09-29 08:56:21 -06:00  
				
					
						
							
							
								 
						
							
							
								c265ec9571 
								
							
								 
							
						 
						
							
							
								
								Fix RoomView stuck in 'accept invite' state  
							
							... 
							
							
							
							After accepting a 3pid invite.
Rather than clear the joining flag when the join request completes,
leave it so the RoomView can see that we're expecting the user to
be joined in the various stages that might go through (waiting for
join request, waiting for room object, waiting for 'joined' member
event). The problem in this case was that we had to wait a bit for
the last one, and there was no bit of state to represent it.
This hopefully also makes the logic somewhat simpler.
Fixes https://github.com/vector-im/riot-web/issues/5041  
							
						 
						
							2017-09-15 15:07:09 +01:00  
				
					
						
							
							
								 
						
							
							
								6cb98d7196 
								
							
								 
							
						 
						
							
							
								
								Hopefully make comment clearer  
							
							
							
						 
						
							2017-09-11 18:39:30 +01:00  
				
					
						
							
							
								 
						
							
							
								531fc3ac54 
								
							
								 
							
						 
						
							
							
								
								Fix 'Failed to load timeline position' regression  
							
							... 
							
							
							
							Ignore the update that comes in from the RoomViewStore when the
current room changes or we save our scoll state against the new
room rather than the old one.
Fixes https://github.com/vector-im/riot-web/issues/5010  
							
						 
						
							2017-09-11 17:57:52 +01:00  
				
					
						
							
							
								 
						
							
							
								aee2f3cdef 
								
							
								 
							
						 
						
							
							
								
								Rename onHaveRoom  
							
							... 
							
							
							
							And move some code out of it which didn't really have any reason
to be hanging out there rather than just be where we set the room
a few lines above. 
							
						 
						
							2017-09-08 18:11:13 +01:00  
				
					
						
							
							
								 
						
							
							
								bf982004f6 
								
							
								 
							
						 
						
							
							
								
								Give onHaveRoom the info it needs explicitly  
							
							... 
							
							
							
							Rather than giving it a state object which is not actually the
whole state but happens to be everything it actually wants
(currently) 
							
						 
						
							2017-09-08 17:56:53 +01:00  
				
					
						
							
							
								 
						
							
							
								03dcded72f 
								
							
								 
							
						 
						
							
							
								
								Blank line to make comment clearer  
							
							
							
						 
						
							2017-09-08 17:39:10 +01:00  
				
					
						
							
							
								 
						
							
							
								1be35a77ec 
								
							
								 
							
						 
						
							
							
								
								Don't wait for setState to run onHaveRoom  
							
							... 
							
							
							
							onHaveRoom sets some more state (among other things) so putting it
in the setState callback so it could observe the new state caused
us to have to re-render again unnecessarily. Just give it the new
state as a parameter. 
							
						 
						
							2017-09-08 17:06:46 +01:00  
				
					
						
							
							
								 
						
							
							
								59c54d3756 
								
							
								 
							
						 
						
							
							
								
								Remove redundant code  
							
							
							
						 
						
							2017-09-08 13:39:22 +01:00  
				
					
						
							
							
								 
						
							
							
								82d1afcc47 
								
							
								 
							
						 
						
							
							
								
								Correct comment  
							
							
							
						 
						
							2017-09-07 17:16:32 +01:00  
				
					
						
							
							
								 
						
							
							
								408b8c18ea 
								
							
								 
							
						 
						
							
							
								
								Introduce a RoomScrollStateStore  
							
							... 
							
							
							
							to keep the place we're scrolled to in rooms. This mainly eleimates
the extra, superfluous onRoomViewStoreUpdate callback that
happened when the previous room saved back its scroll state.
Moving the scroll state to a separate store means we can have this
not emit events because nothing needs to know when the scroll state
changes. 
							
						 
						
							2017-09-07 17:08:36 +01:00  
				
					
						
							
							
								 
						
							
							
								32b33c66b9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1346  from matrix-org/t3chguy/shouldHideEvent_RoomStatusBar  
							
							... 
							
							
							
							apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar 
							
						 
						
							2017-08-30 13:58:40 +01:00  
				
					
						
							
							
								 
						
							
							
								05c232c8c3 
								
									
								
							
								 
							
						 
						
							
							
								
								revert fancy indents  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-08-30 13:32:07 +01:00  
				
					
						
							
							
								 
						
							
							
								282618d5a1 
								
									
								
							
								 
							
						 
						
							
							
								
								separate concepts of showing and managing RRs to fix regression  
							
							
							
						 
						
							2017-08-30 13:18:14 +01:00  
				
					
						
							
							
								 
						
							
							
								315f7a3ae7 
								
									
								
							
								 
							
						 
						
							
							
								
								apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar  
							
							... 
							
							
							
							prevents N new message(s) when a hidden message comes in. 
							
						 
						
							2017-08-28 13:46:09 +01:00  
				
					
						
							
							
								 
						
							
							
								56ea528f43 
								
									
								
							
								 
							
						 
						
							
							
								
								don't track error messages .2  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-08-10 15:17:52 +01:00  
				
					
						
							
							
								 
						
							
							
								24599ace32 
								
									
								
							
								 
							
						 
						
							
							
								
								don't track error messages  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-08-10 13:49:11 +01:00  
				
					
						
							
							
								 
						
							
							
								bf98c0da7c 
								
									
								
							
								 
							
						 
						
							
							
								
								un-i18n Modal Analytics  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-07-27 17:19:18 +01:00  
				
					
						
							
							
								 
						
							
							
								086304532e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1213  from matrix-org/rav/bluebird  
							
							... 
							
							
							
							Switch matrix-react-sdk to bluebird 
							
						 
						
							2017-07-13 12:06:11 +01:00  
				
					
						
							
							
								 
						
							
							
								04dd98e6e9 
								
							
								 
							
						 
						
							
							
								
								Remove references to tabComplete, which are now redundant  
							
							... 
							
							
							
							(since the old composer has been removed) 
							
						 
						
							2017-07-13 10:16:59 +01:00  
				
					
						
							
							
								 
						
							
							
								0254d2b3a2 
								
							
								 
							
						 
						
							
							
								
								q(...) -> Promise.resolve  
							
							... 
							
							
							
							```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
``` 
							
						 
						
							2017-07-12 18:05:08 +01:00  
				
					
						
							
							
								 
						
							
							
								a06bd84213 
								
							
								 
							
						 
						
							
							
								
								replace imports of `q` with bluebird  
							
							... 
							
							
							
							update `package.json`
```
find src test -name '*.js' |
   xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
find src test -name '*.js' |
   xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
``` 
							
						 
						
							2017-07-12 18:05:08 +01:00  
				
					
						
							
							
								 
						
							
							
								53316a76f4 
								
							
								 
							
						 
						
							
							
								
								Sandbox app iframes  
							
							
							
						 
						
							2017-07-12 10:22:14 +01:00  
				
					
						
							
							
								 
						
							
							
								cf158530f5 
								
							
								 
							
						 
						
							
							
								
								Implement new widget API ( #1201 )  
							
							... 
							
							
							
							* Implement new widget API
This allows clients to see who provisioned which widgets.
* Update to make state_key the wid
* Update to latest API
* Only show widgets which have required fields
* Don't constantly show apps dialog
* Fix example to include data key 
							
						 
						
							2017-07-11 12:15:27 +01:00  
				
					
						
							
							
								 
						
							
							
								ff1636aaf5 
								
							
								 
							
						 
						
							
							
								
								Simplify boolean assignment.  
							
							
							
						 
						
							2017-06-28 12:21:05 +01:00  
				
					
						
							
							
								 
						
							
							
								06dafdc099 
								
							
								 
							
						 
						
							
							
								
								Remove unused state variable.  
							
							
							
						 
						
							2017-06-28 12:20:07 +01:00  
				
					
						
							
							
								 
						
							
							
								bf2a4afce5 
								
							
								 
							
						 
						
							
							
								
								Change to allow setting of DEBUG at run-time.  
							
							
							
						 
						
							2017-06-28 12:02:07 +01:00  
				
					
						
							
							
								 
						
							
							
								8dfd047f03 
								
							
								 
							
						 
						
							
							
								
								Don't show widgets when editing room settings and lint fixes.  
							
							
							
						 
						
							2017-06-27 17:39:29 +01:00  
				
					
						
							
							
								 
						
							
							
								ad9a3d9ddc 
								
							
								 
							
						 
						
							
							
								
								Remove unused case statement.  
							
							
							
						 
						
							2017-06-27 11:55:32 +01:00  
				
					
						
							
							
								 
						
							
							
								89f051e693 
								
							
								 
							
						 
						
							
							
								
								Fix automerge error.  
							
							
							
						 
						
							2017-06-27 11:52:49 +01:00  
				
					
						
							
							
								 
						
							
							
								ddc0da396d 
								
							
								 
							
						 
						
							
							
								
								Merge in changes from develop  
							
							
							
						 
						
							2017-06-27 11:44:36 +01:00  
				
					
						
							
							
								 
						
							
							
								ddb84f034e 
								
							
								 
							
						 
						
							
							
								
								Update tab-complete state onRoom received after joining  
							
							... 
							
							
							
							As opposed to doing it when the component mounts.
Fixes https://github.com/vector-im/riot-web/issues/3700  (hopefully) 
							
						 
						
							2017-06-23 17:52:50 +01:00  
				
					
						
							
							
								 
						
							
							
								87609582c6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into rte-fixes2  
							
							... 
							
							
							
							Conflicts:
	package.json
	src/autocomplete/CommandProvider.js
	src/autocomplete/UserProvider.js
	src/components/structures/RoomView.js
	src/components/structures/UserSettings.js
	src/components/views/rooms/MessageComposerInput.js 
							
						 
						
							2017-06-23 15:30:06 +01:00  
				
					
						
							
							
								 
						
							
							
								032650e095 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/fix_forwarding  
							
							
							
						 
						
							2017-06-19 01:53:35 +01:00