3231 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Haines	3ba522bb23	Merge branch 'develop' into key_distribution	2015-04-21 17:10:25 +01:00
Mark Haines	6080830bef	Bump syutil version to 0.0.5	2015-04-21 17:04:06 +01:00
Mark Haines	8b183781cb	Merge pull request #128 from matrix-org/unify_http_wrappers ... Unify http wrappers	2015-04-21 17:01:04 +01:00
Mark Haines	1f651ba6ec	Merge pull request #127 from matrix-org/bugs/SYN-350 ... SYN-350: Don't ratelimit the events generated during create room	2015-04-21 16:52:59 +01:00
Mark Haines	812a99100b	Set a version_string in BaseMediaResource so that the request_handler wrapper works	2015-04-21 16:43:58 +01:00
Mark Haines	1967650bc4	Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator	2015-04-21 16:35:53 +01:00
Mark Haines	1ebff9736b	Split out the JsonResource request logging and error handling into a separate wrapper function	2015-04-21 16:07:20 +01:00
Mark Haines	24d21887ed	SYN-350: Don't ratelimit the individual events generated during room creation	2015-04-21 14:14:19 +01:00
Mark Haines	db8d4e8dd6	Merge branch 'develop' into key_distribution	2015-04-20 16:24:21 +01:00
Mark Haines	2f9157b427	Implement v2 key lookup	2015-04-20 16:23:47 +01:00
Erik Johnston	4a5990ff8f	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-04-17 16:08:28 +01:00
Erik Johnston	231498ac45	Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 ... Hotfixes v0.8.1-r4	2015-04-17 15:16:27 +01:00
Mark Haines	fd4fa9097f	The new parameter to urlopen is "context" not "ctx"	2015-04-17 14:44:31 +01:00
Erik Johnston	ced39d019f	Bump version	2015-04-17 13:25:16 +01:00
Erik Johnston	16dcdedc8a	As of version 2.7.9, urllib2 now checks SSL certs	2015-04-17 13:24:55 +01:00
Kegan Dougal	1352ae2c07	Add kick users script	2015-04-17 10:38:23 +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
Mark Haines	a429515bdd	Add methods for storing and retrieving the raw key json	2015-04-15 16:58:35 +01:00
Mark Haines	8d761134c2	Fail quicker for 4xx responses in the key client, optional hit a different API path	2015-04-15 16:57:58 +01:00
Mark Haines	32e14d8181	Return a sha256 fingerprint rather than the entire tls certificate	2015-04-14 19:10:09 +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	d488463fa3	Add a version 2 of the key server api	2015-04-14 16:04:52 +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