d72ce4da64 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into develop  
							
							... 
							
							
							
							Conflicts:
	synapse/http/client.py 
							
						 
						
							2014-09-03 18:25:17 +01:00  
				
					
						
							
							
								 
						
							
							
								a25d1530ef 
								
							
								 
							
						 
						
							
							
								
								Make registering and logging in with a threepid work in the webclient.  
							
							
							
						 
						
							2014-09-03 18:23:56 +01:00  
				
					
						
							
							
								 
						
							
							
								66a5bc4fad 
								
							
								 
							
						 
						
							
							
								
								Fix ban path  
							
							
							
						 
						
							2014-09-03 18:19:57 +01:00  
				
					
						
							
							
								 
						
							
							
								0d75b9fa96 
								
							
								 
							
						 
						
							
							
								
								Fix a few cases where we used user_id instead of state_key  
							
							
							
						 
						
							2014-09-03 18:03:10 +01:00  
				
					
						
							
							
								 
						
							
							
								5dd1a738f8 
								
							
								 
							
						 
						
							
							
								
								Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of another user  
							
							
							
						 
						
							2014-09-03 18:33:51 +02:00  
				
					
						
							
							
								 
						
							
							
								8a7c1d6a00 
								
							
								 
							
						 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.  
							
							
							
						 
						
							2014-09-03 17:31:57 +01:00  
				
					
						
							
							
								 
						
							
							
								073a42cc95 
								
							
								 
							
						 
						
							
							
								
								Add support for room names  
							
							
							
						 
						
							2014-09-03 14:41:38 +01:00  
				
					
						
							
							
								 
						
							
							
								4c7da89219 
								
							
								 
							
						 
						
							
							
								
								Do not define power level limits in setUserPowerLevel. Update the function to be used as a resetUserPowerLevel  
							
							
							
						 
						
							2014-09-03 15:20:09 +02:00  
				
					
						
							
							
								 
						
							
							
								932f35a7f0 
								
							
								 
							
						 
						
							
							
								
								Added /deop $user_id  
							
							
							
						 
						
							2014-09-03 15:20:09 +02:00  
				
					
						
							
							
								 
						
							
							
								4777c1cd5b 
								
							
								 
							
						 
						
							
							
								
								BF: Do not be polluted by ops events that come when paginating back  
							
							
							
						 
						
							2014-09-03 15:00:19 +02:00  
				
					
						
							
							
								 
						
							
							
								4b85c5f52c 
								
							
								 
							
						 
						
							
							
								
								Added /op $user_id $powerLevel  
							
							
							
						 
						
							2014-09-03 14:12:56 +02:00  
				
					
						
							
							
								 
						
							
							
								56427b8057 
								
							
								 
							
						 
						
							
							
								
								Added /ban command  
							
							
							
						 
						
							2014-09-03 11:17:58 +02:00  
				
					
						
							
							
								 
						
							
							
								d5da6b0cef 
								
							
								 
							
						 
						
							
							
								
								Handle "m.room.create" in order to inform controllers about new rooms  
							
							
							
						 
						
							2014-09-02 13:55:23 +02:00  
				
					
						
							
							
								 
						
							
							
								828101dd51 
								
							
								 
							
						 
						
							
							
								
								Represent user power level in a room by a red bar at the bottom of his avatar image. The width of this bar depends on the power level.  
							
							
							
						 
						
							2014-09-02 11:54:35 +02:00  
				
					
						
							
							
								 
						
							
							
								8fe912d95c 
								
							
								 
							
						 
						
							
							
								
								change the world: make the default matrix API URL prefix /_matrix rather than /matrix to make it easier for existing websites to mount a HS in their namespace without collisions.  
							
							... 
							
							
							
							perl -pi -e 's#/matrix#/_matrix#g' ./cmdclient/console.py ./docs/client-server/howto.rst ./docs/client-server/specification.rst ./docs/client-server/swagger_matrix/directory ./docs/client-server/swagger_matrix/events ./docs/client-server/swagger_matrix/login ./docs/client-server/swagger_matrix/presence ./docs/client-server/swagger_matrix/profile ./docs/client-server/swagger_matrix/registration ./docs/client-server/swagger_matrix/rooms ./docs/server-server/specification.rst ./graph/graph.py ./jsfiddles/create_room_send_msg/demo.js ./jsfiddles/event_stream/demo.js ./jsfiddles/example_app/demo.js ./jsfiddles/register_login/demo.js ./jsfiddles/room_memberships/demo.js ./synapse/api/urls.py ./tests/federation/test_federation.py ./tests/handlers/test_presence.py ./tests/handlers/test_typing.py ./tests/rest/test_events.py ./tests/rest/test_presence.py ./tests/rest/test_profile.py ./tests/rest/test_rooms.py ./webclient/components/fileUpload/file-upload-service.js ./webclient/components/matrix/matrix-service.js 
							
						 
						
							2014-08-31 14:51:37 +01:00  
				
					
						
							
							
								 
						
							
							
								1bc036a12d 
								
							
								 
							
						 
						
							
							
								
								nasty big monolithic commit of a whole bunch of UI/UX improvements:  
							
							... 
							
							
							
							- add a simple CSS template across the app for navigation & cosmetics
 - split login into login & register, and totally reskin it
 - restructure room CSS to play nicely with it
 - implement basis 1:1 chat from user pages
 - disable autofocus on iOS to improve UX 
							
						 
						
							2014-08-31 00:40:42 +01:00  
				
					
						
							
							
								 
						
							
							
								490f142d73 
								
							
								 
							
						 
						
							
							
								
								Give basic feedback on the state of VoIP calls in the UI.  
							
							
							
						 
						
							2014-08-29 18:01:01 +01:00  
				
					
						
							
							
								 
						
							
							
								0ef54caa28 
								
							
								 
							
						 
						
							
							
								
								better support for call hangups  
							
							
							
						 
						
							2014-08-29 15:18:57 +01:00  
				
					
						
							
							
								 
						
							
							
								7c4b47652e 
								
							
								 
							
						 
						
							
							
								
								The away state is unavailable not offline  
							
							
							
						 
						
							2014-08-29 15:33:02 +02:00  
				
					
						
							
							
								 
						
							
							
								073bec4830 
								
							
								 
							
						 
						
							
							
								
								Oops, forgot a s/sendObject/sendEvent/ - make messages work again!  
							
							
							
						 
						
							2014-08-29 13:45:15 +01:00  
				
					
						
							
							
								 
						
							
							
								cc413be446 
								
							
								 
							
						 
						
							
							
								
								Don't break if the call ends before it connects  
							
							
							
						 
						
							2014-08-29 13:28:39 +01:00  
				
					
						
							
							
								 
						
							
							
								5308e3026a 
								
							
								 
							
						 
						
							
							
								
								Change call signalling messages to be their own types of room events rather than room messages with different msgtypes: room messages should be things that the client can display as a unit message to the user.  
							
							
							
						 
						
							2014-08-29 13:23:01 +01:00  
				
					
						
							
							
								 
						
							
							
								171d8b032f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'voip' into develop  
							
							... 
							
							
							
							Conflicts:
	webclient/room/room-controller.js 
							
						 
						
							2014-08-29 11:33:36 +01:00  
				
					
						
							
							
								 
						
							
							
								41d02ab674 
								
							
								 
							
						 
						
							
							
								
								More basic functionality for voip calls (like hanging up)  
							
							
							
						 
						
							2014-08-29 11:29:36 +01:00  
				
					
						
							
							
								 
						
							
							
								ee079cd250 
								
							
								 
							
						 
						
							
							
								
								Added a timeout(40s) to $http stream requests (/events) in order to be notified by an error when there is a network issue. Thus, we can retry with a new request.  
							
							
							
						 
						
							2014-08-29 11:32:06 +02:00  
				
					
						
							
							
								 
						
							
							
								246b2a3c3e 
								
							
								 
							
						 
						
							
							
								
								Renamed matrixService.assignRoomAliases into getRoomAliasAndDisplayName  
							
							
							
						 
						
							2014-08-29 09:32:09 +02:00  
				
					
						
							
							
								 
						
							
							
								ca7426eee0 
								
							
								 
							
						 
						
							
							
								
								First basic working VoIP call support  
							
							
							
						 
						
							2014-08-28 19:03:34 +01:00  
				
					
						
							
							
								 
						
							
							
								7c99ebdbd1 
								
							
								 
							
						 
						
							
							
								
								Added waitForInitialSyncCompletion so that clients can know when they can access to the data retrieved by the initialSync Request  
							
							
							
						 
						
							2014-08-28 16:23:30 +02:00  
				
					
						
							
							
								 
						
							
							
								06c79a23d4 
								
							
								 
							
						 
						
							
							
								
								BF: Made member events parsing work (handleEvents expects an array of events)  
							
							
							
						 
						
							2014-08-28 16:23:30 +02:00  
				
					
						
							
							
								 
						
							
							
								7d34a1c108 
								
							
								 
							
						 
						
							
							
								
								WIP voip support on web client  
							
							
							
						 
						
							2014-08-27 18:57:54 +01:00  
				
					
						
							
							
								 
						
							
							
								c67cac134f 
								
							
								 
							
						 
						
							
							
								
								Moved assignRoomAliases into a central piece: matrixService for now  
							
							
							
						 
						
							2014-08-27 15:55:51 +02:00  
				
					
						
							
							
								 
						
							
							
								e40d829363 
								
							
								 
							
						 
						
							
							
								
								Support limit and feedback param of initialSync  
							
							
							
						 
						
							2014-08-27 15:55:51 +02:00  
				
					
						
							
							
								 
						
							
							
								c585c87c4b 
								
							
								 
							
						 
						
							
							
								
								Renamed /ds to /directory  
							
							
							
						 
						
							2014-08-27 14:54:29 +01:00  
				
					
						
							
							
								 
						
							
							
								1d9d287c7c 
								
							
								 
							
						 
						
							
							
								
								Renamed /public/rooms to /publicRooms  
							
							
							
						 
						
							2014-08-27 14:52:07 +01:00  
				
					
						
							
							
								 
						
							
							
								474d913712 
								
							
								 
							
						 
						
							
							
								
								fix joining rooms on webclient  
							
							
							
						 
						
							2014-08-27 13:59:14 +01:00  
				
					
						
							
							
								 
						
							
							
								dd661769e1 
								
							
								 
							
						 
						
							
							
								
								Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and removed tests which tested that. Updated cmdclient and webclient.  
							
							
							
						 
						
							2014-08-27 11:33:56 +01:00  
				
					
						
							
							
								 
						
							
							
								5a93bfe1f0 
								
							
								 
							
						 
						
							
							
								
								Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmdclient, tests and webclient. All appears to work.  
							
							
							
						 
						
							2014-08-26 17:21:48 +01:00  
				
					
						
							
							
								 
						
							
							
								2e70de09b9 
								
							
								 
							
						 
						
							
							
								
								Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient.  
							
							
							
						 
						
							2014-08-26 16:19:17 +01:00  
				
					
						
							
							
								 
						
							
							
								c21fcb3373 
								
							
								 
							
						 
						
							
							
								
								Determine and send user presence state  
							
							
							
						 
						
							2014-08-26 16:25:27 +02:00  
				
					
						
							
							
								 
						
							
							
								9ff9caeb74 
								
							
								 
							
						 
						
							
							
								
								webclient: Updated to use /rooms/$roomid/[invite|join|leave]  
							
							
							
						 
						
							2014-08-26 14:59:31 +01:00  
				
					
						
							
							
								 
						
							
							
								5796232cb1 
								
							
								 
							
						 
						
							
							
								
								Adjusted webclient to use new state paths. Updated membership msg template to actually show the person invited. Factored out common membership functions in matrix service.  
							
							
							
						 
						
							2014-08-26 10:24:47 +01:00  
				
					
						
							
							
								 
						
							
							
								239622f80b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1  
							
							
							
						 
						
							2014-08-22 15:48:09 +01:00  
				
					
						
							
							
								 
						
							
							
								6118a102c1 
								
							
								 
							
						 
						
							
							
								
								Keep track of people's presence and query that when we update the members list.  
							
							
							
						 
						
							2014-08-22 10:51:00 +01:00  
				
					
						
							
							
								 
						
							
							
								74c90f7815 
								
							
								 
							
						 
						
							
							
								
								Reinitialize room when creating a RoomController so that we start off with a clean slate, as it expects/  
							
							
							
						 
						
							2014-08-22 10:51:00 +01:00  
				
					
						
							
							
								 
						
							
							
								3c349b408b 
								
							
								 
							
						 
						
							
							
								
								Update web client to use new IS API.  
							
							
							
						 
						
							2014-08-22 11:34:27 +02:00  
				
					
						
							
							
								 
						
							
							
								acf5127604 
								
							
								 
							
						 
						
							
							
								
								Make the content repo work with in daemon mode. Return the full url on upload. Update the webclient to use new content repo api.  
							
							
							
						 
						
							2014-08-22 10:25:32 +01:00  
				
					
						
							
							
								 
						
							
							
								53f4fbd99a 
								
							
								 
							
						 
						
							
							
								
								resizeImage: generate an image in the format of the original image. (Tested with tranparent PNG, transparent GIF, BMP, JPEG)  
							
							
							
						 
						
							2014-08-22 10:48:00 +02:00  
				
					
						
							
							
								 
						
							
							
								c8d0c4762d 
								
							
								 
							
						 
						
							
							
								
								Safari needs the img.onload event before actually working on the img  
							
							
							
						 
						
							2014-08-22 10:15:15 +02:00  
				
					
						
							
							
								 
						
							
							
								3277a65052 
								
							
								 
							
						 
						
							
							
								
								actually display room metadata based on m.room.membe events  
							
							
							
						 
						
							2014-08-21 19:02:00 +01:00  
				
					
						
							
							
								 
						
							
							
								2e1ab9db08 
								
							
								 
							
						 
						
							
							
								
								Only start event streaming after having set up the controllers.  
							
							
							
						 
						
							2014-08-21 17:55:41 +01:00