3e7fac0d56 
								
							
								 
							
						 
						
							
							
								
								Add published room list edit API  
							
							
							
						 
						
							2016-03-21 15:06:07 +00:00  
				
					
						
							
							
								 
						
							
							
								874fd43257 
								
							
								 
							
						 
						
							
							
								
								Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.  
							
							
							
						 
						
							2016-03-07 17:13:56 +00:00  
				
					
						
							
							
								 
						
							
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
				
					
						
							
							
								 
						
							
							
								e5ad2e5267 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #582  from matrix-org/erikj/presence  
							
							... 
							
							
							
							Rewrite presence for performance. 
							
						 
						
							2016-02-19 09:37:50 +00:00  
				
					
						
							
							
								 
						
							
							
								114b929f8b 
								
							
								 
							
						 
						
							
							
								
								Check presence state is a valid one  
							
							
							
						 
						
							2016-02-18 09:16:32 +00:00  
				
					
						
							
							
								 
						
							
							
								536f949a1a 
								
							
								 
							
						 
						
							
							
								
								api/filtering: don't assume that event content will always be a dict  
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-02-17 12:59:41 +01:00  
				
					
						
							
							
								 
						
							
							
								4de08a4672 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge two of the room join codepaths"  
							
							... 
							
							
							
							This reverts commit cf81375b94 
							
						 
						
							2016-02-12 16:17:24 +00:00  
				
					
						
							
							
								 
						
							
							
								cf81375b94 
								
							
								 
							
						 
						
							
							
								
								Merge two of the room join codepaths  
							
							... 
							
							
							
							There's at least one more to merge in.
Side-effects:
 * Stop reporting None as displayname and avatar_url in some cases
 * Joining a room by alias populates guest-ness in join event
 * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
   been called on matrix.org according to logs
 * Stop recording access_token_id on /join/room_id - currently we don't
   record it on /join/room_alias; I can try to thread it through at some
   point. 
							
						 
						
							2016-02-12 15:11:49 +00:00  
				
					
						
							
							
								 
						
							
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
				
					
						
							
							
								 
						
							
							
								737c4223ef 
								
							
								 
							
						 
						
							
							
								
								Host /media/r0 as well as /media/v1  
							
							
							
						 
						
							2016-02-05 10:47:46 +00:00  
				
					
						
							
							
								 
						
							
							
								2df6114bc4 
								
							
								 
							
						 
						
							
							
								
								Log more diagnostics for unrecognised access tokens  
							
							
							
						 
						
							2016-02-02 19:21:49 +00:00  
				
					
						
							
							
								 
						
							
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
				
					
						
							
							
								 
						
							
							
								35981c8b71 
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							
							
						 
						
							2016-01-28 17:20:05 +00:00  
				
					
						
							
							
								 
						
							
							
								8c6012a4af 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2016-01-25 13:12:35 +00:00  
				
					
						
							
							
								 
						
							
							
								4021f95261 
								
							
								 
							
						 
						
							
							
								
								Move logic from rest/ to handlers/  
							
							
							
						 
						
							2016-01-25 10:10:44 +00:00  
				
					
						
							
							
								 
						
							
							
								975903ae17 
								
							
								 
							
						 
						
							
							
								
								Sanitize filters  
							
							
							
						 
						
							2016-01-22 10:41:30 +00:00  
				
					
						
							
							
								 
						
							
							
								808a8aedab 
								
							
								 
							
						 
						
							
							
								
								Don't error on AS non-ghost user use  
							
							... 
							
							
							
							This will probably go away either when we fix our existing ASes, or when
we kill the concept of non-ghost users. 
							
						 
						
							2016-01-18 16:33:05 +00:00  
				
					
						
							
							
								 
						
							
							
								74474a6d63 
								
							
								 
							
						 
						
							
							
								
								Pull out app service user lookup  
							
							... 
							
							
							
							I find this a lot simpler than nested try-catches and stuff 
							
						 
						
							2016-01-18 16:32:33 +00:00  
				
					
						
							
							
								 
						
							
							
								ac5a4477ad 
								
							
								 
							
						 
						
							
							
								
								Require unbanning before other membership changes  
							
							
							
						 
						
							2016-01-15 16:27:26 +00:00  
				
					
						
							
							
								 
						
							
							
								5819b7a78c 
								
							
								 
							
						 
						
							
							
								
								M_INVALID_USERNAME to be consistent with the parameter name  
							
							
							
						 
						
							2016-01-15 10:06:34 +00:00  
				
					
						
							
							
								 
						
							
							
								3f8db3d597 
								
							
								 
							
						 
						
							
							
								
								Add specific error code for invalid user names.  
							
							
							
						 
						
							2016-01-14 17:21:04 +00:00  
				
					
						
							
							
								 
						
							
							
								7d09ab8915 
								
							
								 
							
						 
						
							
							
								
								Require AS users to be registered before use  
							
							
							
						 
						
							2016-01-13 13:19:47 +00:00  
				
					
						
							
							
								 
						
							
							
								2110e35fd6 
								
							
								 
							
						 
						
							
							
								
								Introduce a Requester object  
							
							... 
							
							
							
							This tracks data about the entity which made the request. This is
instead of passing around a tuple, which requires call-site
modifications every time a new piece of optional context is passed
around.
I tried to introduce a User object. I gave up. 
							
						 
						
							2016-01-11 17:48:45 +00:00  
				
					
						
							
							
								 
						
							
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
				
					
						
							
							
								 
						
							
							
								392773ccb2 
								
							
								 
							
						 
						
							
							
								
								Guest users must be joined to a room to see it in /sync  
							
							
							
						 
						
							2016-01-06 16:44:13 +00:00  
				
					
						
							
							
								 
						
							
							
								cfd07aafff 
								
							
								 
							
						 
						
							
							
								
								Allow guests to upgrade their accounts  
							
							
							
						 
						
							2016-01-05 18:01:18 +00:00  
				
					
						
							
							
								 
						
							
							
								0ee0138325 
								
							
								 
							
						 
						
							
							
								
								Include the list of bad room ids in the error  
							
							
							
						 
						
							2015-12-22 15:49:32 +00:00  
				
					
						
							
							
								 
						
							
							
								c058625959 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into markjh/guest_access  
							
							... 
							
							
							
							Conflicts:
	synapse/api/filtering.py 
							
						 
						
							2015-12-22 13:58:18 +00:00  
				
					
						
							
							
								 
						
							
							
								b9b4466d0d 
								
							
								 
							
						 
						
							
							
								
								Add top level filters for filtering by room id  
							
							... 
							
							
							
							Documented by matrix-org/matrix-doc#246  
							
						 
						
							2015-12-22 11:40:32 +00:00  
				
					
						
							
							
								 
						
							
							
								45a9e0ae0c 
								
							
								 
							
						 
						
							
							
								
								Allow guest access if the user provides a list of rooms in the filter  
							
							
							
						 
						
							2015-12-22 10:25:46 +00:00  
				
					
						
							
							
								 
						
							
							
								489a4cd1cf 
								
							
								 
							
						 
						
							
							
								
								Add top level filtering by room id  
							
							
							
						 
						
							2015-12-21 21:10:41 +00:00  
				
					
						
							
							
								 
						
							
							
								8c5f252edb 
								
							
								 
							
						 
						
							
							
								
								Strip address and such out of 3pid invites  
							
							... 
							
							
							
							We're not meant to leak that into the graph 
							
						 
						
							2015-12-17 18:09:51 +01:00  
				
					
						
							
							
								 
						
							
							
								660dee94af 
								
							
								 
							
						 
						
							
							
								
								Only include the archived rooms if a include_leave flag in set in the filter  
							
							
							
						 
						
							2015-12-04 17:32:09 +00:00  
				
					
						
							
							
								 
						
							
							
								95f30ecd1f 
								
							
								 
							
						 
						
							
							
								
								Add API for setting account_data globaly or on a per room basis  
							
							
							
						 
						
							2015-12-01 18:41:32 +00:00  
				
					
						
							
							
								 
						
							
							
								17dd5071ef 
								
							
								 
							
						 
						
							
							
								
								Allow user to redact with an equal power  
							
							... 
							
							
							
							Users only need their power level to be equal to the redact level for
them to be allowed to redact events. 
							
						 
						
							2015-11-26 11:17:57 +00:00  
				
					
						
							
							
								 
						
							
							
								1cfda3d2d8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/forgetrooms  
							
							
							
						 
						
							2015-11-19 16:53:13 +00:00  
				
					
						
							
							
								 
						
							
							
								7a802ec0ff 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #386  from matrix-org/markjh/rename_pud_to_account_data  
							
							... 
							
							
							
							s/private_user_data/account_data/ 
							
						 
						
							2015-11-19 15:21:35 +00:00  
				
					
						
							
							
								 
						
							
							
								248cfd5eb3 
								
							
								 
							
						 
						
							
							
								
								Take a boolean not a list of lambdas  
							
							
							
						 
						
							2015-11-19 15:16:25 +00:00  
				
					
						
							
							
								 
						
							
							
								1c960fbb80 
								
							
								 
							
						 
						
							
							
								
								s/private_user_data/account_data/  
							
							
							
						 
						
							2015-11-18 15:31:04 +00:00  
				
					
						
							
							
								 
						
							
							
								ba26eb3d5d 
								
							
								 
							
						 
						
							
							
								
								Allow users to forget rooms  
							
							
							
						 
						
							2015-11-17 17:17:30 -05:00  
				
					
						
							
							
								 
						
							
							
								f20d064e05 
								
							
								 
							
						 
						
							
							
								
								Always check guest = true in macaroons  
							
							
							
						 
						
							2015-11-17 10:58:05 +00:00  
				
					
						
							
							
								 
						
							
							
								f5e25c5f35 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into sh-cas-auth-via-homeserver  
							
							
							
						 
						
							2015-11-17 10:55:41 +00:00  
				
					
						
							
							
								 
						
							
							
								dd2eb49385 
								
							
								 
							
						 
						
							
							
								
								Share more code between macaroon validation  
							
							
							
						 
						
							2015-11-11 11:12:35 +00:00  
				
					
						
							
							
								 
						
							
							
								38d82edf0e 
								
							
								 
							
						 
						
							
							
								
								Allow guest users to join and message rooms  
							
							
							
						 
						
							2015-11-10 16:57:13 +00:00  
				
					
						
							
							
								 
						
							
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							
							
						 
						
							2015-11-05 16:43:19 +00:00  
				
					
						
							
							
								 
						
							
							
								7a369e8a55 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #347  from matrix-org/markjh/check_filter  
							
							... 
							
							
							
							Remove fields that are both unspecified and unused from the filter checks 
							
						 
						
							2015-11-05 11:15:39 +00:00  
				
					
						
							
							
								 
						
							
							
								f522f50a08 
								
							
								 
							
						 
						
							
							
								
								Allow guests to register and call /events?room_id=  
							
							... 
							
							
							
							This follows the same flows-based flow as regular registration, but as
the only implemented flow has no requirements, it auto-succeeds. In the
future, other flows (e.g. captcha) may be required, so clients should
treat this like the regular registration flow choices. 
							
						 
						
							2015-11-04 17:29:07 +00:00  
				
					
						
							
							
								 
						
							
							
								285d056629 
								
							
								 
							
						 
						
							
							
								
								Remove fields that are both unspecified and unused from the filter checks, check the right top level definitions in the filter  
							
							
							
						 
						
							2015-11-04 15:47:19 +00:00  
				
					
						
							
							
								 
						
							
							
								57be722c46 
								
							
								 
							
						 
						
							
							
								
								Include room tags in v2 /sync  
							
							
							
						 
						
							2015-11-02 16:23:15 +00:00  
				
					
						
							
							
								 
						
							
							
								216c976399 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #323  from matrix-org/daniel/sizelimits  
							
							... 
							
							
							
							Reject events which are too large 
							
						 
						
							2015-10-23 11:26:03 +01:00