2481 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	6840e7cece	Merge branch 'master' into develop	2015-01-28 16:03:35 +00:00
David Baker	60b143a52e	Move pushers delta to v12 and bump schema version	2015-01-28 15:48:28 +00:00
Mark Haines	c59bcabf0b	Return the device_id from get_auth_by_req	2015-01-28 15:43:41 +00:00
David Baker	fddc7a080a	Merge pull request #35 from matrix-org/pushers2 ... Pushers branch (with fixes)	2015-01-28 15:41:24 +00:00
David Baker	e78dd33292	Use %s instead of +	2015-01-28 14:52:58 +00:00
David Baker	93aac9bb7b	Newline	2015-01-28 14:51:01 +00:00
David Baker	445ad9941e	Redundant parens	2015-01-28 14:49:59 +00:00
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
Kegan Dougal	42876969b9	Add basic application_services SQL, and hook up parts of the appservice store to read from it.	2015-01-28 11:59:38 +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	e32ded7b3e	Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).	2015-01-28 10:09:54 +00:00
Kegan Dougal	b46fa8603e	Remove unused import	2015-01-28 09:17:48 +00:00
Mark Haines	e020574d65	Fix Formatting	2015-01-27 20:19:36 +00:00
Mark Haines	b19cf6a105	Wait for events if the incremental sync is empty and a timeout is given	2015-01-27 20:09:52 +00:00
Paul "LeoNerd" Evans	8398f19bce	Created schema delta	2015-01-27 19:00:09 +00:00
Paul "LeoNerd" Evans	06cc147012	Initial stab at real SQL storage implementation of user filter definitions	2015-01-27 18:46:03 +00:00
Paul "LeoNerd" Evans	0c14a699bb	More unit-testing of REST errors	2015-01-27 18:07:21 +00:00
Paul "LeoNerd" Evans	54e513b4e6	Move storage of user filters into real datastore layer; now have to mock it out in the REST-level tests	2015-01-27 17:48:13 +00:00
Kegan Dougal	fbeaeb8689	Log when ASes are registered/unregistered.	2015-01-27 17:34:40 +00:00
Kegan Dougal	ec3719b583	Use ApplicationService when registering.	2015-01-27 17:15:06 +00:00
Kegan Dougal	92171f9dd1	Add stub methods, TODOs and docstrings for application services.	2015-01-27 16:53:59 +00:00
Mark Haines	a56008842b	Start implementing incremental initial sync	2015-01-27 16:24:22 +00:00
Kegan Dougal	7331d34839	Add AS specific classes with docstrings.	2015-01-27 16:23:46 +00:00
Paul "LeoNerd" Evans	059651efa1	Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely	2015-01-27 16:17:56 +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	b1503112ce	Initial trivial unittest of Filtering object	2015-01-27 15:56:14 +00:00