1044 Commits

Author	SHA1	Message	Date
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
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	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
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
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
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
David Baker	6188c4f69c	make per-device rules work	2015-01-23 13:23:10 +00:00
Mark Haines	ada711504e	Replace hs.parse_roomalias with RoomAlias.from_string	2015-01-23 13:21:58 +00:00
Mark Haines	1c06c48ce2	Replace hs.parse_roomid with RoomID.from_string	2015-01-23 11:55:12 +00:00
Mark Haines	5759bec43c	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
David Baker	49fe31792b	Add slightly pedantic trailing slash error.	2015-01-23 11:19:02 +00:00
Mark Haines	7256def8e4	Merge rest servlets into the client json resource object	2015-01-23 10:37:38 +00:00
David Baker	f87586e661	right super() param	2015-01-23 10:32:40 +00:00
David Baker	bcd48b9636	Fix adding rules without before/after & add the rule that we couldn't find to the error	2015-01-23 10:28:25 +00:00
David Baker	6927b6b197	This really serves me right for ever making a map called 'map'.	2015-01-23 10:21:47 +00:00
David Baker	8a850573c9	As yet fairly untested GET API for push rules	2015-01-22 19:32:17 +00:00
David Baker	673773b217	oops, this is not its own schema file	2015-01-22 18:27:07 +00:00
David Baker	7ecb49ef25	Insufficient newlines	2015-01-22 17:53:30 +00:00
David Baker	5c6189ea3e	Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py	2015-01-22 17:46:16 +00:00
David Baker	ede491b4e0	Oops: second part of commit dc938606	2015-01-22 17:38:53 +00:00
David Baker	dc93860619	Add rest API & store for creating push rules ... Also make unrecognised request error look more like synapse errors because it makes it easier to throw them from within rest classes.	2015-01-22 17:37:12 +00:00
Mark Haines	97c68c508d	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00
Mark Haines	1d2016b4a8	Move client v1 api rest servlets into a "client/v1" directory	2015-01-22 14:59:08 +00:00
David Baker	5d5932d493	use underscores everywhere, not camelcase.	2015-01-20 11:52:08 +00:00
David Baker	afb714f7be	add instance_handles to pushers so we have a way to refer to them even if the push token changes.	2015-01-20 11:49:48 +00:00
Mark Haines	dc70d1fef8	Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have	2015-01-19 16:24:54 +00:00
Mark Haines	42529cbced	Fix pyflakes errors	2015-01-19 15:33:04 +00:00
Mark Haines	00e9c08609	Fix syntax	2015-01-19 15:30:48 +00:00
Mark Haines	3e85e52b3f	Allow ':memory:' as the database path for sqlite3	2015-01-19 15:26:19 +00:00
Mark Haines	5fed042640	Finish renaming "context" to "room_id" in federation codebase	2015-01-16 19:01:03 +00:00