Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4b63b06cad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into storage_transactions
							
							
							
							
							
							
							
							Conflicts:
	synapse/api/auth.py
	synapse/handlers/room.py
	synapse/storage/__init__.py 
							
						 | 
						
							2014-08-26 16:07:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4b2ad549d5
								
							
								
							
						 | 
						
							
							
								
								Move the event storage into a single transaction
							
							
							
							
							
						 | 
						
							2014-08-26 14:36:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								063e1b22e6
								
							
								
							
						 | 
						
							
							
								
								Stop internal keys from getting into SynapseEvents
							
							
							
							
							
						 | 
						
							2014-08-21 15:06:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								d260a42ca2
								
							
								
							
						 | 
						
							
							
								
								PEP8 cleanups
							
							
							
							
							
						 | 
						
							2014-08-15 16:17:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								114984a236
								
							
								
							
						 | 
						
							
							
								
								Start chagning the events stream to work with the new DB schema
							
							
							
							
							
						 | 
						
							2014-08-15 13:58:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5002efa31b
								
							
								
							
						 | 
						
							
							
								
								Reimplement the get public rooms api to work with new DB schema
							
							
							
							
							
						 | 
						
							2014-08-15 10:26:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2c46bb6208
								
							
								
							
						 | 
						
							
							
								
								Fix up typos and correct sql queries
							
							
							
							
							
						 | 
						
							2014-08-14 18:40:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								661c711765
								
							
								
							
						 | 
						
							
							
								
								Start fixing places that use the data store.
							
							
							
							
							
						 | 
						
							2014-08-14 17:34:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2529f2bc01
								
							
								
							
						 | 
						
							
							
								
								Rename _execute_query
							
							
							
							
							
						 | 
						
							2014-08-14 16:58:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								937c175029
								
							
								
							
						 | 
						
							
							
								
								Fix up RoomMemberStore to work with the new schema.
							
							
							
							
							
						 | 
						
							2014-08-14 16:02:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								6d6a1c3454
								
							
								
							
						 | 
						
							
							
								
								Actually encode dicts as json in the DB
							
							
							
							
							
						 | 
						
							2014-08-14 14:30:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								10294b6082
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
							
							
							Conflicts:
	synapse/storage/_base.py 
							
						 | 
						
							2014-08-14 10:01:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								d05aa651f8
								
							
								
							
						 | 
						
							
							
								
								An initial hack at storing presence state-change mtimes in database and presenting age durations to clients/federation events
							
							
							
							
							
						 | 
						
							2014-08-13 19:19:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								baf04be5cf
								
							
								
							
						 | 
						
							
							
								
								Set datastore's .hs field in SQLBaseStore rather than in the toplevel DataStore mixed-in result class
							
							
							
							
							
						 | 
						
							2014-08-13 19:19:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								336987bb8d
								
							
								
							
						 | 
						
							
							
								
								Initial stab at refactoring the SQL tables, including rejigging some of the storage layer.
							
							
							
							
							
						 | 
						
							2014-08-13 18:03:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								f98e6380f1
								
							
								
							
						 | 
						
							
							
								
								add in whitespace after copyright statements to improve legibility
							
							
							
							
							
						 | 
						
							2014-08-13 03:14:34 +01:00 | 
						
					
				
					
						
							
							
								 
								matrix.org
							
						 | 
						
							
							
							
							
								
							
								4f475c7697
								
							
								
							
						 | 
						
							
							
								
								Reference Matrix Home Server
							
							
							
							
							
						 | 
						
							2014-08-12 15:10:52 +01:00 |