Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								7c89d5e97a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into develop
							
							
							
							
							
						 | 
						
							2014-08-27 17:05:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								f64887e15c
								
							
								
							
						 | 
						
							
							
								
								Added RestServlet for /rooms/$roomid/initialSync
							
							
							
							
							
						 | 
						
							2014-08-27 16:49:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								4e8d19ee2b
								
							
								
							
						 | 
						
							
							
								
								Added RestServlet for /rooms/$roomid/state
							
							
							
							
							
						 | 
						
							2014-08-27 16:42:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								08881d808d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
							
							
							
							
							
						 | 
						
							2014-08-27 15:34:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								1d9d287c7c
								
							
								
							
						 | 
						
							
							
								
								Renamed /public/rooms to /publicRooms
							
							
							
							
							
						 | 
						
							2014-08-27 14:52:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								47519cd8c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
							
							
							
							
							
							
							
							Conflicts:
	synapse/handlers/events.py
	synapse/rest/events.py
	synapse/rest/room.py 
							
						 | 
						
							2014-08-27 14:13:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								dfa0cd1d90
								
							
								
							
						 | 
						
							
							
								
								Modified /join/$identifier to support $identifier being a room ID in addition to a room alias.
							
							
							
							
							
						 | 
						
							2014-08-27 09:43:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								93cff1668c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
							
							
							
							
							
						 | 
						
							2014-08-26 18:57:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3a2a5b959c
								
							
								
							
						 | 
						
							
							
								
								WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model.
							
							
							
							
							
						 | 
						
							2014-08-26 18:57:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								f84ddc75cb
								
							
								
							
						 | 
						
							
							
								
								Pepper UT TODOs
							
							
							
							
							
						 | 
						
							2014-08-26 17:54:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								5a3df1d029
								
							
								
							
						 | 
						
							
							
								
								Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expanded the feedback constants to fully explain what type of feedback they are.
							
							
							
							
							
						 | 
						
							2014-08-26 17:49:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								5a93bfe1f0
								
							
								
							
						 | 
						
							
							
								
								Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmdclient, tests and webclient. All appears to work.
							
							
							
							
							
						 | 
						
							2014-08-26 17:21:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								ad6d5ac06c
								
							
								
							
						 | 
						
							
							
								
								Added RoomSendEventRestServlet to send generic non-state events. It even appears to work..!
							
							
							
							
							
						 | 
						
							2014-08-26 17:00:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								ac21dfff6d
								
							
								
							
						 | 
						
							
							
								
								Fix pyflakes errors
							
							
							
							
							
						 | 
						
							2014-08-26 16:02:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								5c0be8fde3
								
							
								
							
						 | 
						
							
							
								
								Implemented /rooms/$roomid/[invite|join|leave] with POST / PUT (incl txn ids)
							
							
							
							
							
						 | 
						
							2014-08-26 14:49:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								732d954f89
								
							
								
							
						 | 
						
							
							
								
								Added basic in-memory REST transaction storage. Only the latest transaction for a given path/access_token combo is stored in order to prevent storing ALL request/response pairs.
							
							
							
							
							
						 | 
						
							2014-08-26 14:13:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								7d79021c42
								
							
								
							
						 | 
						
							
							
								
								Added servlet for /rooms/$roomid/[invite|join|leave]
							
							
							
							
							
						 | 
						
							2014-08-26 12:54:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								cab3095803
								
							
								
							
						 | 
						
							
							
								
								Removed member list servlet: now using generic state paths.
							
							
							
							
							
						 | 
						
							2014-08-26 09:26:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								f690b7b827
								
							
								
							
						 | 
						
							
							
								
								Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet to RoomStateEventRestServlet. Support generic state event sending.
							
							
							
							
							
						 | 
						
							2014-08-22 15:59:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								9c0e570496
								
							
								
							
						 | 
						
							
							
								
								Kill the "_homeserver_" injected messages for room membership changes
							
							
							
							
							
						 | 
						
							2014-08-20 16:06:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								347242a5c4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
							
							
							Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py 
							
						 | 
						
							2014-08-19 14:48:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								75b6d982a0
								
							
								
							
						 | 
						
							
							
								
								Add a 'backfill room' button
							
							
							
							
							
						 | 
						
							2014-08-19 14:20:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								caef65d819
								
							
								
							
						 | 
						
							
							
								
								More unquotes. Also, don't return the room_id on membership state changes, they already know it.
							
							
							
							
							
						 | 
						
							2014-08-19 12:30:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								ece7a6d995
								
							
								
							
						 | 
						
							
							
								
								Unquote sender IDs.
							
							
							
							
							
						 | 
						
							2014-08-19 11:50:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b4a1f2ccb5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
						 | 
						
							2014-08-18 15:53:40 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								7d324612ec
								
							
								
							
						 | 
						
							
							
								
								Precent lack of presence visiblity from causing room /members/list to fail
							
							
							
							
							
						 | 
						
							2014-08-18 13:17:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2f91d16033
								
							
								
							
						 | 
						
							
							
								
								We don't need to do a json.loads here
							
							
							
							
							
						 | 
						
							2014-08-18 11:00:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								40c020ad13
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
						 | 
						
							2014-08-15 16:48:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								ec1fd20e59
								
							
								
							
						 | 
						
							
							
								
								Also include users' presence when responding to /rooms/:room_id/members/list
							
							
							
							
							
						 | 
						
							2014-08-15 16:47:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								661c711765
								
							
								
							
						 | 
						
							
							
								
								Start fixing places that use the data store.
							
							
							
							
							
						 | 
						
							2014-08-14 17:34:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								7fb93f2a47
								
							
								
							
						 | 
						
							
							
								
								Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..., hs=hs) - similar to parse_userid()
							
							
							
							
							
						 | 
						
							2014-08-13 18:03:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								f98e6380f1
								
							
								
							
						 | 
						
							
							
								
								add in whitespace after copyright statements to improve legibility
							
							
							
							
							
						 | 
						
							2014-08-13 03:14:34 +01:00 | 
						
					
				
					
						
							
							
								 
								matrix.org
							
						 | 
						
							
							
							
							
								
							
								4f475c7697
								
							
								
							
						 | 
						
							
							
								
								Reference Matrix Home Server
							
							
							
							
							
						 | 
						
							2014-08-12 15:10:52 +01:00 |