2282 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	6d485dd1c7	unnecessary newlines	2015-01-28 14:48:42 +00:00
David Baker	fb0928097a	More magic commas (including the place I copied it from...)	2015-01-28 14:48:07 +00:00
David Baker	0cbb6b0f52	Google doc style	2015-01-28 14:44:41 +00:00
David Baker	2cfdfee572	spaces	2015-01-28 14:41:51 +00:00
David Baker	289a249874	Unnecessary newlines.	2015-01-28 14:39:03 +00:00
David Baker	3cb5b73c0d	Unnecessary newline.	2015-01-28 14:37:55 +00:00
David Baker	8807f4170e	Better style	2015-01-28 14:35:00 +00:00
David Baker	032f8d4ed3	Another superfluous newline	2015-01-28 14:33:15 +00:00
David Baker	d93ce29a86	Ah, the comma of doom.	2015-01-28 14:27:01 +00:00
David Baker	6741c3dbd9	Brackets are nicer	2015-01-28 14:26:03 +00:00
David Baker	4fbf2328c2	Unnecessary new line	2015-01-28 14:24:28 +00:00
David Baker	30fbba168b	Easy on the newlines	2015-01-28 14:23:16 +00:00
David Baker	dd3abbd61f	2015	2015-01-28 14:22:39 +00:00
David Baker	6fde707add	doc style fix	2015-01-28 14:14:49 +00:00
David Baker	5f2665320f	It is 2015	2015-01-28 14:11:45 +00:00
David Baker	20c47383dc	Oops, bad merge: needed to change the base class of the rest servlets too.	2015-01-28 14:10:46 +00:00
David Baker	03149ad23a	More code style things	2015-01-28 14:01:24 +00:00
David Baker	e1ca0f1396	Brackets rather than slashes at end	2015-01-28 13:58:32 +00:00
David Baker	6df6f5e084	Redundant bracketing & missed space	2015-01-28 13:56:35 +00:00
David Baker	ca7240a2f0	Update copyright	2015-01-28 13:17:55 +00:00
David Baker	fb532d8425	Unused import	2015-01-28 13:06:09 +00:00
David Baker	c291a4d522	Merge branch 'develop' into pushers ... Conflicts: synapse/handlers/events.py synapse/server.py	2015-01-28 12:51:05 +00:00
David Baker	273b12729b	Reset badge count to zero when last active time is bumped	2015-01-28 11:55:49 +00:00
David Baker	f7c4daa8f9	Oops, remove debugging	2015-01-27 16:08:47 +00:00
David Baker	5eacaeb4a7	or of course we could just return the deferred	2015-01-27 16:05:23 +00:00
David Baker	eba89f093f	Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the cb gets executed.	2015-01-27 16:00:07 +00:00
David Baker	1d77969124	Unbreak bad presence merge - don't add these blocks together with an and: they're different things.	2015-01-27 15:58:27 +00:00
Paul "LeoNerd" Evans	57d2bfca3f	Initial cut of a shared base class for REST unit tests	2015-01-27 13:09:57 +00:00
David Baker	b481889117	Support membership events and more camelcase/underscores	2015-01-26 17:27:28 +00:00
David Baker	69a75b7ebe	Add brackets to make get room name / alias work	2015-01-26 16:52:47 +00:00
Mark Haines	9b6aaf2074	Merge pull request #34 from matrix-org/remove_serialize_event_from_hs ... Don't pass the HS to serialize_event just so that it can get the current time.	2015-01-26 16:23:48 +00:00
Mark Haines	e5725eb3b9	Remove unused import from server.py	2015-01-26 16:16:50 +00:00
Mark Haines	7f6f3f9d62	Pass the current time to serialize event, rather than passing an ... 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.	2015-01-26 16:11:28 +00:00
David Baker	efac71d6ca	Pushers should only try & look for rejected devices in something that's a list or tuple.	2015-01-26 14:37:14 +00:00
Paul "LeoNerd" Evans	d07dfe5392	Create (empty) v2_alpha REST tests directory	2015-01-26 14:32:17 +00:00
Mark Haines	7b814d3f7f	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00
Paul "LeoNerd" Evans	85419e1257	Stop complaining about Synapse Angular SDK 0.6.1	2015-01-23 18:37:37 +00:00
David Baker	5f84ba8ea1	Add API to delete push rules.	2015-01-23 17:49:37 +00:00
David Baker	f21f9fa3c5	Use push settings!	2015-01-23 17:07:06 +00:00
Erik Johnston	30a89d2fdb	Update .gitignore	2015-01-23 15:51:32 +00:00
Mark Haines	bda5d7d14f	Merge pull request #33 from matrix-org/extract_rest_servlet_from_client_v1 ... Extract the client v1 base RestServlet to a separate class	2015-01-23 14:32:41 +00:00
Mark Haines	e0bf18addf	Add RestServlet base class in synapse/http/servlet.py	2015-01-23 14:16:28 +00:00
Mark Haines	4be637cb12	Extract the client v1 base RestServlet to a separate class	2015-01-23 14:09:51 +00:00
Mark Haines	f7cb604211	Merge pull request #32 from matrix-org/remove_parse_id_from_hs ... Remove parse id from hs	2015-01-23 13:41:55 +00:00
David Baker	fc7a05c443	more pep8 suggestions	2015-01-23 13:36:01 +00:00
David Baker	b3f66ea6fb	more pep8	2015-01-23 13:28:00 +00:00
David Baker	d3e72b4d87	Make string format tuple an actual tuple	2015-01-23 13:25:58 +00:00
David Baker	98e1080555	redundant parens	2015-01-23 13:25:36 +00:00
David Baker	54c689c819	stray space	2015-01-23 13:25:14 +00:00
Mark Haines	c4652d7772	Remove hs.parse_eventid	2015-01-23 13:25:07 +00:00