| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | Merge pull request #811 from matrix-org/erikj/state_users_in_room | Erik Johnston | 2016-06-03 | 2 | -11/+18 |
| |\ |
|
| | * | Use state to calculate get_users_in_room | Erik Johnston | 2016-06-01 | 2 | -11/+18 |
| * | | Merge pull request #809 from matrix-org/erikj/cache_receipts_in_room | Erik Johnston | 2016-06-03 | 1 | -4/+4 |
| |\| |
|
| | * | Add get_users_with_read_receipts_in_room cache | Erik Johnston | 2016-06-01 | 1 | -4/+4 |
| * | | Merge pull request #821 from matrix-org/dbkr/email_unsubscribe | David Baker | 2016-06-02 | 2 | -6/+19 |
| |\ \ |
|
| | * | | peppate | David Baker | 2016-06-02 | 1 | -1/+3 |
| | * | | Working unsubscribe links going straight to the HS | David Baker | 2016-06-02 | 1 | -4/+4 |
| | * | | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ... | David Baker | 2016-06-02 | 1 | -1/+1 |
| | |\ \ |
|
| | * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 2 | -4/+10 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 1 | -0/+2 |
| | |\ \ \ \ |
|
| | * | | | | | Email unsubscribing that may in theory, work | David Baker | 2016-06-02 | 2 | -6/+17 |
| | | |_|_|/
| | |/| | | |
|
| * | | | | | Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_error | David Baker | 2016-06-02 | 1 | -1/+1 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | Fix error in email notification string formatting | David Baker | 2016-06-02 | 1 | -1/+1 |
| | | |_|/
| | |/| | |
|
* | / | | | brand the email from header | Matthew Hodgson | 2016-06-02 | 1 | -1/+8 |
|/ / / / |
|
* / / / | add some branding debugging | Matthew Hodgson | 2016-06-02 | 1 | -0/+1 |
|/ / / |
|
* | | | Disable INCLUDE_ALL_UNREAD_NOTIFS | Erik Johnston | 2016-06-02 | 1 | -1/+2 |
* | | | if an email pusher specifies a brand param, use it | Matthew Hodgson | 2016-06-02 | 2 | -3/+8 |
| |/
|/| |
|
* | | Use user_id in email greeting if display name is null | David Baker | 2016-06-02 | 1 | -0/+2 |
|/ |
|
* | Add caches to bulk_get_push_rules* | Erik Johnston | 2016-05-31 | 1 | -3/+5 |
* | Check for presence of 'avatar_url' key | David Baker | 2016-05-24 | 1 | -1/+3 |
* | fix NPE in room ordering | Matthew Hodgson | 2016-05-23 | 1 | -2/+2 |
* | consistency is the better part of valour | Matthew Hodgson | 2016-05-23 | 1 | -1/+1 |
* | Tune email notifs to make them quieter: | Matthew Hodgson | 2016-05-23 | 2 | -18/+56 |
* | Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convo | Matthew Hodgson | 2016-05-18 | 1 | -1/+3 |
|\ |
|
| * | increment badge count per missed convo, not per msg | Matthew Hodgson | 2016-05-18 | 1 | -1/+3 |
* | | Merge pull request #786 from matrix-org/matthew/email_notifs_tuning | Matthew Hodgson | 2016-05-17 | 2 | -9/+30 |
|\| |
|
| * | tune email notifs, fix CSS a bit, and add debugging details | Matthew Hodgson | 2016-05-16 | 2 | -9/+30 |
* | | Fix emailpusher import | David Baker | 2016-05-16 | 1 | -1/+11 |
|/ |
|
* | fix matrix.to URLs | Matthew Hodgson | 2016-05-13 | 1 | -2/+2 |
* | Make email notifs work on the pusher synapse | David Baker | 2016-05-13 | 1 | -0/+1 |
* | move filter_events_for_client out of base handler | Mark Haines | 2016-05-11 | 3 | -8/+9 |
* | Make pep8 happy | David Baker | 2016-05-10 | 1 | -1/+1 |
* | Switch from CSS to Table layout for HTML mails so they work in Outlook ak... | Matthew Hodgson | 2016-05-10 | 1 | -7/+18 |
* | better mail subject lines | Matthew Hodgson | 2016-05-05 | 1 | -1/+1 |
* | fix layout; handle app naming in synapse, not jinja | Matthew Hodgson | 2016-05-05 | 1 | -16/+31 |
* | pep8 | Matthew Hodgson | 2016-05-05 | 1 | -2/+4 |
* | handle fragments correctly on mxc URLs. | Matthew Hodgson | 2016-05-05 | 1 | -14/+45 |
* | spell out emailpusher full path | Matthew Hodgson | 2016-05-05 | 1 | -1/+1 |
* | Include no context | David Baker | 2016-05-04 | 1 | -1/+1 |
* | Add date header & message id | David Baker | 2016-05-04 | 1 | -0/+2 |
* | pep8 | David Baker | 2016-05-04 | 1 | -0/+1 |
* | copyright | Matthew Hodgson | 2016-05-04 | 1 | -0/+22 |
* | Unused import | David Baker | 2016-05-04 | 1 | -1/+0 |
* | Catch all exceptions when creating a pusher | David Baker | 2016-05-04 | 1 | -2/+2 |
* | Add constant for throttle multiplier | David Baker | 2016-04-29 | 1 | -1/+2 |
* | Remove unused function | David Baker | 2016-04-29 | 1 | -4/+0 |
* | Remove unused arg | David Baker | 2016-04-29 | 1 | -2/+2 |
* | Use the constant | David Baker | 2016-04-29 | 1 | -1/+2 |
* | Avoid `vars` builtin | David Baker | 2016-04-29 | 1 | -15/+15 |
* | Use named parameter format | David Baker | 2016-04-29 | 1 | -14/+22 |
* | pep8 | David Baker | 2016-04-29 | 1 | -1/+0 |
* | Remove rather pointless get function | David Baker | 2016-04-29 | 1 | -9/+1 |
* | Stop processing notifs once we've sent a mail | David Baker | 2016-04-29 | 1 | -0/+1 |
* | Send mail notifs with a plaintext part too | David Baker | 2016-04-29 | 1 | -7/+20 |
* | Add an email pusher for new users | David Baker | 2016-04-29 | 1 | -0/+1 |
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 2 | -1/+5 |
|\ |
|
| * | Optionally split out the pushers into a separate process | Mark Haines | 2016-04-21 | 2 | -1/+5 |
* | | May as well always include room link | David Baker | 2016-04-28 | 1 | -4/+3 |
* | | Put back real delay before mailing | David Baker | 2016-04-28 | 1 | -1/+1 |
* | | Support file messages & fix plain text | David Baker | 2016-04-28 | 1 | -2/+3 |
* | | Support image notifs | David Baker | 2016-04-28 | 1 | -11/+25 |
* | | pep8 | David Baker | 2016-04-28 | 1 | -2/+5 |
* | | Only import email pusher if email notifs are on | David Baker | 2016-04-28 | 1 | -6/+8 |
* | | Handle room invites in email notifs | David Baker | 2016-04-28 | 1 | -5/+30 |
* | | Linkify plain text messages too | David Baker | 2016-04-28 | 1 | -1/+12 |
* | | Run filter_events_for_client | David Baker | 2016-04-27 | 1 | -7/+11 |
* | | Make html messages work | David Baker | 2016-04-27 | 1 | -10/+21 |
* | | Better grammar for multiple messages in a room | David Baker | 2016-04-27 | 2 | -10/+33 |
* | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 1 | -22/+144 |
* | | More variable calculation for email notifs | David Baker | 2016-04-25 | 1 | -2/+55 |
* | | Actually do UTF8 correctly | David Baker | 2016-04-22 | 1 | -1/+1 |
* | | Mime part is binary so encode it first. | David Baker | 2016-04-22 | 1 | -1/+1 |
* | | No inlineCallbacks necessary on this | David Baker | 2016-04-22 | 1 | -1/+0 |
* | | Flesh out email templating | David Baker | 2016-04-21 | 2 | -3/+65 |
* | | Generate mails from a template | David Baker | 2016-04-20 | 2 | -21/+21 |
* | | more pep8 | David Baker | 2016-04-20 | 1 | -1/+1 |
* | | Send a rather basic email notif | David Baker | 2016-04-20 | 2 | -9/+71 |
* | | Add single instance & logging stuff | David Baker | 2016-04-19 | 1 | -8/+39 |
* | | First bits of emailpusher | David Baker | 2016-04-19 | 2 | -1/+217 |
|/ |
|
* | Measure push action generator | Erik Johnston | 2016-04-14 | 1 | -11/+15 |
* | Merge pull request #725 from matrix-org/dbkr/push_only_joined | Erik Johnston | 2016-04-14 | 1 | -1/+13 |
|\ |
|
| * | Don't push for everyone who ever sent an RR to the room | David Baker | 2016-04-14 | 1 | -1/+13 |
* | | Add missing yield | Erik Johnston | 2016-04-14 | 1 | -1/+1 |
* | | Rename log context | Erik Johnston | 2016-04-14 | 1 | -1/+1 |
* | | Make send_badge private | Erik Johnston | 2016-04-14 | 1 | -2/+2 |
* | | Add necessary logging contexts | Erik Johnston | 2016-04-14 | 1 | -24/+25 |
* | | Add extra Measure | Erik Johnston | 2016-04-14 | 1 | -14/+16 |
|/ |
|
* | Unused member variable | David Baker | 2016-04-12 | 1 | -1/+0 |
* | Fix the rule_id for .m.rule.invite_for_me (#715) | Mark Haines | 2016-04-11 | 1 | -1/+1 |
* | Run unsafe proces in a loop until we've caught up | David Baker | 2016-04-11 | 1 | -4/+11 |
* | Actually check if we;re processing | David Baker | 2016-04-08 | 1 | -0/+2 |
* | Fix invite pushes | David Baker | 2016-04-08 | 3 | -39/+51 |
* | Make sure max stream ordering only increases | David Baker | 2016-04-08 | 1 | -1/+1 |
* | Unsafe process should call itself if the max has changed | David Baker | 2016-04-08 | 1 | -0/+3 |
* | Comment why unsafe process is unsafe | David Baker | 2016-04-08 | 1 | -0/+5 |
* | Only pass in what we need | David Baker | 2016-04-07 | 2 | -11/+13 |
* | Wrap process in a flag so we don't process whist already processing. | David Baker | 2016-04-07 | 1 | -0/+9 |
* | indenting | David Baker | 2016-04-07 | 1 | -1/+1 |
* | defer.gatherResults rather than doing all the pokes in series | David Baker | 2016-04-07 | 1 | -2/+16 |
* | Add measure blocks | David Baker | 2016-04-07 | 1 | -5/+10 |
* | Add comments on min_stream_id | David Baker | 2016-04-07 | 1 | -0/+2 |
* | Remove code that's now been obsoleted or moved elsewhere | David Baker | 2016-04-07 | 3 | -454/+9 |
* | Send badge count pushes. | David Baker | 2016-04-07 | 2 | -17/+48 |
* | Make pushers use the event_push_actions table instead of listening on an even... | David Baker | 2016-04-06 | 5 | -79/+301 |
* | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -3/+5 |
* | Don't ignore the obey overlay if the rule has an enabled attribute of False | David Baker | 2016-03-31 | 1 | -2/+3 |
* | Never notify for member events. This fixes https://github.com/vector-im/vecto... | David Baker | 2016-03-24 | 1 | -20/+21 |
* | Make get_invites return RoomsForUser | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
* | Use get_users_in_room to count the number of room members rather than using r... | Mark Haines | 2016-03-22 | 1 | -1/+3 |
* | Make select more sensible when dseleting access tokens, rename pusher deletio... | David Baker | 2016-03-11 | 1 | -1/+1 |
* | Fix cache invalidation so deleting access tokens (which we did when changing ... | David Baker | 2016-03-11 | 1 | -4/+4 |
* | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 5 | -10/+10 |
* | Move the code for formatting push rules into a separate function | Mark Haines | 2016-03-03 | 1 | -0/+112 |
* | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 1 | -7/+50 |
* | Merge branch 'develop' into rav/guest_access_after_room_join | Richard van der Hoff | 2016-02-19 | 6 | -46/+31 |
|\ |
|
| * | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 6 | -46/+31 |
* | | Allow guest users access to messages in rooms they have joined | Richard van der Hoff | 2016-02-19 | 1 | -1/+1 |
|/ |
|
* | Atomically persit push actions when we persist the event | Erik Johnston | 2016-02-09 | 1 | -15/+5 |
* | Pass in current state to push action handler | Erik Johnston | 2016-02-09 | 2 | -9/+7 |
* | Revert to putting it around the entire block | Erik Johnston | 2016-02-09 | 1 | -124/+124 |
* | Don't measure across event stream call, as it lasts for a long time. | Erik Johnston | 2016-02-09 | 1 | -124/+124 |
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 2 | -5/+6 |
* | Add metrics to pushers | Erik Johnston | 2016-02-08 | 1 | -31/+53 |
* | Change event_push_actions_rm_tokens schema | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
* | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 1 | -1/+1 |
* | Only notify for messages in one to one rooms, not every event | David Baker | 2016-01-26 | 1 | -0/+6 |
* | Push: Use storage apis that are cached | Erik Johnston | 2016-01-25 | 1 | -17/+13 |
* | Merge pull request #523 from matrix-org/dbkr/no_push_unless_notify | David Baker | 2016-01-22 | 1 | -9/+1 |
|\ |
|
| * | Better fix for actions with both dont_notify and tweaks | David Baker | 2016-01-22 | 1 | -1/+1 |
| * | Revert b4a41aa542203c03bb8a6c93097b94bc5d167265 as it's just broken. | David Baker | 2016-01-22 | 1 | -9/+1 |
* | | Merge pull request #522 from matrix-org/dbkr/no_push_unless_notify | David Baker | 2016-01-22 | 1 | -1/+9 |
|\| |
|
| * | Don't add notifications to the table unless there's actually a 'notify' action | David Baker | 2016-01-22 | 1 | -1/+9 |
* | | Don't mutate cached values | Erik Johnston | 2016-01-22 | 1 | -2/+6 |
|/ |
|
* | Don't crash if a user has no push rule enabled entries | David Baker | 2016-01-22 | 1 | -0/+3 |
* | Overlay the push_rules_enabled map for users, otherwise they won't be able to... | David Baker | 2016-01-22 | 1 | -0/+14 |
* | Only fetch events for rooms and receipts | Erik Johnston | 2016-01-21 | 1 | -1/+2 |
* | Only compute badge count when necessary. | Erik Johnston | 2016-01-21 | 1 | -4/+15 |
* | Remove member event rule as per SYN-607 | David Baker | 2016-01-21 | 1 | -17/+19 |
* | Add storage function to get all receipts for a user. Also add some cache inva... | David Baker | 2016-01-20 | 1 | -22/+6 |
* | Inline membership specifier | David Baker | 2016-01-20 | 1 | -3/+1 |
* | Simplify badge updating code by just updating it every time we get woken up a... | David Baker | 2016-01-20 | 1 | -15/+4 |
* | Merge branch 'develop' into push_badge_counts | David Baker | 2016-01-20 | 1 | -1/+1 |
|\ |
|
| * | 'filtered' is a list of zero or 1 | David Baker | 2016-01-20 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/develop' into push_badge_counts | David Baker | 2016-01-20 | 1 | -0/+3 |
|\| |
|
| * | Don't generate push actions for our own events | David Baker | 2016-01-20 | 1 | -0/+3 |
* | | Merge branch 'develop' into push_badge_counts | David Baker | 2016-01-19 | 7 | -393/+509 |
|\| |
|
| * | Change regex cache size to 5000 | Erik Johnston | 2016-01-19 | 1 | -1/+1 |
| * | Add regex cache. Only caculate push actions for users that have sent read rec... | Erik Johnston | 2016-01-19 | 3 | -11/+31 |
| * | Handle glob -> regex errors | Erik Johnston | 2016-01-19 | 1 | -29/+33 |
| * | Return don't break | Erik Johnston | 2016-01-19 | 1 | -1/+1 |
| * | Except truthy values | Erik Johnston | 2016-01-19 | 1 | -1/+1 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into default_notify | Erik Johnston | 2016-01-19 | 6 | -385/+478 |
| |\ |
|
| | * | Update _id | Erik Johnston | 2016-01-19 | 1 | -2/+3 |
| | * | Preserve truthiness | Erik Johnston | 2016-01-18 | 1 | -1/+2 |
| | * | You need to escape backslashes | Erik Johnston | 2016-01-18 | 1 | -2/+2 |
| | * | Fix branch didn't check word_boundary | Erik Johnston | 2016-01-18 | 1 | -3/+9 |
| | * | Don't split at word boundaries, actually use regex | Erik Johnston | 2016-01-18 | 2 | -63/+48 |
| | * | Drop log levels | Erik Johnston | 2016-01-18 | 1 | -2/+2 |
| | * | Add comments and remove dead code | Erik Johnston | 2016-01-18 | 1 | -12/+11 |
| | * | Do for loop once at start | Erik Johnston | 2016-01-18 | 1 | -8/+17 |
| | * | Use static for const dicts | Erik Johnston | 2016-01-18 | 3 | -197/+202 |
| | * | Don't edit ruleset | Erik Johnston | 2016-01-18 | 1 | -5/+4 |
| | * | Re-enable urnead notifications | Erik Johnston | 2016-01-18 | 1 | -3/+0 |
| | * | Make notifications go quicker | Erik Johnston | 2016-01-18 | 2 | -127/+215 |
| | * | Temporarily disable notification branch | Erik Johnston | 2016-01-13 | 1 | -0/+3 |
| | * | Rename 'user_name' to 'user_id' in push to make it consistent with the rest o... | Mark Haines | 2016-01-13 | 5 | -54/+54 |
| * | | Change default pushrules back to notifying for all messages. | David Baker | 2016-01-13 | 1 | -1/+0 |
| |/ |
|
* / | Use the unread notification count to send accurate badge counts in push notif... | David Baker | 2016-01-13 | 3 | -45/+86 |
|/ |
|
* | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 4 | -22/+200 |
|\ |
|
| * | more commas | David Baker | 2016-01-07 | 1 | -1/+1 |
| * | Delete notifications for redacted events | David Baker | 2016-01-06 | 1 | -0/+7 |
| * | Add is_guest flag to users db to track whether a user is a guest user or not.... | David Baker | 2016-01-06 | 2 | -8/+25 |
| * | comment typo | David Baker | 2016-01-05 | 1 | -1/+1 |
| * | Rename event-actions to event_push_actions as per PR request | David Baker | 2016-01-04 | 2 | -2/+2 |
| * | Address minor PR issues | David Baker | 2016-01-04 | 2 | -5/+4 |
| * | pep8 & unused variable | David Baker | 2015-12-22 | 3 | -4/+3 |
| * | Add some comments to areas that could be optimised. | David Baker | 2015-12-22 | 2 | -1/+11 |
| * | Insert push actions in a single db query rather than one per user/profile_tag | David Baker | 2015-12-22 | 1 | -4/+6 |
| * | Add bulk push rule evaluator which actually still evaluates rules one by one,... | David Baker | 2015-12-22 | 3 | -22/+118 |
| * | Only run pushers for users on this hs! | David Baker | 2015-12-21 | 1 | -1/+7 |
| * | still very WIP, but now sends unread_notifications_count in the room object o... | David Baker | 2015-12-16 | 1 | -1/+1 |
| * | Store nothing instead of ['dont_notify'] for events with no notification requ... | David Baker | 2015-12-10 | 3 | -21/+14 |
| * | Save event actions to the db | David Baker | 2015-12-10 | 1 | -2/+4 |
| * | Very first cut of calculating actions for events as they come in. Doesn't sto... | David Baker | 2015-12-10 | 1 | -0/+47 |
* | | copyrights | Matthew Hodgson | 2016-01-07 | 6 | -6/+6 |
|/ |
|
* | pep8 | David Baker | 2015-12-09 | 1 | -4/+4 |
* | Split out the push rule evaluator into a separate file so it can be more read... | David Baker | 2015-12-09 | 2 | -185/+234 |
* | Merge pull request #413 from matrix-org/markjh/reuse_http_client | Mark Haines | 2015-12-02 | 1 | -4/+3 |
|\ |
|
| * | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 1 | -4/+3 |
* | | Change the m.room.message rule to be disabled by default so we only notify fo... | David Baker | 2015-12-02 | 1 | -0/+1 |
|/ |
|
* | Use raw string for regex here, otherwise \b is the backspace character. Fixes... | David Baker | 2015-10-08 | 1 | -1/+1 |
* | Don't make pushers handle presence/typing events | Erik Johnston | 2015-08-24 | 1 | -3/+5 |
* | Store the 'last_token' in the db, even if we processed no events | Erik Johnston | 2015-08-19 | 1 | -0/+6 |
* | Block on storing the current last_tokens | Erik Johnston | 2015-08-19 | 1 | -5/+5 |
* | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 1 | -7/+4 |
* | Oops: underride rule had an identifier with override in it. | David Baker | 2015-06-23 | 1 | -1/+1 |
* | Catch any exceptions in the pusher loop. Use a lower timeout for pushers so w... | David Baker | 2015-06-05 | 1 | -112/+133 |
* | Take a dict of the rule, not the rule list | Mark Haines | 2015-05-26 | 1 | -1/+1 |
* | SYN-390: Don't modify the dictionary returned from the database here either | Mark Haines | 2015-05-26 | 1 | -4/+7 |
* | Don't try to use a txn when not in one, remove spurious debug logging | Mark Haines | 2015-05-21 | 1 | -2/+0 |
* | Add caches for things requested by the pushers | Mark Haines | 2015-05-21 | 1 | -15/+10 |
* | Add a cache for get_current_state with state_key | Mark Haines | 2015-05-21 | 1 | -0/+4 |
* | Also log when we've started pushers | Erik Johnston | 2015-04-29 | 1 | -0/+2 |
* | Only start pushers when synapse has fully started | Erik Johnston | 2015-04-29 | 1 | -3/+0 |
* | Start pushers on reactor thread | Erik Johnston | 2015-04-29 | 1 | -0/+3 |
* | Decode the data json in the storage layer (was moved but this part was missed) | David Baker | 2015-04-29 | 1 | -1/+5 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-28 | 2 | -17/+69 |
|\ |
|
| * | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 2 | -18/+69 |
| |\ |
|
| | * | pep8 | David Baker | 2015-03-26 | 1 | -2/+4 |
| | * | Delete pushers when changing password | David Baker | 2015-03-26 | 1 | -2/+18 |
| | * | pep8 blank lines | David Baker | 2015-03-25 | 1 | -1/+0 |
| | * | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ... | David Baker | 2015-03-25 | 2 | -12/+45 |
| | * | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 1 | -4/+5 |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-27 | 2 | -21/+49 |
|\| | |
|
| * | | Make one-to-one rule an underride otherwise bings don't work in one-to-one wr... | David Baker | 2015-04-24 | 1 | -21/+21 |
| * | | Copyright notices | Mark Haines | 2015-04-24 | 2 | -0/+28 |
| |/ |
|
* / | Move encoding and decoding of JSON into storage layer | Erik Johnston | 2015-04-16 | 1 | -7/+1 |
|/ |
|
* | More sacrifices to the pep8 gods. | David Baker | 2015-03-12 | 1 | -2/+8 |
* | Log the matching push rule. | David Baker | 2015-03-11 | 1 | -2/+4 |
* | Again, underscore, not hyphen | David Baker | 2015-03-11 | 1 | -1/+1 |
* | 'false' is not False | David Baker | 2015-03-11 | 1 | -5/+5 |
* | PEP8 blank lines | David Baker | 2015-03-11 | 1 | -0/+1 |
* | Add the master push rule for the break-my-push button. Allow server default r... | David Baker | 2015-03-10 | 2 | -10/+54 |
* | D'oh: underscore, not hyphen | David Baker | 2015-03-09 | 1 | -1/+1 |
* | Call notifications should be override else they'll get clobbered by sender/ro... | David Baker | 2015-03-06 | 1 | -21/+21 |
* | Dial down logging for failed pushers | David Baker | 2015-03-06 | 1 | -1/+1 |
* | Specify when we don't want to highlight | David Baker | 2015-03-06 | 1 | -2/+17 |
* | Remove the fallback rule - we probably don't want to be notifying for everyth... | David Baker | 2015-03-06 | 1 | -9/+1 |
* | Add attribute so push gateways can tell if a member event is about the user i... | David Baker | 2015-03-06 | 1 | -0/+1 |
* | Add more server default rules so we have default rules for whether you get no... | David Baker | 2015-03-06 | 2 | -6/+76 |
* | Comment typo | David Baker | 2015-03-06 | 1 | -1/+1 |
* | Suppress notices should trump content/room/sender rules. | David Baker | 2015-03-06 | 1 | -13/+13 |
* | Add the highlight tweak where messages should be highlighted a different colo... | David Baker | 2015-03-06 | 1 | -0/+4 |
* | Add default rule to suppress notices. | David Baker | 2015-03-04 | 1 | -0/+13 |
* | s/user_name/user/ as per mjark's comment | David Baker | 2015-03-02 | 1 | -2/+2 |
* | Rename the room-with-two-people rule to be more compatible if we have actual ... | David Baker | 2015-03-02 | 1 | -1/+1 |
* | SYN-267 Add a fallback rule as an explicit server default rule and make the d... | David Baker | 2015-02-26 | 2 | -1/+16 |
* | Add API for getting/setting enabled-ness of push rules. | David Baker | 2015-02-26 | 1 | -4/+4 |
* | Add enable/disable overlay for push rules (REST API not yet hooked up) | David Baker | 2015-02-25 | 2 | -0/+7 |
* | Send room ID in http notifications so clients know which room to go to if the... | David Baker | 2015-02-19 | 1 | -0/+1 |
* | Update pushers by app id and pushkey, not user id and pushkey | David Baker | 2015-02-13 | 1 | -6/+6 |
* | Use encode_canonical_json for pushes | Erik Johnston | 2015-02-11 | 1 | -1/+3 |
* | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 2 | -2/+2 |
* | Code-style fixes | Mark Haines | 2015-02-10 | 3 | -14/+17 |
* | Need to use re.search if looking for matches not at the start of the string. ... | David Baker | 2015-02-09 | 1 | -3/+3 |
* | only do word-boundary patches on bodies for now | Matthew Hodgson | 2015-02-09 | 1 | -1/+4 |
* | Fix server default rule injection (downwards, not upwards!) | David Baker | 2015-02-09 | 1 | -6/+6 |
* | glob *s should probably be non-greedy | Matthew Hodgson | 2015-02-08 | 1 | -1/+1 |
* | oops | Matthew Hodgson | 2015-02-08 | 1 | -1/+1 |
* | kill off fnmatch in favour of word-boundary based push alerts (untested) | Matthew Hodgson | 2015-02-08 | 1 | -12/+20 |