5454 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	c43b6dcc75	Fix change_password	2016-01-20 16:14:48 +00:00
David Baker	367cfab4e6	peppate	2016-01-20 16:05:09 +00:00
Erik Johnston	69adf8c384	Merge pull request #512 from matrix-org/erikj/whine_on_from ... Whine if we give a from param to /sync	2016-01-20 15:58:44 +00:00
Erik Johnston	73ca8e5834	Whine if we give a from param to /sync	2016-01-20 15:42:57 +00:00
Erik Johnston	b088291f14	Don't explode when given a unicode username in /register/	2016-01-20 15:40:25 +00:00
Daniel Wagner-Hall	a2ae01cc0f	Merge pull request #510 from matrix-org/daniel/nonguestpeeking ... Allow non-guests to peek on rooms using /events	2016-01-20 15:34:18 +00:00
Daniel Wagner-Hall	da417aa56d	Allow non-guests to peek on rooms using /events	2016-01-20 15:34:07 +00:00
David Baker	d4315bbf6b	Add index by user id on receipts_linearized	2016-01-20 15:33:27 +00:00
David Baker	3fa344c037	Add storage function to get all receipts for a user. Also add some cache invalidation to the receipts storage because there wasn't any, and remove a method that was unused.	2016-01-20 15:30:31 +00:00
David Baker	7cc047455e	Inline membership specifier	2016-01-20 13:50:28 +00:00
David Baker	d726597737	Simplify badge updating code by just updating it every time we get woken up and it's not an event	2016-01-20 13:49:00 +00:00
David Baker	2309450a76	Merge branch 'develop' into push_badge_counts	2016-01-20 13:45:13 +00:00
David Baker	ea5eea2424	Merge branch 'dbkr/no_push_for_own_events' into develop	2016-01-20 13:44:46 +00:00
David Baker	746f6e0eb3	'filtered' is a list of zero or 1	2016-01-20 13:44:04 +00:00
David Baker	7441d8cc0c	Merge remote-tracking branch 'origin/develop' into push_badge_counts	2016-01-20 13:40:22 +00:00
David Baker	ccf9387d57	Merge branch 'develop' into push_badge_counts	2016-01-20 13:33:45 +00:00
David Baker	d4cefb6289	Merge pull request #511 from matrix-org/dbkr/no_push_for_own_events ... Don't generate push actions for our own events	2016-01-20 13:33:25 +00:00
David Baker	259d1ecd1d	Don't generate push actions for our own events	2016-01-20 13:24:59 +00:00
Erik Johnston	191070123d	Cache dns lookups, and use the cache if we fail to lookup servers later	2016-01-20 11:34:09 +00:00
David Baker	afb7b377f2	Merge branch 'develop' into push_badge_counts	2016-01-19 18:17:23 +00:00
Erik Johnston	af30140621	Merge pull request #506 from matrix-org/erikj/push_fast ... Only compute unread notifications for rooms we send down stream	2016-01-19 17:31:10 +00:00
Erik Johnston	ac2842ff1e	Only compute unread notifications for rooms we send down stream	2016-01-19 17:19:53 +00:00
Erik Johnston	892ee473d9	Don't use form of get_state_for_events with None state_key	2016-01-19 17:14:46 +00:00
Erik Johnston	40d9765123	Merge pull request #505 from matrix-org/erikj/push_fast ... Push actions perf	2016-01-19 16:16:05 +00:00
Erik Johnston	2818a000aa	Use split rather than endswith	2016-01-19 16:11:39 +00:00
Erik Johnston	fb5d8e58ff	Change regex cache size to 5000	2016-01-19 16:07:07 +00:00
Erik Johnston	5a7d1ecffc	Add regex cache. Only caculate push actions for users that have sent read receipts, and are on that server	2016-01-19 16:01:05 +00:00
Erik Johnston	d056a0a3d8	Handle glob -> regex errors	2016-01-19 14:43:24 +00:00
Erik Johnston	7a079adc8f	Merge pull request #477 from matrix-org/erikj/access_token_log ... Don't log urlencoded access_tokens	2016-01-19 14:28:29 +00:00
Erik Johnston	b8518ffe65	Use all_ephemeral_by_room in incremental_sync_with_gap_for_room	2016-01-19 14:26:58 +00:00
Erik Johnston	9654ee0848	Return don't break	2016-01-19 14:24:59 +00:00
Erik Johnston	7ecd211163	Except truthy values	2016-01-19 14:22:02 +00:00
Erik Johnston	05f78b3b52	Merge pull request #504 from matrix-org/erikj/highlight_count ... Return highlight_count in /sync	2016-01-19 13:21:48 +00:00
Erik Johnston	f5fc8f2928	Merge pull request #486 from matrix-org/default_notify ... Change default pushrules back to notifying for all messages.	2016-01-19 12:49:29 +00:00
Erik Johnston	9a8949f022	Merge branch 'develop' of github.com:matrix-org/synapse into default_notify	2016-01-19 11:37:05 +00:00
Erik Johnston	3adcc4c86a	Return highlight_count in /sync	2016-01-19 11:35:50 +00:00
Erik Johnston	47e7963e50	Merge pull request #502 from matrix-org/erikj/push_notif_perf ... Unread notification performance.	2016-01-19 11:27:27 +00:00
Daniel Wagner-Hall	88af7bb48b	Merge pull request #503 from matrix-org/daniel/nonghosts ... Don't error on AS non-ghost user use	2016-01-19 11:27:00 +00:00
Erik Johnston	0d241e1114	Take a deepcopy of push rules before mutating them	2016-01-19 10:15:12 +00:00
Erik Johnston	f750a442f7	Update _id	2016-01-19 10:14:53 +00:00
Erik Johnston	003853e702	Preserve truthiness	2016-01-18 17:34:02 +00:00
Erik Johnston	a284ad4092	You need to escape backslashes	2016-01-18 17:20:44 +00:00
Erik Johnston	47f82e4408	Fix branch didn't check word_boundary	2016-01-18 17:04:36 +00:00
Erik Johnston	5cd2126a6a	Remove dead code	2016-01-18 16:49:46 +00:00
Erik Johnston	29c353c553	Don't split at word boundaries, actually use regex	2016-01-18 16:48:17 +00:00
Daniel Wagner-Hall	808a8aedab	Don't error on AS non-ghost user use ... This will probably go away either when we fix our existing ASes, or when we kill the concept of non-ghost users.	2016-01-18 16:33:05 +00:00
Daniel Wagner-Hall	74474a6d63	Pull out app service user lookup ... I find this a lot simpler than nested try-catches and stuff	2016-01-18 16:32:33 +00:00
Erik Johnston	d16dcf642e	Drop log levels	2016-01-18 15:44:04 +00:00
Erik Johnston	7dd14e5d1c	Add comments and remove dead code	2016-01-18 15:42:23 +00:00
Erik Johnston	866fe27e78	Do for loop once at start	2016-01-18 15:29:41 +00:00