|  Kegan Dougal | e7887e37a8 | Remove appservice REST servlets | 2015-03-31 09:32:40 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | e0214a263b | Build MetricsResource as a specific HomeServer dependency | 2015-03-12 16:24:51 +00:00 | 
				
					
						|  Paul "LeoNerd" Evans | ad5701f50f | Expose 'config' as a real HomeServer dependency key | 2015-03-12 16:24:50 +00:00 | 
				
					
						|  Kegan Dougal | 0696dfd94b | Actually treat this as static content, not random Resources. | 2015-02-23 15:35:09 +00:00 | 
				
					
						|  Kegan Dougal | c059c9fea5 | Merge branch 'develop' into application-services Conflicts:
	synapse/handlers/__init__.py
	synapse/storage/__init__.py | 2015-02-02 15:57:59 +00:00 | 
				
					
						|  Mark Haines | 9d8f798a3f | Merge changes from develop | 2015-01-29 14:55:27 +00:00 | 
				
					
						|  David Baker | c291a4d522 | Merge branch 'develop' into pushers Conflicts:
	synapse/handlers/events.py
	synapse/server.py | 2015-01-28 12:51:05 +00:00 | 
				
					
						|  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 | 
				
					
						|  Kegan Dougal | fa8e6ff900 | Add stub application services REST API. | 2015-01-27 14:01:51 +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 | 
				
					
						|  Mark Haines | 7b814d3f7f | Add client v2_alpha resource to synapse server resource tree | 2015-01-23 18:55:19 +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 | 7256def8e4 | Merge rest servlets into the client json resource object | 2015-01-23 10:37:38 +00:00 | 
				
					
						|  David Baker | 5c6189ea3e | Merge branch 'develop' into pushers Conflicts:
	synapse/rest/__init__.py | 2015-01-22 17:46:16 +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 | 
				
					
						|  David Baker | c06a9063e1 | Merge branch 'develop' into pushers | 2015-01-13 13:15:51 +00:00 | 
				
					
						|  Kegan Dougal | edb557b2ad | Return the raw federation event rather than adding extra keys for federation data. | 2015-01-08 14:28:08 +00:00 | 
				
					
						|  Kegan Dougal | 5720ab59e0 | Add 'raw' query parameter to expose the event graph and signatures to savvy clients. | 2015-01-08 13:57:40 +00:00 | 
				
					
						|  Mark Haines | adb04b1e57 | Update copyright notices | 2015-01-06 13:21:39 +00:00 | 
				
					
						|  David Baker | b56730bb6e | Merge branch 'develop' into pushers Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py | 2014-12-18 15:15:22 +00:00 | 
				
					
						|  Erik Johnston | 3c77d13aa5 | Kill off synapse.api.events.* | 2014-12-16 11:29:05 +00:00 | 
				
					
						|  Erik Johnston | cde840a82c | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor Conflicts:
	setup.py | 2014-12-11 17:48:48 +00:00 | 
				
					
						|  Erik Johnston | 6630e1b579 | Start making more things use EventContext rather than event.* | 2014-12-05 16:20:48 +00:00 | 
				
					
						|  Erik Johnston | c31dba86ec | Convert rest and handlers to use new event structure | 2014-12-04 15:50:01 +00:00 | 
				
					
						|  Mark Haines | 5da65085d1 | Get uploads working with new media repo | 2014-12-02 19:51:47 +00:00 | 
				
					
						|  Erik Johnston | 9d53228158 | Change DomainSpecificString so that it doesn't use a HomeServer object | 2014-12-02 10:42:28 +00:00 | 
				
					
						|  David Baker | 74c3879760 | Start creating a module to do generic notifications (just prints them to stdout currently!) | 2014-11-19 18:20:59 +00:00 | 
				
					
						|  Erik Johnston | a8e565eca8 | Add an EventValidator. Fix bugs in auth ++ storage | 2014-11-10 18:25:42 +00:00 | 
				
					
						|  Erik Johnston | 12ce441e67 | Convert event ids to be of the form :example.com | 2014-10-30 17:00:11 +00:00 | 
				
					
						|  Mark Haines | 9605593d11 | Merge branch 'develop' into server2server_signing Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py | 2014-09-30 17:55:06 +01:00 | 
				
					
						|  Mark Haines | b95a178584 | SYN-75 Verify signatures on server to server transactions | 2014-09-30 15:15:10 +01:00 | 
				
					
						|  Erik Johnston | 0fdf308874 | Track the IP users connect with. Add an admin column to users table. | 2014-09-26 16:36:24 +01:00 | 
				
					
						|  Mark Haines | e3117a2a23 | Add a _matrix/key/v1 resource with the verification keys of the local server | 2014-09-23 18:43:34 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | b0406b9ead | Merge remote-tracking branch 'origin/develop' into test-sqlite-memory | 2014-09-15 14:15:10 +01:00 | 
				
					
						|  Erik Johnston | 5bd9369a62 | Correctly handle the 'age' key in events and pdus | 2014-09-15 13:26:11 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | ce55a8cc4b | Move database preparing code out of homserver.py into storage where it belongs | 2014-09-10 15:42:15 +01:00 | 
				
					
						|  Matthew Hodgson | 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 | 
				
					
						|  Mark Haines | c7a7cdf734 | Add ratelimiting function to basehandler | 2014-09-02 17:57:04 +01:00 | 
				
					
						|  Mark Haines | 7acede1e42 | Fix pyflakes warnings | 2014-08-28 13:51:50 +01:00 | 
				
					
						|  Mark Haines | 2aeaa7b77c | Merge branch 'develop' into storage_transactions Conflicts:
	synapse/handlers/room.py
	synapse/storage/stream.py | 2014-08-27 17:15:58 +01:00 | 
				
					
						|  Mark Haines | 1d95e78759 | Merge branch 'develop' into storage_transactions | 2014-08-27 16:54:12 +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 | 
				
					
						|  Paul "LeoNerd" Evans | d63f775e06 | Added parse_roomid() helper | 2014-08-27 11:45:16 +01:00 | 
				
					
						|  Mark Haines | bf05218c4b | Merge branch 'develop' into storage_transactions | 2014-08-27 11:19:37 +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 |