3246 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	117f35ac4a	Add endpoint to get threepids from server	2015-04-17 17:20:18 +01:00
David Baker	4eea5cf6c2	pep8	2015-04-17 16:46:45 +01:00
David Baker	f96ab9d18d	make add3pid servlet work	2015-04-17 16:44:49 +01:00
David Baker	0b1a8500a2	just the once would probably be fine	2015-04-17 13:53:54 +01:00
David Baker	cb03fafdf1	Merge branch 'develop' into csauth	2015-04-17 13:51:10 +01:00
David Baker	bf5e54f255	Register the 3pid servlet	2015-04-17 13:44:55 +01:00
David Baker	94e1e58b4d	password -> account servlet and add start of an 'add 3pid' endpoint	2015-04-17 13:44:12 +01:00
David Baker	83b554437e	Need to yield the username check, otherwise very very weird things happen.	2015-04-17 12:57:25 +01:00
David Baker	4cd5fb13a3	Oops, left debugging in.	2015-04-16 20:03:13 +01:00
David Baker	ea1776f556	Return user ID in use error straight away	2015-04-16 19:56:44 +01:00
Paul "LeoNerd" Evans	f2cf37518b	Filter typing nofication events to only those rooms the requesting user is a member of (SYN-328)	2015-04-15 23:34:16 +01:00
Paul "LeoNerd" Evans	04c7f3576e	Various minor fixes to unit-test structure around typing notifications	2015-04-15 23:32:11 +01:00
Paul "LeoNerd" Evans	0268d40281	Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility	2015-04-15 23:09:35 +01:00
Paul "LeoNerd" Evans	399b5add58	Neater implementation of membership change auth checks, ensuring we can't forget to check if the calling user is a member of the room	2015-04-15 18:40:23 +01:00
Paul "LeoNerd" Evans	e6e130b9ba	Ensure that non-room-members cannot ban others, even if they do have enough powerlevel (SYN-343)	2015-04-15 18:07:33 +01:00
David Baker	766bd8e880	Dummy login so we can do the first POST request to get login flows without it just succeeding	2015-04-15 17:14:25 +01:00
David Baker	a19b739909	Regstration with email in v2	2015-04-15 15:50:38 +01:00
Mark Haines	4847a9534d	Merge pull request #122 from matrix-org/upgrade_syutil_to_0.0.4 ... Update syutil version to 0.0.4	2015-04-14 16:36:36 +01:00
Mark Haines	88cb06e996	Update syutil version to 0.0.4	2015-04-14 16:18:17 +01:00
Mark Haines	be7ead6946	Merge pull request #121 from matrix-org/key-api-restructure ... Move server key api into rest/key/v1	2015-04-14 13:37:15 +01:00
Mark Haines	3cbc286d06	Move server key api into rest/key/v1	2015-04-14 13:28:11 +01:00
Mark Haines	cf59d68b17	Merge pull request #120 from matrix-org/bugs/SYN-339 ... SYN-339: Cancel the notifier timeout when the notifier fires	2015-04-09 11:45:13 +01:00
Mark Haines	1280a47fc6	Add comment	2015-04-09 11:42:21 +01:00
Mark Haines	23d285ad57	Unset the timer in the timeout callback so that we don't try to cancel it if it has been called	2015-04-09 11:41:50 +01:00
Mark Haines	6f9dea7483	SYN-339: Cancel the notifier timeout when the notifier fires	2015-04-09 11:07:20 +01:00
Mark Haines	83f5125d52	Merge pull request #114 from matrix-org/improve_get_event_cache ... Improve get event cache	2015-04-08 16:50:27 +01:00
Erik Johnston	9cef051ce2	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-04-08 16:43:17 +01:00
Erik Johnston	0575840866	Merge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 ... Hotfixes v0.8.1 r3	2015-04-08 16:41:45 +01:00
Erik Johnston	45131b2bca	Bump version	2015-04-08 16:35:12 +01:00
Erik Johnston	ccda401dbf	SYN-338: Fix typo that caused the cache to throw an exception in some instances	2015-04-08 16:34:23 +01:00
Erik Johnston	5b89052d2f	Merge pull request #118 from matrix-org/dont-wait-for-notify ... Don't yield on notifying all listeners	2015-04-08 14:12:36 +01:00
Erik Johnston	19234cc6c3	typo	2015-04-08 14:10:06 +01:00
Erik Johnston	e8f1521605	Don't yield on notifying all listeners	2015-04-08 14:08:30 +01:00
Mark Haines	605941ee26	Merge pull request #117 from matrix-org/notifier-leak ... Fix a notifier leak	2015-04-08 14:02:37 +01:00
Erik Johnston	5bc41fe9f8	Move comment into docstring	2015-04-08 14:01:22 +01:00
Erik Johnston	638be5a6b9	Factor out loops into '_discard_if_notified'	2015-04-08 13:58:32 +01:00
Erik Johnston	830d07db82	Also perform paranoia checks in 'on_new_user_event'	2015-04-08 13:40:20 +01:00
Erik Johnston	65f5e4e3e4	Add paranoia checks to make sure that we evict stale NotificationListeners when we are about to process them	2015-04-08 13:33:38 +01:00
Erik Johnston	07d4041709	Fix bug where we didn't inform the NotificataionListeners about new rooms they have been subscribed to. This meant that the listeners didn't clean themselves up fully from all the dicts	2015-04-08 13:33:38 +01:00
Erik Johnston	c1b34af441	Move database timer logging to seperate logger	2015-04-08 13:31:19 +01:00
Matthew Hodgson	7f911ef4e3	typo	2015-04-08 10:55:12 +01:00
Erik Johnston	0775c62469	Fix --enable-registration flag to work if you don't give a value	2015-04-07 18:16:23 +01:00
Erik Johnston	a2a93a4fa7	Make demo script use --enable-registration	2015-04-07 18:08:21 +01:00
Kegan Dougal	ae8ff92e05	Fix a bug which causes a send event level of 0 to not be honoured. ... Caused by a bad if check, which incorrectly executes for both 0 and None, when None was the original intent.	2015-04-07 15:48:20 +01:00
Matthew Hodgson	65fd446b4d	update leo's contribs a bit	2015-04-03 11:48:08 -04:00
Matthew Hodgson	364c7f92b4	potential contributing guide & author list for synapse	2015-04-03 10:09:06 -04:00
David Baker	4eb6d66b45	Add app service auth back in to v2 register	2015-04-02 17:51:19 +01:00
David Baker	6b59650753	Throw sensible errors on not-json when allowing empty body	2015-04-02 17:45:16 +01:00
David Baker	41cd778d66	pep8	2015-04-02 17:06:17 +01:00
David Baker	70a84f17f3	Add shared secret auth into register v2 and switch the script over.	2015-04-02 17:01:29 +01:00