bfa4cda2c6 
								
							
								 
							
						 
						
							
							
								
								build is no longer used  
							
							
							
						 
						
							2015-09-23 10:14:38 +01:00  
				
					
						
							
							
								 
						
							
							
								c21dd853f9 
								
							
								 
							
						 
						
							
							
								
								Update package.json for renamed skin  
							
							
							
						 
						
							2015-09-23 09:48:18 +01:00  
				
					
						
							
							
								 
						
							
							
								b11abae8e8 
								
							
								 
							
						 
						
							
							
								
								More fixing up of paths, requires etc  
							
							
							
						 
						
							2015-09-22 19:09:23 +01:00  
				
					
						
							
							
								 
						
							
							
								7e72ee891a 
								
							
								 
							
						 
						
							
							
								
								More fixing up of vector skin  
							
							
							
						 
						
							2015-09-22 18:49:04 +01:00  
				
					
						
							
							
								 
						
							
							
								40594fc5fa 
								
							
								 
							
						 
						
							
							
								
								Fix up controller requires  
							
							
							
						 
						
							2015-09-22 18:17:19 +01:00  
				
					
						
							
							
								 
						
							
							
								dd4cfb25f8 
								
							
								 
							
						 
						
							
							
								
								Replace symlinks  
							
							
							
						 
						
							2015-09-22 18:06:43 +01:00  
				
					
						
							
							
								 
						
							
							
								148dbc23ed 
								
							
								 
							
						 
						
							
							
								
								Rename base skin to vector  
							
							
							
						 
						
							2015-09-22 18:05:55 +01:00  
				
					
						
							
							
								 
						
							
							
								682392d02a 
								
							
								 
							
						 
						
							
							
								
								Move skins dir to src  
							
							
							
						 
						
							2015-09-22 18:05:31 +01:00  
				
					
						
							
							
								 
						
							
							
								09b81f46b0 
								
							
								 
							
						 
						
							
							
								
								Remove controllers that all come from react-sdk  
							
							
							
						 
						
							2015-09-22 17:20:22 +01:00  
				
					
						
							
							
								 
						
							
							
								2f0df6d37e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into reactsdk-unfork  
							
							
							
						 
						
							2015-09-22 15:28:50 +01:00  
				
					
						
							
							
								 
						
							
							
								616b4fe0f1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #175  from vector-im/matthew/userlist  
							
							... 
							
							
							
							Reskin the userlist as per the design 
							
						 
						
							2015-09-22 15:27:21 +01:00  
				
					
						
							
							
								 
						
							
							
								ef3603cd1a 
								
							
								 
							
						 
						
							
							
								
								oops, rogue debugging stmt  
							
							
							
						 
						
							2015-09-22 01:25:58 +02:00  
				
					
						
							
							
								 
						
							
							
								61c94d63e7 
								
							
								 
							
						 
						
							
							
								
								make the new userlist UI actually work  
							
							
							
						 
						
							2015-09-22 01:16:45 +02:00  
				
					
						
							
							
								 
						
							
							
								260e22186b 
								
							
								 
							
						 
						
							
							
								
								WIP at turning MemberInfo into a ContextualMenu  
							
							
							
						 
						
							2015-09-21 19:23:04 +02:00  
				
					
						
							
							
								 
						
							
							
								048260bb1b 
								
							
								 
							
						 
						
							
							
								
								WIP at turning MemberInfo into a ContextualMenu  
							
							
							
						 
						
							2015-09-21 19:22:29 +02:00  
				
					
						
							
							
								 
						
							
							
								a545007a19 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into reactsdk-unfork  
							
							
							
						 
						
							2015-09-21 18:08:58 +01:00  
				
					
						
							
							
								 
						
							
							
								56c5f6f46e 
								
							
								 
							
						 
						
							
							
								
								clarify deployment  
							
							
							
						 
						
							2015-09-19 20:17:45 +01:00  
				
					
						
							
							
								 
						
							
							
								81db1b2360 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #160  from vector-im/conferencing  
							
							... 
							
							
							
							Add conferencing support 
							
						 
						
							2015-09-18 10:03:02 +01:00  
				
					
						
							
							
								 
						
							
							
								240d5502fe 
								
							
								 
							
						 
						
							
							
								
								Add a FIXME explaining the situation around alternative FS ASes  
							
							
							
						 
						
							2015-09-17 11:47:42 +01:00  
				
					
						
							
							
								 
						
							
							
								7a50166dc6 
								
							
								 
							
						 
						
							
							
								
								Move the 'thumbnail' video to the top-left of the screen  
							
							... 
							
							
							
							This was originally laid out at the MatrixChat level which could then be
CSSified, but Matthew suggests this looks a lot better being at the
RoomList level above recents. Move the rendering logic to RoomList. 
							
						 
						
							2015-09-17 11:37:56 +01:00  
				
					
						
							
							
								 
						
							
							
								9c8b540d14 
								
							
								 
							
						 
						
							
							
								
								Actually add the doc  
							
							
							
						 
						
							2015-09-17 11:06:50 +01:00  
				
					
						
							
							
								 
						
							
							
								e991beb900 
								
							
								 
							
						 
						
							
							
								
								Add conferencing doc  
							
							
							
						 
						
							2015-09-17 11:06:08 +01:00  
				
					
						
							
							
								 
						
							
							
								f1120562f3 
								
							
								 
							
						 
						
							
							
								
								Random console log  
							
							
							
						 
						
							2015-09-16 14:14:21 +01:00  
				
					
						
							
							
								 
						
							
							
								901574b56e 
								
							
								 
							
						 
						
							
							
								
								Update package.json  
							
							
							
						 
						
							2015-09-16 14:13:16 +01:00  
				
					
						
							
							
								 
						
							
							
								fe586f6a36 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into reactsdk-unfork  
							
							
							
						 
						
							2015-09-16 10:49:04 +01:00  
				
					
						
							
							
								 
						
							
							
								01d3f2f119 
								
							
								 
							
						 
						
							
							
								
								implement /part, /j, and error rather than pass-through unrecognised commands  
							
							
							
						 
						
							2015-09-16 01:09:32 +01:00  
				
					
						
							
							
								 
						
							
							
								0aec086ebb 
								
							
								 
							
						 
						
							
							
								
								actually link to blog etc from the login page  
							
							
							
						 
						
							2015-09-15 17:06:04 +01:00  
				
					
						
							
							
								 
						
							
							
								f89fbffe89 
								
							
								 
							
						 
						
							
							
								
								Auto-place a video call if the conf notification is clicked  
							
							
							
						 
						
							2015-09-15 15:55:02 +01:00  
				
					
						
							
							
								 
						
							
							
								2b65b4c2dc 
								
							
								 
							
						 
						
							
							
								
								Hide the local video when in a conf call  
							
							
							
						 
						
							2015-09-15 15:49:33 +01:00  
				
					
						
							
							
								 
						
							
							
								ce2632bbe6 
								
							
								 
							
						 
						
							
							
								
								thinko  
							
							
							
						 
						
							2015-09-15 15:18:39 +01:00  
				
					
						
							
							
								 
						
							
							
								370310bf82 
								
							
								 
							
						 
						
							
							
								
								Use better variable names  
							
							
							
						 
						
							2015-09-15 15:02:02 +01:00  
				
					
						
							
							
								 
						
							
							
								f384aa7d9e 
								
							
								 
							
						 
						
							
							
								
								Add notification to group chat rooms with ongoing conf calls  
							
							... 
							
							
							
							This notification disappears when in the conf call / when the call is over.
CSS stolen from the desktop notification bar. 
							
						 
						
							2015-09-15 14:18:17 +01:00  
				
					
						
							
							
								 
						
							
							
								353269370f 
								
							
								 
							
						 
						
							
							
								
								Wire up the "room" CallView for conferencing  
							
							... 
							
							
							
							This also separates out concerns better - UI elements just need to poke
getCallForRoom rather than care if the thing they are displaying is a
true 1:1 for this room ID or actually a conf room. 
							
						 
						
							2015-09-15 13:19:07 +01:00  
				
					
						
							
							
								 
						
							
							
								7866979c79 
								
							
								 
							
						 
						
							
							
								
								Show/hide the Hangup button depending on the state of the conf call.  
							
							
							
						 
						
							2015-09-15 13:04:09 +01:00  
				
					
						
							
							
								 
						
							
							
								5e3698de64 
								
							
								 
							
						 
						
							
							
								
								Actually enforce 1 call semantics.  
							
							
							
						 
						
							2015-09-15 11:43:51 +01:00  
				
					
						
							
							
								 
						
							
							
								59986d8b72 
								
							
								 
							
						 
						
							
							
								
								Pass the call around different CallViews to keep media flowing  
							
							... 
							
							
							
							Previously, the CallView was attached to the RoomView, so you would get
a new CallView each time you changed the room and the one you changed
from would be destroyed. This would destroy media capture/playback as
the element was no longer in the DOM.
This is now fixed by having a "global" CallView which is attached at
the MatrixChat "page" level in the DOM hierarchy. This CallView isn't
scoped to a particular room; it will render any "active" call it can
find that *isn't the current room being displayed*. This has the side
effect of enforcing 1 call per app semantics as only the first active
call found is returned.
This fixes https://github.com/vector-im/vector-web/issues/31 
This is unfinished (CSS for the global call view isn't done) 
							
						 
						
							2015-09-15 11:05:53 +01:00  
				
					
						
							
							
								 
						
							
							
								fc892b3580 
								
							
								 
							
						 
						
							
							
								
								Hide 1:1 conference rooms  
							
							
							
						 
						
							2015-09-11 16:55:48 +01:00  
				
					
						
							
							
								 
						
							
							
								e3b02a295c 
								
							
								 
							
						 
						
							
							
								
								Check conf user/rooms a bit more efficiently  
							
							
							
						 
						
							2015-09-11 16:14:30 +01:00  
				
					
						
							
							
								 
						
							
							
								77401e215e 
								
							
								 
							
						 
						
							
							
								
								First working outbound conference calling  
							
							... 
							
							
							
							This has a number of failings currently: 1) It needs to hide the 1:1 conference
room, 2) Swapping tabs on the outbound call mutes audio (this just seems to be
a vector bug since I can repro this on a normal 1:1 voip call), 3) Needs a big
plinth/etc to say the conf call is in progress. 
							
						 
						
							2015-09-11 15:49:47 +01:00  
				
					
						
							
							
								 
						
							
							
								ce9fcdbbb5 
								
							
								 
							
						 
						
							
							
								
								Old, useless README from the trivial react-sdk example  
							
							
							
						 
						
							2015-09-08 17:06:19 +01:00  
				
					
						
							
							
								 
						
							
							
								980c71076e 
								
							
								 
							
						 
						
							
							
								
								Start moving back to basing off react sdk: move vector out of examples dir  
							
							
							
						 
						
							2015-09-08 17:02:24 +01:00  
				
					
						
							
							
								 
						
							
							
								ee4da24b84 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #148  from vector-im/matthew/login  
							
							... 
							
							
							
							Fix up various login bugs and nastinesses 
							
						 
						
							2015-09-07 10:47:25 +01:00  
				
					
						
							
							
								 
						
							
							
								737fc74756 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'matthew/login' into matthew/userlist  
							
							
							
						 
						
							2015-09-01 02:13:52 +03:00  
				
					
						
							
							
								 
						
							
							
								027ab6ee99 
								
							
								 
							
						 
						
							
							
								
								fix login layout on tall screens; limit dialog box width; wait a full second to re-query new HS details  
							
							
							
						 
						
							2015-09-01 01:55:13 +03:00  
				
					
						
							
							
								 
						
							
							
								8214ee8fad 
								
							
								 
							
						 
						
							
							
								
								fix blinking when toggling advanced  
							
							
							
						 
						
							2015-09-01 01:35:47 +03:00  
				
					
						
							
							
								 
						
							
							
								ab068cc372 
								
							
								 
							
						 
						
							
							
								
								improve login, including checkbox fix for advanced options, rechecking when you change server, avoiding flickering when you change HS, better error/spinner layout, and trimming whitespace  
							
							
							
						 
						
							2015-08-31 19:30:24 +01:00  
				
					
						
							
							
								 
						
							
							
								5bab440a1f 
								
							
								 
							
						 
						
							
							
								
								temporarily pin flux to 2.0, as 2.1 switches to ES6 and Babel which breaks our Dispatcher.js which fails to correctly extend the new Flux dispatcher, presumably due to using our noddy extend.js rather than an ES6-compatible one  
							
							
							
						 
						
							2015-08-29 20:28:07 +01:00  
				
					
						
							
							
								 
						
							
							
								ef027706b9 
								
							
								 
							
						 
						
							
							
								
								Offer to join a room if you're not in it  
							
							
							
						 
						
							2015-08-20 16:47:25 +01:00  
				
					
						
							
							
								 
						
							
							
								2351ad997c 
								
							
								 
							
						 
						
							
							
								
								More places where we assumed sender would not be null  
							
							
							
						 
						
							2015-08-20 11:46:54 +01:00  
				
					
						
							
							
								 
						
							
							
								cb25740961 
								
							
								 
							
						 
						
							
							
								
								Fix exception when accepting room invites  
							
							
							
						 
						
							2015-08-20 11:43:08 +01:00