Erik Johnston
							
						 
						
							 
							
							
							
								
							
								183cacac90 
								
							
								 
							
						 
						
							
							
								
								Simplify query and handle finishing correctly  
							
							 
							
							
							
						 
						
							2016-04-22 10:01:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ae571810f2 
								
							
								 
							
						 
						
							
							
								
								Order NULLs first  
							
							 
							
							
							
						 
						
							2016-04-21 18:14:18 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3ddbb1687c 
								
							
								 
							
						 
						
							
							
								
								Fix query  
							
							 
							
							
							
						 
						
							2016-04-21 18:02:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8fae3d7b1e 
								
							
								 
							
						 
						
							
							
								
								Use special UPDATE syntax  
							
							 
							
							
							
						 
						
							2016-04-21 18:01:49 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b57dcb4b51 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							 
							
							
							
						 
						
							2016-04-21 17:49:00 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								26db18bc90 
								
							
								 
							
						 
						
							
							
								
								Need to do _background_update_progress_txn in actual transaction  
							
							 
							
							
							
						 
						
							2016-04-21 17:45:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e395eb1108 
								
							
								 
							
						 
						
							
							
								
								Update progress when creating index  
							
							 
							
							
							
						 
						
							2016-04-21 17:39:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3b0fa77f50 
								
							
								 
							
						 
						
							
							
								
								Fix SQL statement  
							
							 
							
							
							
						 
						
							2016-04-21 17:37:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								129e403487 
								
							
								 
							
						 
						
							
							
								
								Create index must be on a conn  
							
							 
							
							
							
						 
						
							2016-04-21 17:35:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								51bb339ab2 
								
							
								 
							
						 
						
							
							
								
								Create index concurrently  
							
							 
							
							
							
						 
						
							2016-04-21 17:16:11 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b743c1237e 
								
							
								 
							
						 
						
							
							
								
								Add missing run_upgrade  
							
							 
							
							
							
						 
						
							2016-04-21 17:12:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c877f0f034 
								
							
								 
							
						 
						
							
							
								
								Optimise event_search in postgres  
							
							 
							
							
							
						 
						
							2016-04-21 16:56:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								61c7edfd34 
								
							
								 
							
						 
						
							
							
								
								Add cache to _get_state_groups_from_groups  
							
							 
							
							
							
						 
						
							2016-04-19 17:22:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d213d69fe3 
								
							
								 
							
						 
						
							
							
								
								Add desc arg  
							
							 
							
							
							
						 
						
							2016-04-14 11:36:23 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								96bcfb29c7 
								
							
								 
							
						 
						
							
							
								
								Add index  
							
							 
							
							
							
						 
						
							2016-04-14 11:26:33 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a2546b9082 
								
							
								 
							
						 
						
							
							
								
								Fix query for get_unread_push_actions_for_user_in_range  
							
							 
							
							
							
						 
						
							2016-04-14 11:08:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								767fc0b739 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2016-04-13 14:23:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								54d08c8868 
								
							
								 
							
						 
						
							
							
								
								Only return unread notifications  
							
							 
							
							... 
							
							
							
							Make get_unread_push_actions_for_user_in_range only return unread event actions, being more true to its name. Done in two separate sql queries to get actions after a read receipt and those in a room wiht no receipt at all. SQL queries by Erik. 
							
						 
						
							2016-04-13 14:16:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d33d623f0d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #716  from matrix-org/dbkr/get_pushers  
							
							 
							
							... 
							
							
							
							Add get endpoint for pushers 
							
						 
						
							2016-04-12 14:40:37 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7984ffdc6a 
								
							
								 
							
						 
						
							
							
								
								Unneccessarywhitespaceisunnecessary  
							
							 
							
							
							
						 
						
							2016-04-12 13:55:57 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c1267d04c5 
								
							
								 
							
						 
						
							
							
								
								Oops, forgot the desc.  
							
							 
							
							
							
						 
						
							2016-04-12 13:55:32 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								44891b4a0a 
								
							
								 
							
						 
						
							
							
								
								Tidy up get_pusher functions  
							
							 
							
							... 
							
							
							
							Decodes pushers rows on the main thread rather than the db thread and uses _simple_select_list. Also do the same to the function I copied and factor out the duplication into a helper function. 
							
						 
						
							2016-04-12 13:47:17 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7b39bcdaae 
								
							
								 
							
						 
						
							
							
								
								Mis-named function  
							
							 
							
							
							
						 
						
							2016-04-12 13:35:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								762ada1e07 
								
							
								 
							
						 
						
							
							
								
								Add back backfilled parameter that was removed  
							
							 
							
							
							
						 
						
							2016-04-12 11:58:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cccf86dd05 
								
							
								 
							
						 
						
							
							
								
								Check if we've already backfilled events  
							
							 
							
							
							
						 
						
							2016-04-12 11:19:32 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8a76094965 
								
							
								 
							
						 
						
							
							
								
								Add get endpoint for pushers  
							
							 
							
							... 
							
							
							
							As per https://github.com/matrix-org/matrix-doc/pull/308  
							
						 
						
							2016-04-11 18:00:03 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2547dffccc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #705  from matrix-org/dbkr/pushers_use_event_actions  
							
							 
							
							... 
							
							
							
							Change pushers to use the event_actions table 
							
						 
						
							2016-04-11 12:58:55 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								4bd3d25218 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #688  from matrix-org/matthew/preview_urls  
							
							 
							
							... 
							
							
							
							URL previewing support 
							
						 
						
							2016-04-11 10:40:29 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6ff7a79308 
								
							
								 
							
						 
						
							
							
								
								move local_media_repository_url_cache.sql to schema v31  
							
							 
							
							
							
						 
						
							2016-04-08 19:09:02 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								2460d904bd 
								
							
								 
							
						 
						
							
							
								
								fix error checking for new SQL  
							
							 
							
							
							
						 
						
							2016-04-08 19:04:29 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								fb83f6a1fc 
								
							
								 
							
						 
						
							
							
								
								fix SQL based on PR feedback  
							
							 
							
							
							
						 
						
							2016-04-08 18:55:38 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ed3979df5f 
								
							
								 
							
						 
						
							
							
								
								Fix invite pushes  
							
							 
							
							... 
							
							
							
							* If the event is an invite event, add the invitee to list of user we run push rules for (if they have a pusher etc)
 * Move invite_for_me to be higher prio than member events otherwise member events matches them
 * Spell override right 
							
						 
						
							2016-04-08 15:29:59 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7e2f971c08 
								
							
								 
							
						 
						
							
							
								
								Remove some unused functions ( #711 )  
							
							 
							
							... 
							
							
							
							* Remove some unused functions
* get_room_events_stream is only used in tests
* is_exclusive_room might actually be something we want 
							
						 
						
							2016-04-08 14:01:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d9f38561c8 
								
							
								 
							
						 
						
							
							
								
								Literally a dictionary  
							
							 
							
							
							
						 
						
							2016-04-07 17:45:01 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4836864f56 
								
							
								 
							
						 
						
							
							
								
								generate id in the main thread  
							
							 
							
							
							
						 
						
							2016-04-07 17:38:48 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3fb35cbd6f 
								
							
								 
							
						 
						
							
							
								
								Oops, inequality fail  
							
							 
							
							
							
						 
						
							2016-04-07 17:33:37 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								d6e7333ae4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/preview_urls  
							
							 
							
							
							
						 
						
							2016-04-07 17:26:44 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ceb599e789 
								
							
								 
							
						 
						
							
							
								
								Add tests for redactions  
							
							 
							
							
							
						 
						
							2016-04-07 16:52:07 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								05d044aac3 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2016-04-07 16:45:38 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2d5c693fd3 
								
							
								 
							
						 
						
							
							
								
								Fix port script for changes merged from develop  
							
							 
							
							
							
						 
						
							2016-04-07 16:43:54 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9c99ab4572 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions  
							
							 
							
							
							
						 
						
							2016-04-07 16:35:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								92e3071623 
								
							
								 
							
						 
						
							
							
								
								Send badge count pushes.  
							
							 
							
							... 
							
							
							
							Also fix bugs with retrying. 
							
						 
						
							2016-04-07 15:39:53 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0fd1cd2400 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2016-04-06 16:50:47 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e815763b7f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #697  from matrix-org/markjh/slaveI  
							
							 
							
							... 
							
							
							
							Add a slaved events store class 
							
						 
						
							2016-04-06 16:19:25 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7e2c89a37f 
								
							
								 
							
						 
						
							
							
								
								Make pushers use the event_push_actions table instead of listening on an event stream & running the rules again. Sytest passes, but remaining to do:  
							
							 
							
							... 
							
							
							
							* Make badges work again
 * Remove old, unused code 
							
						 
						
							2016-04-06 15:42:15 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b713934b2e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #698  from matrix-org/erikj/port_script_fix  
							
							 
							
							... 
							
							
							
							Don't require config to create database 
							
						 
						
							2016-04-06 14:32:45 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								75fb9ac1be 
								
							
								 
							
						 
						
							
							
								
								Add a slaved events store class  
							
							 
							
							... 
							
							
							
							Add a test to check that get_room_names_and_aliases does the same
thing on both the master and on the slave data store. 
							
						 
						
							2016-04-06 14:18:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8aab9d87fa 
								
							
								 
							
						 
						
							
							
								
								Don't require config to create database  
							
							 
							
							
							
						 
						
							2016-04-06 14:15:45 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7d11f825aa 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #694  from matrix-org/markjh/caches  
							
							 
							
							... 
							
							
							
							Move _get_cache_dict into the SQLBaseStore 
							
						 
						
							2016-04-06 13:21:25 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								87f2dec8d4 
								
							
								 
							
						 
						
							
							
								
								Make the cache objects be per instance rather than being global  
							
							 
							
							
							
						 
						
							2016-04-06 13:08:05 +01:00