8810685df9 
								
							
								 
							
						 
						
							
							
								
								Stub out ServerNoticesSender on the workers  
							
							... 
							
							
							
							... and have the sync endpoints call it directly rather than obsure indirection
via PresenceHandler 
							
						 
						
							2018-05-22 11:54:51 +01:00  
				
					
						
							
							
								 
						
							
							
								9ea219c514 
								
							
								 
							
						 
						
							
							
								
								Send users a server notice about consent  
							
							... 
							
							
							
							When a user first syncs, we will send them a server notice asking them to
consent to the privacy policy if they have not already done so. 
							
						 
						
							2018-05-22 11:54:51 +01:00  
				
					
						
							
							
								 
						
							
							
								fed62e21ad 
								
							
								 
							
						 
						
							
							
								
								Infrastructure for a server notices room  
							
							... 
							
							
							
							Server Notices use a special room which the user can't dismiss. They are
created on demand when some other bit of the code calls send_notice.
(This doesn't actually do much yet becuse we don't call send_notice anywhere) 
							
						 
						
							2018-05-17 17:58:25 +01:00  
				
					
						
							
							
								 
						
							
							
								c46367d0d7 
								
							
								 
							
						 
						
							
							
								
								Move RoomCreationHandler out of synapse.handlers.Handlers  
							
							... 
							
							
							
							Handlers is deprecated nowadays, so let's move this out before I add a new
dependency on it.
Also fix the docstrings on create_room. 
							
						 
						
							2018-05-17 09:08:42 +01:00  
				
					
						
							
							
								 
						
							
							
								47815edcfa 
								
							
								 
							
						 
						
							
							
								
								ConsentResource to gather policy consent from users  
							
							... 
							
							
							
							Hopefully there are enough comments and docs in this that it makes sense on its
own. 
							
						 
						
							2018-05-15 15:11:59 +01:00  
				
					
						
							
							
								 
						
							
							
								6495dbb326 
								
							
								 
							
						 
						
							
							
								
								Burminate v1auth  
							
							... 
							
							
							
							This closes  #2602 
v1auth was created to account for the differences in status code between
the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid
tokens). However since those protocols were merged, this makes the r0
version/endpoint internally inconsistent, and violates the
specification for the r0 endpoint.
This might break clients that rely on this inconsistency with the
specification. This is said to affect the legacy angular reference
client. However, I feel that restoring parity with the spec is more
important. Either way, it is critical to inform developers about this
change, in case they rely on the illegal behaviour.
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-30 22:20:43 +02:00  
				
					
						
							
							
								 
						
							
							
								3f0f06cb31 
								
							
								 
							
						 
						
							
							
								
								Split RoomMemberWorkerHandler to separate file  
							
							
							
						 
						
							2018-03-14 11:41:45 +00:00  
				
					
						
							
							
								 
						
							
							
								b27320b550 
								
							
								 
							
						 
						
							
							
								
								Implement RoomMemberWorkerHandler  
							
							
							
						 
						
							2018-03-13 18:26:00 +00:00  
				
					
						
							
							
								 
						
							
							
								1a69c6d590 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2987  from matrix-org/erikj/split_room_member_handler  
							
							... 
							
							
							
							Split RoomMemberHandler into base and master class 
							
						 
						
							2018-03-13 17:40:00 +00:00  
				
					
						
							
							
								 
						
							
							
								d45a114824 
								
							
								 
							
						 
						
							
							
								
								Raise, don't return, exception  
							
							
							
						 
						
							2018-03-13 17:24:34 +00:00  
				
					
						
							
							
								 
						
							
							
								b78717b87b 
								
							
								 
							
						 
						
							
							
								
								Split RoomMemberHandler into base and master class  
							
							... 
							
							
							
							The intention here is to split the class into the bits that can be done
on workers and the bits that have to be done on the master.
In future there will also be a class that can be run on the worker,
which will delegate work to the master when necessary. 
							
						 
						
							2018-03-13 16:37:41 +00:00  
				
					
						
							
							
								 
						
							
							
								cb9f8e527c 
								
							
								 
							
						 
						
							
							
								
								s/replication_client/federation_client/  
							
							
							
						 
						
							2018-03-13 13:26:52 +00:00  
				
					
						
							
							
								 
						
							
							
								cea462e285 
								
							
								 
							
						 
						
							
							
								
								s/replication_server/federation_server  
							
							
							
						 
						
							2018-03-13 13:22:21 +00:00  
				
					
						
							
							
								 
						
							
							
								265b993b8a 
								
							
								 
							
						 
						
							
							
								
								Split replication layer into two  
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
				
					
						
							
							
								 
						
							
							
								c3f79c9da5 
								
							
								 
							
						 
						
							
							
								
								Split out edu/query registration to a separate class  
							
							
							
						 
						
							2018-03-13 10:24:27 +00:00  
				
					
						
							
							
								 
						
							
							
								784f036306 
								
							
								 
							
						 
						
							
							
								
								Move RoomMemberHandler out of Handlers  
							
							
							
						 
						
							2018-03-01 14:36:50 +00:00  
				
					
						
							
							
								 
						
							
							
								3fa362502c 
								
							
								 
							
						 
						
							
							
								
								Update places where we create events  
							
							
							
						 
						
							2018-02-05 16:01:48 +00:00  
				
					
						
							
							
								 
						
							
							
								6da4c4d3bd 
								
							
								 
							
						 
						
							
							
								
								Factor out resolve_state_groups to a separate handler  
							
							... 
							
							
							
							We extract the storage-independent bits of the state group resolution out to a
separate functiom, and stick it in a new handler, in preparation for its use
from the storage layer. 
							
						 
						
							2018-02-01 12:40:04 +00:00  
				
					
						
							
							
								 
						
							
							
								25adde9a04 
								
							
								 
							
						 
						
							
							
								
								Factor out get_db_conn to HomeServer base class  
							
							... 
							
							
							
							This function is identical to all subclasses, so we may as well push it up to
the base class to reduce duplication (and make use of it in the tests) 
							
						 
						
							2018-01-26 00:56:49 +00:00  
				
					
						
							
							
								 
						
							
							
								f397153dfc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/search-all-local-users  
							
							
							
						 
						
							2017-11-30 01:51:38 +00:00  
				
					
						
							
							
								 
						
							
							
								47d99a20d5 
								
							
								 
							
						 
						
							
							
								
								Add user_directory_include_pattern config param to expand search results to additional users  
							
							... 
							
							
							
							Initial commit; this doesn't work yet - the LIKE filtering seems too aggressive.
It also needs _do_initial_spam to be aware of prepopulating the whole user_directory_search table with all users...
...and it needs a handle_user_signup() or something to be added so that new signups get incrementally added to the table too.
Committing it here as a WIP 
							
						 
						
							2017-11-29 16:46:45 +00:00  
				
					
						
							
							
								 
						
							
							
								ae31f8ce45 
								
							
								 
							
						 
						
							
							
								
								Move set_password into its own handler  
							
							... 
							
							
							
							Non-functional refactoring to move set_password. This means that we'll be able
to properly deactivate devices and access tokens without introducing a
dependency loop. 
							
						 
						
							2017-11-29 16:44:35 +00:00  
				
					
						
							
							
								 
						
							
							
								7ca5c68233 
								
							
								 
							
						 
						
							
							
								
								Move deactivate_account into its own handler  
							
							... 
							
							
							
							Non-functional refactoring to move deactivate_account. This means that we'll be
able to properly deactivate devices and access tokens without introducing a
dependency loop. 
							
						 
						
							2017-11-29 16:44:35 +00:00  
				
					
						
							
							
								 
						
							
							
								e1fd4751de 
								
							
								 
							
						 
						
							
							
								
								Build MediaRepositoryResource as a homeserver dependency  
							
							... 
							
							
							
							This avoids the scenario where we have four different PreviewUrlResources
configured on a single app, each of which have their own caches and cache
clearing jobs. 
							
						 
						
							2017-11-22 16:19:49 +00:00  
				
					
						
							
							
								 
						
							
							
								7298ed7c51 
								
							
								 
							
						 
						
							
							
								
								Clean up dependency list  
							
							... 
							
							
							
							remove those that aren't used at all, and replace the ones that don't have
builders with simple getters rather than dynamically-generated methods. 
							
						 
						
							2017-11-21 11:15:41 +00:00  
				
					
						
							
							
								 
						
							
							
								27955056e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into erikj/groups_merged  
							
							
							
						 
						
							2017-10-02 16:20:41 +01:00  
				
					
						
							
							
								 
						
							
							
								6cd5fcd536 
								
							
								 
							
						 
						
							
							
								
								Make the spam checker a module  
							
							
							
						 
						
							2017-09-26 19:20:23 +01:00  
				
					
						
							
							
								 
						
							
							
								bf81f3cf2c 
								
							
								 
							
						 
						
							
							
								
								Split out profile handler to fix tests  
							
							
							
						 
						
							2017-08-25 14:34:56 +01:00  
				
					
						
							
							
								 
						
							
							
								2f9eafdd36 
								
							
								 
							
						 
						
							
							
								
								Add local group server support  
							
							
							
						 
						
							2017-07-17 12:03:49 +01:00  
				
					
						
							
							
								 
						
							
							
								b8ca494ee9 
								
							
								 
							
						 
						
							
							
								
								Initial group server implementation  
							
							
							
						 
						
							2017-07-10 15:44:15 +01:00  
				
					
						
							
							
								 
						
							
							
								eeb2f9e546 
								
							
								 
							
						 
						
							
							
								
								Add user_directory to database  
							
							
							
						 
						
							2017-05-31 11:51:01 +01:00  
				
					
						
							
							
								 
						
							
							
								cafe659f72 
								
							
								 
							
						 
						
							
							
								
								Store ActionGenerator in HomeServer  
							
							
							
						 
						
							2017-05-19 10:09:56 +01:00  
				
					
						
							
							
								 
						
							
							
								d892079844 
								
							
								 
							
						 
						
							
							
								
								Finish implementing RM endpoint  
							
							... 
							
							
							
							- This change causes a 405 to be sent if "m.read_marker" is set via /account_data
 - This also fixes-up the RM endpoint so that it actually Works. 
							
						 
						
							2017-04-11 15:01:39 +01:00  
				
					
						
							
							
								 
						
							
							
								36c28bc467 
								
							
								 
							
						 
						
							
							
								
								Update all the workers and master to use TCP replication  
							
							
							
						 
						
							2017-04-03 15:35:52 +01:00  
				
					
						
							
							
								 
						
							
							
								51adaac953 
								
							
								 
							
						 
						
							
							
								
								Fix email push in pusher worker  
							
							... 
							
							
							
							This was broken when device list updates were implemented, as Mailer
could no longer instantiate an AuthHandler due to a dependency on
federation sending. 
							
						 
						
							2017-02-02 10:53:36 +00:00  
				
					
						
							
							
								 
						
							
							
								feec718265 
								
							
								 
							
						 
						
							
							
								
								Shuffle receipt handler around so that worker apps don't need to load it  
							
							
							
						 
						
							2016-11-23 15:14:24 +00:00  
				
					
						
							
							
								 
						
							
							
								26072df6af 
								
							
								 
							
						 
						
							
							
								
								Ensure only main or federation_sender process can send federation traffic  
							
							
							
						 
						
							2016-11-23 14:09:47 +00:00  
				
					
						
							
							
								 
						
							
							
								ed787cf09e 
								
							
								 
							
						 
						
							
							
								
								Hook up the send queue and create a federation sender worker  
							
							
							
						 
						
							2016-11-16 17:34:44 +00:00  
				
					
						
							
							
								 
						
							
							
								847d5db1d1 
								
							
								 
							
						 
						
							
							
								
								Add transaction queue and transport layer to DI  
							
							
							
						 
						
							2016-11-16 14:47:52 +00:00  
				
					
						
							
							
								 
						
							
							
								87528f0756 
								
							
								 
							
						 
						
							
							
								
								Support /initialSync in synchrotron worker  
							
							
							
						 
						
							2016-09-21 11:46:28 +01:00  
				
					
						
							
							
								 
						
							
							
								a70a43bc51 
								
							
								 
							
						 
						
							
							
								
								Move RoomListHandler into a separate file  
							
							
							
						 
						
							2016-09-14 14:07:37 +01:00  
				
					
						
							
							
								 
						
							
							
								d4a35ada28 
								
							
								 
							
						 
						
							
							
								
								Send device messages over federation  
							
							
							
						 
						
							2016-09-06 18:16:20 +01:00  
				
					
						
							
							
								 
						
							
							
								4e1cebd56f 
								
							
								 
							
						 
						
							
							
								
								Make synchrotron accept /events  
							
							
							
						 
						
							2016-08-12 15:31:44 +01:00  
				
					
						
							
							
								 
						
							
							
								986615b0b2 
								
							
								 
							
						 
						
							
							
								
								Move e2e query logic into a handler  
							
							
							
						 
						
							2016-08-01 18:02:07 +01:00  
				
					
						
							
							
								 
						
							
							
								f863a52cea 
								
							
								 
							
						 
						
							
							
								
								Add device_id support to /login  
							
							... 
							
							
							
							Add a 'devices' table to the storage, as well as a 'device_id' column to
refresh_tokens.
Allow the client to pass a device_id, and initial_device_display_name, to
/login. If login is successful, then register the device in the devices table
if it wasn't known already. If no device_id was supplied, make one up.
Associate the device_id with the access token and refresh token, so that we can
get at it again later. Ensure that the device_id is copied from the refresh
token to the access_token when the token is refreshed. 
							
						 
						
							2016-07-18 16:39:44 +01:00  
				
					
						
							
							
								 
						
							
							
								a70688445d 
								
							
								 
							
						 
						
							
							
								
								Implement purge_media_cache admin API  
							
							
							
						 
						
							2016-06-29 14:57:59 +01:00  
				
					
						
							
							
								 
						
							
							
								4a10510cd5 
								
							
								 
							
						 
						
							
							
								
								Split out the auth handler  
							
							
							
						 
						
							2016-06-02 13:31:45 +01:00  
				
					
						
							
							
								 
						
							
							
								c626fc576a 
								
							
								 
							
						 
						
							
							
								
								Move the AS handler out of the Handlers object.  
							
							... 
							
							
							
							Access it directly from the homeserver itself. It already wasn't
inheriting from BaseHandler storing it on the Handlers object was
already somewhat dubious. 
							
						 
						
							2016-05-31 13:53:48 +01:00  
				
					
						
							
							
								 
						
							
							
								887c6e6f05 
								
							
								 
							
						 
						
							
							
								
								Split out the room list handler  
							
							... 
							
							
							
							So I can use it from federation bits without pulling in all the handlers. 
							
						 
						
							2016-05-31 11:05:16 +01:00  
				
					
						
							
							
								 
						
							
							
								0cb441fedd 
								
							
								 
							
						 
						
							
							
								
								Move typing handler out of the Handlers object  
							
							
							
						 
						
							2016-05-17 15:58:46 +01:00  
				
					
						
							
							
								 
						
							
							
								f68eea808a 
								
							
								 
							
						 
						
							
							
								
								Move SyncHandler out of the Handlers object  
							
							
							
						 
						
							2016-05-16 20:19:26 +01:00  
				
					
						
							
							
								 
						
							
							
								3b86ecfa79 
								
							
								 
							
						 
						
							
							
								
								Move the presence handler out of the Handlers object  
							
							
							
						 
						
							2016-05-16 18:56:37 +01:00  
				
					
						
							
							
								 
						
							
							
								a3ac837599 
								
							
								 
							
						 
						
							
							
								
								Optionally split out the pushers into a separate process  
							
							
							
						 
						
							2016-04-21 17:22:37 +01:00  
				
					
						
							
							
								 
						
							
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
				
					
						
							
							
								 
						
							
							
								7ed2bbeb11 
								
							
								 
							
						 
						
							
							
								
								Clean up a bit. Add comment  
							
							
							
						 
						
							2016-01-28 14:32:05 +00:00  
				
					
						
							
							
								 
						
							
							
								2152b320c5 
								
							
								 
							
						 
						
							
							
								
								PEP 8  
							
							
							
						 
						
							2016-01-27 17:09:17 +00:00  
				
					
						
							
							
								 
						
							
							
								87f9477b10 
								
							
								 
							
						 
						
							
							
								
								Add a Homeserver.setup method.  
							
							... 
							
							
							
							This is for setting up dependencies that require work on startup. This
is useful for the DataStore that wants to read a bunch from the database
before initiliazing. 
							
						 
						
							2016-01-26 15:51:06 +00:00  
				
					
						
							
							
								 
						
							
							
								9959d9ece8 
								
							
								 
							
						 
						
							
							
								
								Remove redundated BaseHomeServer  
							
							
							
						 
						
							2016-01-26 13:52:29 +00:00  
				
					
						
							
							
								 
						
							
							
								2818a000aa 
								
							
								 
							
						 
						
							
							
								
								Use split rather than endswith  
							
							
							
						 
						
							2016-01-19 16:11:39 +00:00  
				
					
						
							
							
								 
						
							
							
								5a7d1ecffc 
								
							
								 
							
						 
						
							
							
								
								Add regex cache. Only caculate push actions for users that have sent read receipts, and are on that server  
							
							
							
						 
						
							2016-01-19 16:01:05 +00:00  
				
					
						
							
							
								 
						
							
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
				
					
						
							
							
								 
						
							
							
								7a8ba4c9a0 
								
							
								 
							
						 
						
							
							
								
								Actually host r0 and unstable prefixes  
							
							
							
						 
						
							2015-12-08 15:26:52 +00:00  
				
					
						
							
							
								 
						
							
							
								c452dabc3d 
								
							
								 
							
						 
						
							
							
								
								Remove the LockManager class because it wasn't being used  
							
							
							
						 
						
							2015-11-04 14:08:15 +00:00  
				
					
						
							
							
								 
						
							
							
								d4af08a167 
								
							
								 
							
						 
						
							
							
								
								Use shorter config key name  
							
							
							
						 
						
							2015-09-15 15:50:13 +01:00  
				
					
						
							
							
								 
						
							
							
								3bcbabc9fb 
								
							
								 
							
						 
						
							
							
								
								Rename context factory  
							
							... 
							
							
							
							Mjark is officially no fun. 
							
						 
						
							2015-09-15 15:46:22 +01:00  
				
					
						
							
							
								 
						
							
							
								81a93ddcc8 
								
							
								 
							
						 
						
							
							
								
								Allow configuration to ignore invalid SSL certs  
							
							... 
							
							
							
							This will be useful for sytest, and sytest only, hence the aggressive
config key name. 
							
						 
						
							2015-09-09 12:02:07 +01:00  
				
					
						
							
							
								 
						
							
							
								9c5fc81c2d 
								
							
								 
							
						 
						
							
							
								
								Correctly handle x_forwaded listener option  
							
							
							
						 
						
							2015-06-12 17:13:23 +01:00  
				
					
						
							
							
								 
						
							
							
								d624e2a638 
								
							
								 
							
						 
						
							
							
								
								Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class  
							
							
							
						 
						
							2015-04-30 04:24:44 +01:00  
				
					
						
							
							
								 
						
							
							
								4ad8b45155 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into key_distribution  
							
							... 
							
							
							
							Conflicts:
	synapse/config/homeserver.py 
							
						 
						
							2015-04-29 13:15:14 +01:00  
				
					
						
							
							
								 
						
							
							
								cb03fafdf1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into csauth  
							
							
							
						 
						
							2015-04-17 13:51:10 +01:00  
				
					
						
							
							
								 
						
							
							
								d488463fa3 
								
							
								 
							
						 
						
							
							
								
								Add a version 2 of the key server api  
							
							
							
						 
						
							2015-04-14 16:04:52 +01:00  
				
					
						
							
							
								 
						
							
							
								e7887e37a8 
								
							
								 
							
						 
						
							
							
								
								Remove appservice REST servlets  
							
							
							
						 
						
							2015-03-31 09:32:40 +01:00  
				
					
						
							
							
								 
						
							
							
								c7023f2155 
								
							
								 
							
						 
						
							
							
								
								1) Pushers are now associated with an access token  
							
							... 
							
							
							
							2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it. 
							
						 
						
							2015-03-24 17:24:15 +00:00  
				
					
						
							
							
								 
						
							
							
								e0214a263b 
								
							
								 
							
						 
						
							
							
								
								Build MetricsResource as a specific HomeServer dependency  
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
				
					
						
							
							
								 
						
							
							
								ad5701f50f 
								
							
								 
							
						 
						
							
							
								
								Expose 'config' as a real HomeServer dependency key  
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
				
					
						
							
							
								 
						
							
							
								0696dfd94b 
								
							
								 
							
						 
						
							
							
								
								Actually treat this as static content, not random Resources.  
							
							
							
						 
						
							2015-02-23 15:35:09 +00:00  
				
					
						
							
							
								 
						
							
							
								c059c9fea5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/__init__.py
	synapse/storage/__init__.py 
							
						 
						
							2015-02-02 15:57:59 +00:00  
				
					
						
							
							
								 
						
							
							
								9d8f798a3f 
								
							
								 
							
						 
						
							
							
								
								Merge changes from develop  
							
							
							
						 
						
							2015-01-29 14:55:27 +00:00  
				
					
						
							
							
								 
						
							
							
								c291a4d522 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into pushers  
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/events.py
	synapse/server.py 
							
						 
						
							2015-01-28 12:51:05 +00:00  
				
					
						
							
							
								 
						
							
							
								05c7cba73a 
								
							
								 
							
						 
						
							
							
								
								Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there  
							
							
							
						 
						
							2015-01-27 14:28:56 +00:00  
				
					
						
							
							
								 
						
							
							
								fa8e6ff900 
								
							
								 
							
						 
						
							
							
								
								Add stub application services REST API.  
							
							
							
						 
						
							2015-01-27 14:01:51 +00:00  
				
					
						
							
							
								 
						
							
							
								e5725eb3b9 
								
							
								 
							
						 
						
							
							
								
								Remove unused import from server.py  
							
							
							
						 
						
							2015-01-26 16:16:50 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7b814d3f7f 
								
							
								 
							
						 
						
							
							
								
								Add client v2_alpha resource to synapse server resource tree  
							
							
							
						 
						
							2015-01-23 18:55:19 +00:00  
				
					
						
							
							
								 
						
							
							
								c4652d7772 
								
							
								 
							
						 
						
							
							
								
								Remove hs.parse_eventid  
							
							
							
						 
						
							2015-01-23 13:25:07 +00:00  
				
					
						
							
							
								 
						
							
							
								ada711504e 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_roomalias with RoomAlias.from_string  
							
							
							
						 
						
							2015-01-23 13:21:58 +00:00  
				
					
						
							
							
								 
						
							
							
								1c06c48ce2 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_roomid with RoomID.from_string  
							
							
							
						 
						
							2015-01-23 11:55:12 +00:00  
				
					
						
							
							
								 
						
							
							
								5759bec43c 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_userid with UserID.from_string  
							
							
							
						 
						
							2015-01-23 11:47:15 +00:00  
				
					
						
							
							
								 
						
							
							
								7256def8e4 
								
							
								 
							
						 
						
							
							
								
								Merge rest servlets into the client json resource object  
							
							
							
						 
						
							2015-01-23 10:37:38 +00:00  
				
					
						
							
							
								 
						
							
							
								5c6189ea3e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into pushers  
							
							... 
							
							
							
							Conflicts:
	synapse/rest/__init__.py 
							
						 
						
							2015-01-22 17:46:16 +00:00  
				
					
						
							
							
								 
						
							
							
								97c68c508d 
								
							
								 
							
						 
						
							
							
								
								Move rest APIs back under the rest directory  
							
							
							
						 
						
							2015-01-22 16:10:07 +00:00  
				
					
						
							
							
								 
						
							
							
								1d2016b4a8 
								
							
								 
							
						 
						
							
							
								
								Move client v1 api rest servlets into a "client/v1" directory  
							
							
							
						 
						
							2015-01-22 14:59:08 +00:00  
				
					
						
							
							
								 
						
							
							
								c06a9063e1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into pushers  
							
							
							
						 
						
							2015-01-13 13:15:51 +00:00  
				
					
						
							
							
								 
						
							
							
								edb557b2ad 
								
							
								 
							
						 
						
							
							
								
								Return the raw federation event rather than adding extra keys for federation data.  
							
							
							
						 
						
							2015-01-08 14:28:08 +00:00  
				
					
						
							
							
								 
						
							
							
								5720ab59e0 
								
							
								 
							
						 
						
							
							
								
								Add 'raw' query parameter to expose the event graph and signatures to savvy clients.  
							
							
							
						 
						
							2015-01-08 13:57:40 +00:00  
				
					
						
							
							
								 
						
							
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								3c77d13aa5 
								
							
								 
							
						 
						
							
							
								
								Kill off synapse.api.events.*  
							
							
							
						 
						
							2014-12-16 11:29:05 +00:00  
				
					
						
							
							
								 
						
							
							
								cde840a82c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							... 
							
							
							
							Conflicts:
	setup.py 
							
						 
						
							2014-12-11 17:48:48 +00:00  
				
					
						
							
							
								 
						
							
							
								6630e1b579 
								
							
								 
							
						 
						
							
							
								
								Start making more things use EventContext rather than event.*  
							
							
							
						 
						
							2014-12-05 16:20:48 +00:00