14 Commits

Author	SHA1	Message	Date
Paul "LeoNerd" Evans	4571cf7baa	Merge branch 'develop' into test-sqlite-memory	2014-09-17 18:27:47 +01:00
Paul "LeoNerd" Evans	9973298e2a	Print expected-vs-actual data types on typecheck failure from check_json()	2014-09-17 15:27:45 +01:00
Erik Johnston	1e4b971f95	Fix bug where we didn't always get 'prev_content' key	2014-09-15 17:43:46 +01:00
Erik Johnston	40d2f38abe	Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than the reverse. Don't transmit age_ts to clients for now.	2014-09-15 16:55:39 +01:00
Erik Johnston	5bd9369a62	Correctly handle the 'age' key in events and pdus	2014-09-15 13:26:11 +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	b8ab9f1c0a	Add all the necessary checks to make banning work.	2014-09-01 18:24:56 +01:00
Erik Johnston	d2bc5d6f29	Create the correct events with the right configuration when creating a new room.	2014-08-28 10:59:15 +01:00
Erik Johnston	fea7b60cf3	Add 'state_key' to valid_keys	2014-08-26 09:40:58 +01:00
Erik Johnston	b52b33acf6	Send down state_key to clients	2014-08-26 09:40:29 +01:00
Erik Johnston	063e1b22e6	Stop internal keys from getting into SynapseEvents	2014-08-21 15:06:00 +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