Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								05c7cba73a
								
							
								
							
						 | 
						
							
							
								
								Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
							
							
							
							
							
						 | 
						
							2015-01-27 14:28:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								f9958f3404
								
							
								
							
						 | 
						
							
							
								
								Use new V2AlphaRestTestCase
							
							
							
							
							
						 | 
						
							2015-01-27 13:17:25 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								0484d7f6e9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into client_v2_filter
							
							
							
							
							
						 | 
						
							2015-01-27 13:11:03 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								57d2bfca3f
								
							
								
							
						 | 
						
							
							
								
								Initial cut of a shared base class for REST unit tests
							
							
							
							
							
						 | 
						
							2015-01-27 13:09:57 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								39c1892b22
								
							
								
							
						 | 
						
							
							
								
								Minor changes to v2_alpha filter REST test to allow the setUp method to be shareable
							
							
							
							
							
						 | 
						
							2015-01-27 13:03:31 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								9b6aaf2074
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #34 from matrix-org/remove_serialize_event_from_hs
							
							
							
							
							
							
							
							Don't pass the HS to serialize_event just so that it can get the current time. 
							
						 | 
						
							2015-01-26 16:23:48 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e5725eb3b9
								
							
								
							
						 | 
						
							
							
								
								Remove unused import from server.py
							
							
							
							
							
						 | 
						
							2015-01-26 16:16:50 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7f6f3f9d62
								
							
								
							
						 | 
						
							
							
								
								Pass the current time to serialize event, rather than passing an
							
							
							
							
							
							
							
							HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed. 
							
						 | 
						
							2015-01-26 16:11:28 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								37b8a71f10
								
							
								
							
						 | 
						
							
							
								
								Initial trivial REST test of v2_alpha filter API
							
							
							
							
							
						 | 
						
							2015-01-26 15:27:40 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								8d7accb28f
								
							
								
							
						 | 
						
							
							
								
								Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no actual filter implementation
							
							
							
							
							
						 | 
						
							2015-01-26 14:33:30 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								d07dfe5392
								
							
								
							
						 | 
						
							
							
								
								Create (empty) v2_alpha REST tests directory
							
							
							
							
							
						 | 
						
							2015-01-26 14:32:17 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7b814d3f7f
								
							
								
							
						 | 
						
							
							
								
								Add client v2_alpha resource to synapse server resource tree
							
							
							
							
							
						 | 
						
							2015-01-23 18:55:19 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								85419e1257
								
							
								
							
						 | 
						
							
							
								
								Stop complaining about Synapse Angular SDK 0.6.1
							
							
							
							
							
						 | 
						
							2015-01-23 18:37:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								30a89d2fdb
								
							
								
							
						 | 
						
							
							
								
								Update .gitignore
							
							
							
							
							
						 | 
						
							2015-01-23 15:51:32 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								bda5d7d14f
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #33 from matrix-org/extract_rest_servlet_from_client_v1
							
							
							
							
							
							
							
							Extract the client v1 base RestServlet to a separate class 
							
						 | 
						
							2015-01-23 14:32:41 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e0bf18addf
								
							
								
							
						 | 
						
							
							
								
								Add RestServlet base class in synapse/http/servlet.py
							
							
							
							
							
						 | 
						
							2015-01-23 14:16:28 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4be637cb12
								
							
								
							
						 | 
						
							
							
								
								Extract the client v1 base RestServlet to a separate class
							
							
							
							
							
						 | 
						
							2015-01-23 14:09:51 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f7cb604211
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #32 from matrix-org/remove_parse_id_from_hs
							
							
							
							
							
							
							
							Remove parse id from hs 
							
						 | 
						
							2015-01-23 13:41:55 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c4652d7772
								
							
								
							
						 | 
						
							
							
								
								Remove hs.parse_eventid
							
							
							
							
							
						 | 
						
							2015-01-23 13:25:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								ada711504e
								
							
								
							
						 | 
						
							
							
								
								Replace hs.parse_roomalias with RoomAlias.from_string
							
							
							
							
							
						 | 
						
							2015-01-23 13:21:58 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								1c06c48ce2
								
							
								
							
						 | 
						
							
							
								
								Replace hs.parse_roomid with RoomID.from_string
							
							
							
							
							
						 | 
						
							2015-01-23 11:55:12 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								5759bec43c
								
							
								
							
						 | 
						
							
							
								
								Replace hs.parse_userid with UserID.from_string
							
							
							
							
							
						 | 
						
							2015-01-23 11:47:15 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7dfd99f163
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #31 from matrix-org/client_api_resource
							
							
							
							
							
							
							
							Merge rest servlets into the client json resource object 
							
						 | 
						
							2015-01-23 10:55:18 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7256def8e4
								
							
								
							
						 | 
						
							
							
								
								Merge rest servlets into the client json resource object
							
							
							
							
							
						 | 
						
							2015-01-23 10:37:38 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								3a243c53f4
								
							
								
							
						 | 
						
							
							
								
								Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is still presence-specific
							
							
							
							
							
						 | 
						
							2015-01-22 20:06:28 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								cbb10879cb
								
							
								
							
						 | 
						
							
							
								
								Much merging of test case setUp() methods to make them much more
							
							
							
							
							
							
							
							shareable 
							
						 | 
						
							2015-01-22 20:06:28 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								22f00a09dd
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #30 from matrix-org/client_api_restructure
							
							
							
							
							
							
							
							Move client v1 api rest servlets into a "client/v1" directory 
							
						 | 
						
							2015-01-22 16:40:14 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								53584420a5
								
							
								
							
						 | 
						
							
							
								
								Move client rest tests back under rest
							
							
							
							
							
						 | 
						
							2015-01-22 16:13:27 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								97c68c508d
								
							
								
							
						 | 
						
							
							
								
								Move rest APIs back under the rest directory
							
							
							
							
							
						 | 
						
							2015-01-22 16:10:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								1d2016b4a8
								
							
								
							
						 | 
						
							
							
								
								Move client v1 api rest servlets into a "client/v1" directory
							
							
							
							
							
						 | 
						
							2015-01-22 14:59:08 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								16bfabb9c5
								
							
								
							
						 | 
						
							
							
								
								Fix manifest. Ignore contrib and docs directories when checking manifest against source control.
							
							
							
							
							
						 | 
						
							2015-01-22 14:32:51 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								d00cca11b9
								
							
								
							
						 | 
						
							
							
								
								Add demo and scripts to python manifest
							
							
							
							
							
						 | 
						
							2015-01-22 14:28:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								58691680b8
								
							
								
							
						 | 
						
							
							
								
								update .gitignore, set media-store-path in demo
							
							
							
							
							
						 | 
						
							2015-01-22 14:20:53 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								d3d0713de5
								
							
								
							
						 | 
						
							
							
								
								Move experiments, graph and cmdclient into contrib
							
							
							
							
							
						 | 
						
							2015-01-22 11:57:54 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								8907e143c1
								
							
								
							
						 | 
						
							
							
								
								Remove jsfiddles
							
							
							
							
							
						 | 
						
							2015-01-22 11:15:03 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f4ce61ed36
								
							
								
							
						 | 
						
							
							
								
								Move scripts into scripts
							
							
							
							
							
						 | 
						
							2015-01-22 11:14:14 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								73315ce9de
								
							
								
							
						 | 
						
							
							
								
								Abstract out the room ID from presence tests, so it's stored in self
							
							
							
							
							
						 | 
						
							2015-01-21 20:01:57 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								dbe71e670c
								
							
								
							
						 | 
						
							
							
								
								Use common base class for two Presence unit-tests, avoiding boilerplate copypasta
							
							
							
							
							
						 | 
						
							2015-01-21 16:58:16 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								dc70d1fef8
								
							
								
							
						 | 
						
							
							
								
								Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have
							
							
							
							
							
						 | 
						
							2015-01-19 16:24:54 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								42529cbced
								
							
								
							
						 | 
						
							
							
								
								Fix pyflakes errors
							
							
							
							
							
						 | 
						
							2015-01-19 15:33:04 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								00e9c08609
								
							
								
							
						 | 
						
							
							
								
								Fix syntax
							
							
							
							
							
						 | 
						
							2015-01-19 15:30:48 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								3e85e52b3f
								
							
								
							
						 | 
						
							
							
								
								Allow ':memory:' as the database path for sqlite3
							
							
							
							
							
						 | 
						
							2015-01-19 15:26:19 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								5fed042640
								
							
								
							
						 | 
						
							
							
								
								Finish renaming "context" to "room_id" in federation codebase
							
							
							
							
							
						 | 
						
							2015-01-16 19:01:03 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								2408c4b0a4
								
							
								
							
						 | 
						
							
							
								
								Fold _do_request_for_transaction into the methods that called it since it was a trivial wrapper around client.get_json
							
							
							
							
							
						 | 
						
							2015-01-16 19:01:03 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								602684eac5
								
							
								
							
						 | 
						
							
							
								
								Split transport layer into client and server parts
							
							
							
							
							
						 | 
						
							2015-01-16 19:01:03 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								2bdee98269
								
							
								
							
						 | 
						
							
							
								
								Remove temporary debug logging that was accidentally committed
							
							
							
							
							
						 | 
						
							2015-01-16 19:00:40 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								34a5fbe2b7
								
							
								
							
						 | 
						
							
							
								
								Have /join/:room_id return the room ID in response anyway, for consistency of clients (SYN-234)
							
							
							
							
							
						 | 
						
							2015-01-13 17:29:24 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								cf7e723808
								
							
								
							
						 | 
						
							
							
								
								Have MockClock detect attempts to cancel expired timers, to prevent a repeat of SYN-230
							
							
							
							
							
						 | 
						
							2015-01-13 16:58:36 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								c2e7c84e58
								
							
								
							
						 | 
						
							
							
								
								Don't try to cancel already-expired timers - SYN-230
							
							
							
							
							
						 | 
						
							2015-01-13 16:58:36 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								3891597eb3
								
							
								
							
						 | 
						
							
							
								
								Remove unused functions
							
							
							
							
							
						 | 
						
							2015-01-13 15:57:26 +00:00 |