6235 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	ff2d7551c7	Correct cache miss detection	2016-03-01 10:59:17 +00:00
Erik Johnston	903fb34b39	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_cache_size	2016-03-01 09:43:27 +00:00
Patrik Oldsberg	9c48f1ed22	handlers/register: make sure another user id is generated when a collision occurs ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-02-29 23:12:37 +01:00
David Baker	bfdcc7b9b6	Merge pull request #607 from matrix-org/dbkr/send_inviter_member_event ... Send the invier's member event in room invite state	2016-02-26 14:32:08 +00:00
Mark Haines	4bf13a8207	Merge pull request #609 from matrix-org/markjh/change_action ... Add support for changing the actions for default rules See matrix-org/matrix-doc#283 Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules``	2016-02-26 14:28:28 +00:00
Mark Haines	de27f7fc79	Add support for changing the actions for default rules ... See matrix-org/matrix-doc#283 Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules``	2016-02-26 14:28:19 +00:00
David Baker	413e36b17a	Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_event	2016-02-26 13:40:25 +00:00
David Baker	354d3842b5	Empty to commit to force re-test	2016-02-26 13:29:20 +00:00
David Baker	9329cd5f13	Merge pull request #608 from gergelypolonkai/syn-638 ... Add error codes for malformed/bad JSON in /login	2016-02-26 11:12:00 +00:00
Gergely Polonkai	87acd8fb07	Fix to appease the PEP8 dragon	2016-02-26 12:05:38 +01:00
Gergely Polonkai	a53774721a	Add error codes for malformed/bad JSON in /login ... Signed-off-by: Gergely Polonkai <gergely@polonkaieu>	2016-02-26 10:22:35 +01:00
David Baker	0f0b011440	Send the invier's member event in room invite state so the invitee has their display name and avatar.	2016-02-25 18:12:09 +00:00
Mark Haines	faa3d172ab	Merge pull request #606 from matrix-org/markjh/get_enabled ... Make sure we return a JSON object when returning the values of specif… …ic keys from a push rule	2016-02-25 15:13:18 +00:00
Mark Haines	15c2ac2cac	Make sure we return a JSON object when returning the values of specif… ... …ic keys from a push rule	2016-02-25 15:13:07 +00:00
Mark Haines	fb9b5b6f4a	Merge pull request #605 from matrix-org/markjh/dead_code ... Remove unused get_rule_attr method	2016-02-24 17:08:55 +00:00
Mark Haines	4ecfbac85f	Merge branch 'develop' into markjh/dead_code	2016-02-24 16:37:46 +00:00
Mark Haines	9892d017b2	Remove unused get_rule_attr method	2016-02-24 16:31:07 +00:00
Daniel Wagner-Hall	e8d34bccbd	Merge pull request #604 from matrix-org/daniel/guestaccesstoken ... Generate guest access token on 3pid invites This means that following the same link across multiple sessions or devices can re-use the same guest account. Note that this is somewhat of an abuse vector; we can't throw up captchas on this flow, so this is a way of registering ephemeral accounts for spam, whose sign-up we don't rate limit.	2016-02-24 14:41:29 +00:00
Daniel Wagner-Hall	33300673b7	Generate guest access token on 3pid invites ... This means that following the same link across multiple sessions or devices can re-use the same guest account. Note that this is somewhat of an abuse vector; we can't throw up captchas on this flow, so this is a way of registering ephemeral accounts for spam, whose sign-up we don't rate limit.	2016-02-24 14:41:25 +00:00
Daniel Wagner-Hall	869580206d	Ignore invalid POST bodies when joining rooms	2016-02-24 08:50:28 +00:00
Erik Johnston	278d6c0527	Report size of ExpiringCache	2016-02-23 16:46:21 +00:00
Erik Johnston	e7ab0e0f9f	Merge pull request #603 from matrix-org/erikj/presence ... Create a new stream_id per presence update	2016-02-23 16:14:01 +00:00
Erik Johnston	6451fcd085	Create a new stream_id per presence update	2016-02-23 15:51:39 +00:00
Erik Johnston	b5f77eb12a	Check presence token interval is less than 100, rather than the token itself	2016-02-23 15:47:37 +00:00
Erik Johnston	e3e0ac6ec7	Merge pull request #602 from matrix-org/erikj/presence ... Change the way we figure out presence updates for small deltas	2016-02-23 15:18:41 +00:00
Daniel Wagner-Hall	f1dd03548f	Set WORKSPACE if not set	2016-02-23 15:15:10 +00:00
Daniel Wagner-Hall	28ad246bb4	Merge pull request #584 from matrix-org/daniel/ephemeralthreepids ... Allow third_party_signed to be specified on /join	2016-02-23 15:11:35 +00:00
Daniel Wagner-Hall	577951b032	Allow third_party_signed to be specified on /join	2016-02-23 15:11:25 +00:00
Erik Johnston	13f86c3489	Handle get_all_entities_changed returning None	2016-02-23 15:05:37 +00:00
Erik Johnston	6e0209112b	Add comments	2016-02-23 14:57:45 +00:00
Erik Johnston	c77dae7a1a	Change the way we figure out presence updates for small deltas	2016-02-23 14:54:40 +00:00
Erik Johnston	a7b2ce32f7	Merge pull request #600 from matrix-org/erikj/presence ... Measure PresenceEventSource.get_new_events	2016-02-23 14:54:26 +00:00
Daniel Wagner-Hall	0d4b3a133d	Merge pull request #601 from Rugvip/pep8 ... handlers/sync: style fix, line too long	2016-02-23 14:52:28 +00:00
Erik Johnston	02e928cf9b	Don't include defer.returnValue in Measure block	2016-02-23 14:52:16 +00:00
Erik Johnston	56a94ccd9e	Measure PresenceEventSource.get_new_events	2016-02-23 14:52:16 +00:00
Patrik Oldsberg	baf056bae8	handlers/sync: style fix, line too long ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-02-23 15:49:36 +01:00
Mark Haines	10d581d1cf	Merge pull request #595 from matrix-org/markjh/coverage ... Check that the disable_registration config key is handled correctly	2016-02-23 11:59:40 +00:00
Erik Johnston	138c405974	Pick up currently_active across federation	2016-02-23 10:40:11 +00:00
Erik Johnston	8fe3b450d2	Merge pull request #597 from Rugvip/account-data-sync ... handlers/sync: fix SyncResult not counting account_data change when converting to bool	2016-02-23 09:55:23 +00:00
Patrik Oldsberg	210b7d8e00	handlers/_base: don't allow room create event to be changed ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-02-23 00:22:41 +01:00
Patrik Oldsberg	1dcfb201c4	handlers/sync: fix SyncResult not counting account_data change when converting to bool ... This fixes account_data events not triggering an immediate /sync response Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-02-23 00:21:59 +01:00
Richard van der Hoff	f7e3de02ef	Merge pull request #587 from matrix-org/rav/guest_access_after_room_join ... Allow guest users access to messages in rooms they have joined	2016-02-22 16:36:06 +00:00
Mark Haines	4d14655c2b	Merge pull request #594 from matrix-org/markjh/coverage ... Add a test for TreeCache.__contains__	2016-02-22 16:02:06 +00:00
Mark Haines	5e2890bd49	Check that the disable_registration config key is handled correctly	2016-02-22 16:01:29 +00:00
Richard van der Hoff	5be3944730	address review comments ... drop commented-out special casing for historyvisibility event s/he/they/ for users	2016-02-22 15:27:44 +00:00
Mark Haines	7641a90c34	Add a test for TreeCache.__contains__	2016-02-22 15:22:38 +00:00
Mark Haines	c43609e035	Merge pull request #591 from matrix-org/markjh/coverage ... Test Filter.filter_rooms	2016-02-22 15:21:10 +00:00
Erik Johnston	9e696bd6a3	Remove superfluous call to get_state_at when we already have an event for that stream position	2016-02-22 13:54:46 +00:00
Erik Johnston	60bec24083	Merge pull request #589 from matrix-org/erikj/presence ... Only send presence updates to remote hosts if user is ours	2016-02-22 13:18:06 +00:00
Mark Haines	5c79ef9396	Test Filter.filter_rooms ... Also check that the __repr__ method for FilterCollection does something sensible.	2016-02-19 17:55:28 +00:00