Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5fefc12d1e
								
							
								
							
						 | 
						
							
							
								
								Begin implementing state groups.
							
							
							
							
							
						 | 
						
							2014-10-14 16:59:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								9605593d11
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into server2server_signing
							
							
							
							
							
							
							
							Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py 
							
						 | 
						
							2014-09-30 17:55:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b95a178584
								
							
								
							
						 | 
						
							
							
								
								SYN-75 Verify signatures on server to server transactions
							
							
							
							
							
						 | 
						
							2014-09-30 15:15:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								fbf6320614
								
							
								
							
						 | 
						
							
							
								
								pyflakes cleanup
							
							
							
							
							
						 | 
						
							2014-09-30 12:38:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1550ab9e2f
								
							
								
							
						 | 
						
							
							
								
								SYN-48: Delete dead code
							
							
							
							
							
						 | 
						
							2014-09-29 15:04:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3ccb17ce59
								
							
								
							
						 | 
						
							
							
								
								SYN-48: Implement WHOIS rest servlet
							
							
							
							
							
						 | 
						
							2014-09-29 14:59:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								f7d80930f2
								
							
								
							
						 | 
						
							
							
								
								SYN-48: Track User-Agents as well as IPs for client devices.
							
							
							
							
							
						 | 
						
							2014-09-29 13:35:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								0fdf308874
								
							
								
							
						 | 
						
							
							
								
								Track the IP users connect with. Add an admin column to users table.
							
							
							
							
							
						 | 
						
							2014-09-26 16:36:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								37bfe44046
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'deletions' of github.com:matrix-org/synapse into develop
							
							
							
							
							
						 | 
						
							2014-09-25 17:02:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								c818aa13eb
								
							
								
							
						 | 
						
							
							
								
								Add LIMIT to scalar subquery
							
							
							
							
							
						 | 
						
							2014-09-25 15:51:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								ba87eb6753
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we tried to insert state events with null state key
							
							
							
							
							
						 | 
						
							2014-09-25 14:45:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								70899d3ab2
								
							
								
							
						 | 
						
							
							
								
								Rename deletions to redactions
							
							
							
							
							
						 | 
						
							2014-09-24 15:27:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								7d9a84a445
								
							
								
							
						 | 
						
							
							
								
								Make deleting deletes not undelete
							
							
							
							
							
						 | 
						
							2014-09-24 14:18:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1e6c5b205c
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we didn't correctly pull out the event_id of the deletion
							
							
							
							
							
						 | 
						
							2014-09-24 13:29:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								4354590a69
								
							
								
							
						 | 
						
							
							
								
								Add v4 deltas to current sql.
							
							
							
							
							
						 | 
						
							2014-09-24 11:06:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								efea61dc50
								
							
								
							
						 | 
						
							
							
								
								Rename 'pruned' to 'pruned_because'
							
							
							
							
							
						 | 
						
							2014-09-23 17:40:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b99f6eb904
								
							
								
							
						 | 
						
							
							
								
								Make sure we don't persist the 'pruned' key
							
							
							
							
							
						 | 
						
							2014-09-23 15:29:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								78af6bbb98
								
							
								
							
						 | 
						
							
							
								
								Add m.room.deletion. If an event is deleted it will be returned to clients 'pruned', i.e. all client specified keys will be removed.
							
							
							
							
							
						 | 
						
							2014-09-23 15:28:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								4571cf7baa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into test-sqlite-memory
							
							
							
							
							
						 | 
						
							2014-09-17 18:27:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								59516a8bb1
								
							
								
							
						 | 
						
							
							
								
								Correctly handle receiving 'missing' Pdus from federation, rather than just discarding them.
							
							
							
							
							
						 | 
						
							2014-09-15 16:40:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								b0406b9ead
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
							
							
							
							
							
						 | 
						
							2014-09-15 14:15:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								667e747ed1
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we no longer stored user_id on Pdus
							
							
							
							
							
						 | 
						
							2014-09-12 17:56:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								a87eac4308
								
							
								
							
						 | 
						
							
							
								
								Revert recent changes to RoomMemberStore
							
							
							
							
							
						 | 
						
							2014-09-12 15:51:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								e53d77b501
								
							
								
							
						 | 
						
							
							
								
								Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool
							
							
							
							
							
						 | 
						
							2014-09-12 14:28:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								aaf9ab68c6
								
							
								
							
						 | 
						
							
							
								
								Rename _store_room_member_txn to _store_room_member_from_event_txn so we can create another, more sensible function of that name
							
							
							
							
							
						 | 
						
							2014-09-11 18:44:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								55397f6347
								
							
								
							
						 | 
						
							
							
								
								prepare_database() on db_conn, not plain name, so we can pass in the connection from outside
							
							
							
							
							
						 | 
						
							2014-09-10 16:23:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								ce55a8cc4b
								
							
								
							
						 | 
						
							
							
								
								Move database preparing code out of homserver.py into storage where it belongs
							
							
							
							
							
						 | 
						
							2014-09-10 15:42:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								a75f8686ba
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we used an unbound local variable if we ended up rolling back the persist_event transaction
							
							
							
							
							
						 | 
						
							2014-09-09 16:27:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e062f2dfa8
								
							
								
							
						 | 
						
							
							
								
								Apparently we can't do txn.rollback(), so raise and catch an exception instead.
							
							
							
							
							
						 | 
						
							2014-09-08 22:37:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								c0577ea87a
								
							
								
							
						 | 
						
							
							
								
								Rollback if we try and insert duplicate events
							
							
							
							
							
						 | 
						
							2014-09-08 18:34:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								781ff713ba
								
							
								
							
						 | 
						
							
							
								
								When getting a state event also include the previous content
							
							
							
							
							
						 | 
						
							2014-09-06 02:23:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								8a7c1d6a00
								
							
								
							
						 | 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
							
							
							
							
							
						 | 
						
							2014-09-03 17:31:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								4b8244fbf8
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we didn't correctly store the ops power levels event.
							
							
							
							
							
						 | 
						
							2014-09-02 12:12:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								f452899fe2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into room_config
							
							
							
							
							
						 | 
						
							2014-09-01 19:57:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								db7109c43b
								
							
								
							
						 | 
						
							
							
								
								Add beginnings of ban support.
							
							
							
							
							
						 | 
						
							2014-09-01 16:15:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								865469f233
								
							
								
							
						 | 
						
							
							
								
								Implement power level lists, default power levels and send_evnet_level/add_state_level events.
							
							
							
							
							
						 | 
						
							2014-09-01 14:39:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1118f02689
								
							
								
							
						 | 
						
							
							
								
								Start adding storage for new events.
							
							
							
							
							
						 | 
						
							2014-08-29 15:18:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								d7ae9b90a0
								
							
								
							
						 | 
						
							
							
								
								Add store for server certificates and keys
							
							
							
							
							
						 | 
						
							2014-08-28 18:19:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f54b70520a
								
							
								
							
						 | 
						
							
							
								
								Return the store_id from persist_event
							
							
							
							
							
						 | 
						
							2014-08-27 17:03:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b30358f439
								
							
								
							
						 | 
						
							
							
								
								add _get_room_member, fix datastore methods
							
							
							
							
							
						 | 
						
							2014-08-27 16:51:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a03c7f27a8
								
							
								
							
						 | 
						
							
							
								
								Fill out prev_events before calling persist_event
							
							
							
							
							
						 | 
						
							2014-08-27 14:32:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								bf05218c4b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into storage_transactions
							
							
							
							
							
						 | 
						
							2014-08-27 11:19:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								c65885e166
								
							
								
							
						 | 
						
							
							
								
								Added support for GET /events/$eventid with auth checks.
							
							
							
							
							
						 | 
						
							2014-08-27 10:33:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								d2798de660
								
							
								
							
						 | 
						
							
							
								
								Fold federation/handler into handlers/federation
							
							
							
							
							
						 | 
						
							2014-08-26 19:49:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								64e2a5d58e
								
							
								
							
						 | 
						
							
							
								
								Move pdu and event persistence into a single persist_event function
							
							
							
							
							
						 | 
						
							2014-08-26 18:01:36 +01:00 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								ac21dfff6d
								
							
								
							
						 | 
						
							
							
								
								Fix pyflakes errors
							
							
							
							
							
						 | 
						
							2014-08-26 16:02:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								32347bfcc9
								
							
								
							
						 | 
						
							
							
								
								fix a few pyflakes errors
							
							
							
							
							
						 | 
						
							2014-08-26 16:01:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4b2ad549d5
								
							
								
							
						 | 
						
							
							
								
								Move the event storage into a single transaction
							
							
							
							
							
						 | 
						
							2014-08-26 14:36:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								1379dcae6f
								
							
								
							
						 | 
						
							
							
								
								Take a snapshot of the state of the room before performing updates
							
							
							
							
							
						 | 
						
							2014-08-22 17:00:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								808f663ed1
								
							
								
							
						 | 
						
							
							
								
								Don't return state event outlier's when paginating.
							
							
							
							
							
						 | 
						
							2014-08-22 13:06:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e8244c23ba
								
							
								
							
						 | 
						
							
							
								
								Give the event_id of the failed event
							
							
							
							
							
						 | 
						
							2014-08-20 15:53:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								840771190f
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we sometimes set min_token to None.
							
							
							
							
							
						 | 
						
							2014-08-19 14:32:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								75b6d982a0
								
							
								
							
						 | 
						
							
							
								
								Add a 'backfill room' button
							
							
							
							
							
						 | 
						
							2014-08-19 14:20:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								709a92cee8
								
							
								
							
						 | 
						
							
							
								
								SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns.
							
							
							
							
							
						 | 
						
							2014-08-18 16:00:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								fc26275bb3
								
							
								
							
						 | 
						
							
							
								
								Add two different columns for ordering the events table, one which can be used for pagination and one which can be as tokens for notifying clients. Also add a 'processed' field which is currently always set to True
							
							
							
							
							
						 | 
						
							2014-08-18 15:50:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								506711749f
								
							
								
							
						 | 
						
							
							
								
								We no longer need to special case room config events.
							
							
							
							
							
						 | 
						
							2014-08-15 16:45:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								d260a42ca2
								
							
								
							
						 | 
						
							
							
								
								PEP8 cleanups
							
							
							
							
							
						 | 
						
							2014-08-15 16:17:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								01f089d9fb
								
							
								
							
						 | 
						
							
							
								
								Correctly return new token when returning events. Serialize events correctly.
							
							
							
							
							
						 | 
						
							2014-08-15 15:28:54 +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
							
						 | 
						
							
							
							
							
								
							
								78b501eba6
								
							
								
							
						 | 
						
							
							
								
								Fix typo
							
							
							
							
							
						 | 
						
							2014-08-14 17:09:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2529f2bc01
								
							
								
							
						 | 
						
							
							
								
								Rename _execute_query
							
							
							
							
							
						 | 
						
							2014-08-14 16:58:51 +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
							
						 | 
						
							
							
							
							
								
							
								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 |