323d3e506d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search  
							
							
							
						 
						
							2015-10-13 14:34:01 +01:00  
				
					
						
							
							
								 
						
							
							
								2fa9e23e04 
								
							
								 
							
						 
						
							
							
								
								Update the v2 filters to support filtering presence and remove support for public/private user data  
							
							
							
						 
						
							2015-10-13 14:12:43 +01:00  
				
					
						
							
							
								 
						
							
							
								c85c912562 
								
							
								 
							
						 
						
							
							
								
								Add basic full text search impl.  
							
							
							
						 
						
							2015-10-09 15:48:31 +01:00  
				
					
						
							
							
								 
						
							
							
								93cc60e805 
								
							
								 
							
						 
						
							
							
								
								Remove log line that was generated whenever an error was created. We are now creating error objects that aren't raised so it's probably a bit too confusing to keep  
							
							
							
						 
						
							2015-10-06 16:10:19 +01:00  
				
					
						
							
							
								 
						
							
							
								40017a9a11 
								
							
								 
							
						 
						
							
							
								
								Add 'trusted_private_chat' to room creation presets  
							
							
							
						 
						
							2015-10-02 11:22:56 +01:00  
				
					
						
							
							
								 
						
							
							
								d5e081c7ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							
							
						 
						
							2015-10-02 10:33:49 +01:00  
				
					
						
							
							
								 
						
							
							
								f2fcc0a8cf 
								
							
								 
							
						 
						
							
							
								
								synapse/api/errors.py:RoomError was unused  
							
							
							
						 
						
							2015-09-22 18:18:45 +01:00  
				
					
						
							
							
								 
						
							
							
								ee2d722f0f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #276  from matrix-org/markjh/history_for_rooms_that_have_been_left  
							
							... 
							
							
							
							SPEC-216: Allow users to view the history of rooms that they have left. 
							
						 
						
							2015-09-21 14:38:13 +01:00  
				
					
						
							
							
								 
						
							
							
								8e3bbc9bd0 
								
							
								 
							
						 
						
							
							
								
								Clarify which event is returned by check_user_was_in_room  
							
							
							
						 
						
							2015-09-21 13:47:44 +01:00  
				
					
						
							
							
								 
						
							
							
								728d07c8c1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #256  from matrix-org/auth  
							
							... 
							
							
							
							Attempt to validate macaroons 
							
						 
						
							2015-09-14 18:09:33 +01:00  
				
					
						
							
							
								 
						
							
							
								d59acb8c5b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							
							
						 
						
							2015-09-14 18:05:31 +01:00  
				
					
						
							
							
								 
						
							
							
								91cb3b630d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #265  from matrix-org/erikj/check_room_exists  
							
							... 
							
							
							
							Check room exists when authenticating an event 
							
						 
						
							2015-09-14 17:56:18 +01:00  
				
					
						
							
							
								 
						
							
							
								3c166a24c5 
								
							
								 
							
						 
						
							
							
								
								Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API  
							
							
							
						 
						
							2015-09-09 16:05:09 +01:00  
				
					
						
							
							
								 
						
							
							
								1d579df664 
								
							
								 
							
						 
						
							
							
								
								Allow rooms/{roomId}/state for a room that has been left  
							
							
							
						 
						
							2015-09-09 14:12:24 +01:00  
				
					
						
							
							
								 
						
							
							
								89ae0166de 
								
							
								 
							
						 
						
							
							
								
								Allow room initialSync for users that have left the room, returning a snapshot of how the room was when they left it  
							
							
							
						 
						
							2015-09-09 13:25:22 +01:00  
				
					
						
							
							
								 
						
							
							
								9b05ef6f39 
								
							
								 
							
						 
						
							
							
								
								Also check the domains for membership state_keys  
							
							
							
						 
						
							2015-09-01 16:17:25 +01:00  
				
					
						
							
							
								 
						
							
							
								187320b019 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/check_room_exists' into erikj/unfederatable  
							
							
							
						 
						
							2015-09-01 15:58:10 +01:00  
				
					
						
							
							
								 
						
							
							
								b345853918 
								
							
								 
							
						 
						
							
							
								
								Check against sender rather than event_id  
							
							
							
						 
						
							2015-09-01 15:57:35 +01:00  
				
					
						
							
							
								 
						
							
							
								a88e16152f 
								
							
								 
							
						 
						
							
							
								
								Add flag which disables federation of the room  
							
							
							
						 
						
							2015-09-01 15:47:30 +01:00  
				
					
						
							
							
								 
						
							
							
								00149c063b 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2015-09-01 15:42:03 +01:00  
				
					
						
							
							
								 
						
							
							
								ab9e01809d 
								
							
								 
							
						 
						
							
							
								
								Check room exists when authenticating an event, by asserting they reference a creation event  
							
							
							
						 
						
							2015-09-01 15:21:24 +01:00  
				
					
						
							
							
								 
						
							
							
								e255c2c32f 
								
							
								 
							
						 
						
							
							
								
								s/user_id/user/g for consistency  
							
							
							
						 
						
							2015-09-01 12:41:16 +01:00  
				
					
						
							
							
								 
						
							
							
								b854a375b0 
								
							
								 
							
						 
						
							
							
								
								Check domain of events properly  
							
							... 
							
							
							
							Federated servers still need to delegate authority to owning servers 
							
						 
						
							2015-09-01 11:53:31 +01:00  
				
					
						
							
							
								 
						
							
							
								8256a8ece7 
								
							
								 
							
						 
						
							
							
								
								Allow users to redact their own events  
							
							
							
						 
						
							2015-08-28 15:31:49 +01:00  
				
					
						
							
							
								 
						
							
							
								6a4b650d8a 
								
							
								 
							
						 
						
							
							
								
								Attempt to validate macaroons  
							
							... 
							
							
							
							A couple of weird caveats:
 * If we can't validate your macaroon, we fall back to checking that
   your access token is in the DB, and ignoring the failure
 * Even if we can validate your macaroon, we still have to hit the DB to
   get the access token ID, which we pretend is a device ID all over the
   codebase.
This mostly adds the interesting code, and points out the two pieces we
need to delete (and necessary conditions) in order to fix the above
caveats. 
							
						 
						
							2015-08-26 13:22:23 +01:00  
				
					
						
							
							
								 
						
							
							
								a9d8bd95e7 
								
							
								 
							
						 
						
							
							
								
								Stop looking up "admin", which we never read  
							
							
							
						 
						
							2015-08-25 16:29:39 +01:00  
				
					
						
							
							
								 
						
							
							
								57619d6058 
								
							
								 
							
						 
						
							
							
								
								Re-wrap line  
							
							
							
						 
						
							2015-08-25 16:25:46 +01:00  
				
					
						
							
							
								 
						
							
							
								a0b181bd17 
								
							
								 
							
						 
						
							
							
								
								Remove completely unused concepts from codebase  
							
							... 
							
							
							
							Removes device_id and ClientInfo
device_id is never actually written, and the matrix.org DB has no
non-null entries for it. Right now, it's just cluttering up code.
This doesn't remove the columns from the database, because that's
fiddly. 
							
						 
						
							2015-08-25 16:23:06 +01:00  
				
					
						
							
							
								 
						
							
							
								e8cf77fa49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into refresh  
							
							... 
							
							
							
							Conflicts:
	synapse/rest/client/v1/login.py 
							
						 
						
							2015-08-20 16:25:40 +01:00  
				
					
						
							
							
								 
						
							
							
								13a6517d89 
								
							
								 
							
						 
						
							
							
								
								s/by_token/by_access_token/g  
							
							... 
							
							
							
							We're about to have two kinds of token, access and refresh 
							
						 
						
							2015-08-20 16:01:29 +01:00  
				
					
						
							
							
								 
						
							
							
								9b63def388 
								
							
								 
							
						 
						
							
							
								
								Add m.room.avatar to default power levels. Change default required power levels of such events to 50  
							
							
							
						 
						
							2015-08-20 14:35:40 +01:00  
				
					
						
							
							
								 
						
							
							
								cbd053bb8f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #233  from matrix-org/erikj/canonical_alias  
							
							... 
							
							
							
							Add server side support for canonical aliases 
							
						 
						
							2015-08-20 11:26:09 +01:00  
				
					
						
							
							
								 
						
							
							
								a0b8e5f2fe 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #211  from matrix-org/email_in_use  
							
							... 
							
							
							
							Changes for unique emails 
							
						 
						
							2015-08-20 10:04:04 +01:00  
				
					
						
							
							
								 
						
							
							
								d7272f8d9d 
								
							
								 
							
						 
						
							
							
								
								Add canonical alias to the default power levels  
							
							
							
						 
						
							2015-08-19 12:03:09 +01:00  
				
					
						
							
							
								 
						
							
							
								ee59af9ac0 
								
							
								 
							
						 
						
							
							
								
								Set request.authenticated_entity for application services  
							
							
							
						 
						
							2015-08-18 15:17:47 +01:00  
				
					
						
							
							
								 
						
							
							
								45610305ea 
								
							
								 
							
						 
						
							
							
								
								Add missing space because linter  
							
							
							
						 
						
							2015-08-11 16:43:27 +01:00  
				
					
						
							
							
								 
						
							
							
								88e03da39f 
								
							
								 
							
						 
						
							
							
								
								Minor docs cleanup  
							
							
							
						 
						
							2015-08-11 16:35:28 +01:00  
				
					
						
							
							
								 
						
							
							
								9dba813234 
								
							
								 
							
						 
						
							
							
								
								Remove redundant if-guard  
							
							... 
							
							
							
							The startswith("@") does the job 
							
						 
						
							2015-08-11 16:34:17 +01:00  
				
					
						
							
							
								 
						
							
							
								c77048e12f 
								
							
								 
							
						 
						
							
							
								
								Add endpoint that proxies ID server request token and errors if the given email is in use on this Home Server.  
							
							
							
						 
						
							2015-08-04 14:37:09 +01:00  
				
					
						
							
							
								 
						
							
							
								d155b318d2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #203  from matrix-org/erikj/room_creation_presets  
							
							... 
							
							
							
							Implement presets at room creation 
							
						 
						
							2015-07-16 18:18:11 +01:00  
				
					
						
							
							
								 
						
							
							
								b49a30a972 
								
							
								 
							
						 
						
							
							
								
								Capitalize contants  
							
							
							
						 
						
							2015-07-14 10:20:31 +01:00  
				
					
						
							
							
								 
						
							
							
								d5cc794598 
								
							
								 
							
						 
						
							
							
								
								Implement presets at room creation  
							
							
							
						 
						
							2015-07-13 16:56:08 +01:00  
				
					
						
							
							
								 
						
							
							
								016c089f13 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_level_sanity  
							
							
							
						 
						
							2015-07-13 13:48:13 +01:00  
				
					
						
							
							
								 
						
							
							
								a5ea22d468 
								
							
								 
							
						 
						
							
							
								
								Sanitize power level checks  
							
							
							
						 
						
							2015-07-10 14:05:38 +01:00  
				
					
						
							
							
								 
						
							
							
								7e3b14fe78 
								
							
								 
							
						 
						
							
							
								
								You shouldn't be able to ban/kick users with higher power levels  
							
							
							
						 
						
							2015-07-10 14:05:38 +01:00  
				
					
						
							
							
								 
						
							
							
								1a3255b507 
								
							
								 
							
						 
						
							
							
								
								Add m.room.history_visibility to newly created rooms' m.room.power_levels  
							
							
							
						 
						
							2015-07-06 13:25:35 +01:00  
				
					
						
							
							
								 
						
							
							
								00ab882ed6 
								
							
								 
							
						 
						
							
							
								
								Add m.room.history_visibility to list of auth events  
							
							
							
						 
						
							2015-07-03 10:31:24 +01:00  
				
					
						
							
							
								 
						
							
							
								1a60545626 
								
							
								 
							
						 
						
							
							
								
								Add basic impl for room history ACL on GET /messages client API  
							
							
							
						 
						
							2015-07-02 16:20:10 +01:00  
				
					
						
							
							
								 
						
							
							
								cee69441d3 
								
							
								 
							
						 
						
							
							
								
								Log more when we have processed the request  
							
							
							
						 
						
							2015-06-15 17:11:44 +01:00  
				
					
						
							
							
								 
						
							
							
								22c7c5eb8f 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00