matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Unnecessary new line	David Baker	2015-01-28	1	-1/+0
\|
*	Oops, bad merge: needed to change the base class of the rest servlets too.	David Baker	2015-01-28	2	-4/+4
\|
*	Merge branch 'develop' into pushers	David Baker	2015-01-28	14	-104/+158
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/handlers/events.py synapse/server.py
\| *	Pass the current time to serialize event, rather than passing an	Mark Haines	2015-01-26	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \|	HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed.
\| *	Add client v2_alpha resource to synapse server resource tree	Mark Haines	2015-01-23	2	-0/+67
\| \|
\| *	Extract the client v1 base RestServlet to a separate class	Mark Haines	2015-01-23	11	-72/+44
\| \|
\| *	Replace hs.parse_roomalias with RoomAlias.from_string	Mark Haines	2015-01-23	2	-6/+7
\| \|
\| *	Replace hs.parse_roomid with RoomID.from_string	Mark Haines	2015-01-23	1	-2/+2
\| \|
\| *	Replace hs.parse_userid with UserID.from_string	Mark Haines	2015-01-23	4	-16/+21
\| \|
\| *	Merge rest servlets into the client json resource object	Mark Haines	2015-01-23	1	-11/+7
\| \|
* \|	Add API to delete push rules.	David Baker	2015-01-23	1	-1/+40
\| \|
* \|	Use push settings!	David Baker	2015-01-23	1	-14/+29
\| \|
* \|	more pep8	David Baker	2015-01-23	1	-2/+4
\| \|
* \|	Make string format tuple an actual tuple	David Baker	2015-01-23	1	-1/+1
\| \|
* \|	redundant parens	David Baker	2015-01-23	1	-1/+1
\| \|
* \|	stray space	David Baker	2015-01-23	1	-1/+1
\| \|
* \|	make per-device rules work	David Baker	2015-01-23	1	-5/+15
\| \|
* \|	Add slightly pedantic trailing slash error.	David Baker	2015-01-23	1	-2/+13
\| \|
* \|	Fix adding rules without before/after & add the rule that we couldn't find ↵	David Baker	2015-01-23	1	-2/+2
\| \| \| \| \| \| \| \|	to the error
* \|	This really serves me right for ever making a map called 'map'.	David Baker	2015-01-23	1	-1/+1
\| \|
* \|	As yet fairly untested GET API for push rules	David Baker	2015-01-22	1	-10/+128
\| \|
* \|	Merge branch 'develop' into pushers	David Baker	2015-01-22	3	-1/+278
\|/ \| \| \| \|	Conflicts: synapse/rest/__init__.py
*	Move rest APIs back under the rest directory	Mark Haines	2015-01-22	14	-0/+1797