David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							195254cae8 
							
						 
					 
					
						
						
							
							Inject fake room list handler in tests  
						
						... 
						
						
						
						Otherwise it tries to start the remote public room list updating looping call which breaks. 
						
						
					 
					
						2016-06-01 11:14:16 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							43db0d9f6a 
							
						 
					 
					
						
						
							
							Add get_users_with_read_receipts_in_room cache  
						
						
						
						
					 
					
						2016-06-01 10:54:32 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							8e539f13c0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider  
						
						
						
						
					 
					
						2016-06-01 09:54:36 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							6ecb2ca4ec 
							
						 
					 
					
						
						
							
							pep8  
						
						
						
						
					 
					
						2016-06-01 09:48:55 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							58ee43d020 
							
						 
					 
					
						
						
							
							handle emotes & notices correctly in email notifs  
						
						
						
						
					 
					
						2016-05-31 20:28:42 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							2a449fec4d 
							
						 
					 
					
						
						
							
							Add cache to remote room lists  
						
						... 
						
						
						
						Poll for updates from remote servers, waiting for the poll if there's no cache entry. 
						
						
					 
					
						2016-05-31 18:27:23 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							6ca4d3ae9a 
							
						 
					 
					
						
						
							
							Add vector.im to default secondary_directory_servers and add comment explaining it's not a permanent solution  
						
						
						
						
					 
					
						2016-05-31 17:24:50 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							dea9f20f8c 
							
						 
					 
					
						
						
							
							Force boolean  
						
						
						
						
					 
					
						2016-05-31 17:24:30 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							963e3ed282 
							
						 
					 
					
						
						
							
							Apparently I am not permitted to have two blank lines here  
						
						
						
						
					 
					
						2016-05-31 17:22:53 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							d240796ded 
							
						 
					 
					
						
						
							
							Basic, un-cached support for secondary_directory_servers  
						
						
						
						
					 
					
						2016-05-31 17:20:07 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							c8c5bf950a 
							
						 
					 
					
						
						
							
							Fix synapse/storage/schema/delta/30/as_users.py  
						
						
						
						
					 
					
						2016-05-31 17:10:40 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							c9ca285d33 
							
						 
					 
					
						
						
							
							Merge pull request  #805  from matrix-org/erikj/push_rules_cache  
						
						... 
						
						
						
						Fix GET /push_rules 
						
						
					 
					
						2016-05-31 16:42:21 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1d4ee854e2 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2016-05-31 15:45:53 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							cca0093fa9 
							
						 
					 
					
						
						
							
							Change fix  
						
						
						
						
					 
					
						2016-05-31 15:44:08 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							4efa389299 
							
						 
					 
					
						
						
							
							Fix GET /push_rules  
						
						
						
						
					 
					
						2016-05-31 15:37:53 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							aefd2d1cbc 
							
						 
					 
					
						
						
							
							Cache get_event_reference_hashes  
						
						
						
						
					 
					
						2016-05-31 15:32:32 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							10de8c2631 
							
						 
					 
					
						
						
							
							Merge pull request  #804  from matrix-org/erikj/push_rules_cache  
						
						... 
						
						
						
						Add caches to bulk_get_push_rules* 
						
						
					 
					
						2016-05-31 15:04:40 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							014e0799f9 
							
						 
					 
					
						
						
							
							Merge pull request  #803  from matrix-org/markjh/liberate_appservice_handler  
						
						... 
						
						
						
						Move the AS handler out of the Handlers object. 
						
						
					 
					
						2016-05-31 14:31:19 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e5b0bbcd33 
							
						 
					 
					
						
						
							
							Add caches to bulk_get_push_rules*  
						
						
						
						
					 
					
						2016-05-31 13:46:58 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							70ecb415f5 
							
						 
					 
					
						
						
							
							Fix c+p fail  
						
						
						
						
					 
					
						2016-05-31 12:00:54 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							e1625d62a8 
							
						 
					 
					
						
						
							
							Add federation room list servlet  
						
						
						
						
					 
					
						2016-05-31 11:55:57 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							163e48c0e3 
							
						 
					 
					
						
						
							
							Merge pull request  #802  from matrix-org/dbkr/split_room_list_handler  
						
						... 
						
						
						
						Split out the room list handler 
						
						
					 
					
						2016-05-31 11:32:44 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							42a9ea37e4 
							
						 
					 
					
						
						
							
							Merge pull request  #801  from ruma/readme-history-storage  
						
						... 
						
						
						
						Alter phrasing to clarify where info is stored. 
						
						
					 
					
						2016-05-29 10:37:04 +01:00 
						 
				 
			
				
					
						
							
							
								Jimmy Cuadra 
							
						 
					 
					
						
						
						
						
							
						
						
							8b5dbee47e 
							
						 
					 
					
						
						
							
							Alter phrasing to clarify where info is stored.  
						
						... 
						
						
						
						A user on #matrix:matrix.org was confused by the phrasing of the first
sentence in the paragraph and couldn't tell whether it was saying that
the homeserver stored the data or the clients did. This change splits it
into two sentences to make the subject of each sentence clear. 
						
						
					 
					
						2016-05-29 02:31:56 -07:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							85b992f621 
							
						 
					 
					
						
						
							
							Fix to allow start with postgres  
						
						
						
						
					 
					
						2016-05-27 10:44:44 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							cc84f7cb8e 
							
						 
					 
					
						
						
							
							Send down correct error response if user not found  
						
						
						
						
					 
					
						2016-05-27 10:35:15 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							209ba4d024 
							
						 
					 
					
						
						
							
							Merge pull request  #795  from matrix-org/dbkr/delete_push_actions_after_a_month  
						
						... 
						
						
						
						Only delete push actions after 30 days 
						
						
					 
					
						2016-05-24 16:22:13 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b007ee4606 
							
						 
					 
					
						
						
							
							Check for presence of 'avatar_url' key  
						
						
						
						
					 
					
						2016-05-24 15:12:05 +01:00 
						 
				 
			
				
					
						
							
							
								Matrix 
							
						 
					 
					
						
						
						
						
							
						
						
							95b86e6dad 
							
						 
					 
					
						
						
							
							tweak mail notifs  
						
						
						
						
					 
					
						2016-05-24 14:52:29 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							cbf8d146ac 
							
						 
					 
					
						
						
							
							Merge pull request  #799  from matrix-org/matthew/quieter-email-notifs  
						
						... 
						
						
						
						Tune email notifs to make them quieter: 
						
						
					 
					
						2016-05-24 14:30:51 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							faad233ea6 
							
						 
					 
					
						
						
							
							Change short circuit path  
						
						
						
						
					 
					
						2016-05-24 14:27:19 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6900303997 
							
						 
					 
					
						
						
							
							Don't send down all ephemeral events  
						
						
						
						
					 
					
						2016-05-24 11:44:55 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							37b7e84620 
							
						 
					 
					
						
						
							
							Include the ts the notif was received at  
						
						
						
						
					 
					
						2016-05-24 11:33:32 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1c5ed2a19b 
							
						 
					 
					
						
						
							
							Only work out newly_joined_users for incremental sync  
						
						
						
						
					 
					
						2016-05-24 11:21:34 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b08ad0389e 
							
						 
					 
					
						
						
							
							Only include non-offline presence in initial sync  
						
						
						
						
					 
					
						2016-05-24 11:15:05 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							be2c677386 
							
						 
					 
					
						
						
							
							Spell builder correctly  
						
						
						
						
					 
					
						2016-05-24 10:53:03 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							79bea8ab9a 
							
						 
					 
					
						
						
							
							Inline function. Make load_filtered_recents private  
						
						
						
						
					 
					
						2016-05-24 10:22:24 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							84f94e4cbb 
							
						 
					 
					
						
						
							
							Add comments  
						
						
						
						
					 
					
						2016-05-24 10:14:53 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d16cc52b5d 
							
						 
					 
					
						
						
							
							Merge pull request  #798  from negzi/bugfix_create_user_feature  
						
						... 
						
						
						
						Fix set profile error with Requester. 
						
						
					 
					
						2016-05-24 10:13:53 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							137e6a4557 
							
						 
					 
					
						
						
							
							Shuffle things room  
						
						
						
						
					 
					
						2016-05-24 09:50:55 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							680f1d9387 
							
						 
					 
					
						
						
							
							catch thinko in presentable names  
						
						
						
						
					 
					
						2016-05-23 22:55:11 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							cb8a321bdd 
							
						 
					 
					
						
						
							
							fix NPE in room ordering  
						
						
						
						
					 
					
						2016-05-23 22:54:56 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							d437882581 
							
						 
					 
					
						
						
							
							fix debug text  
						
						
						
						
					 
					
						2016-05-23 22:54:32 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							88ea5ab2c3 
							
						 
					 
					
						
						
							
							consistency is the better part of valour  
						
						
						
						
					 
					
						2016-05-23 19:33:45 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							989bdc9e56 
							
						 
					 
					
						
						
							
							Tune email notifs to make them quieter:  
						
						... 
						
						
						
						* After initial 10 minute window, only alert every 24h for room notifs
 * Reset room state after 6h of idleness
 * Synchronise throttles for messages sent in the same notif, so the 24 hourly notifs 'line up'
 * Fix the email subjects to say what triggered the notification
 * Order the rooms in reverse activity order in the email, so the 'reason' room should always come first 
						
						
					 
					
						2016-05-23 19:24:11 +01:00 
						 
				 
			
				
					
						
							
							
								Negi Fazeli 
							
						 
					 
					
						
						
						
						
							
						
						
							6fe04ffef2 
							
						 
					 
					
						
						
							
							Fix set profile error with Requester.  
						
						... 
						
						
						
						Replace flush_user with delete access token due to function removal
Add a new test case for if the user is already registered 
						
						
					 
					
						2016-05-23 19:50:28 +02:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b791a530da 
							
						 
					 
					
						
						
							
							Actually make the 'read' flag correct  
						
						
						
						
					 
					
						2016-05-23 18:48:02 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							a24bc5b2dc 
							
						 
					 
					
						
						
							
							Add GET /notifications API  
						
						
						
						
					 
					
						2016-05-23 18:33:51 +01:00