Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix typo | Mark Haines | 2016-05-11 | 1 | -1/+1 |
| | |||||
* | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 4 | -204/+214 |
| | |||||
* | Pass through _get_state_group_for_events | David Baker | 2016-05-10 | 1 | -0/+4 |
| | |||||
* | StateStore, not EventsStore | David Baker | 2016-05-10 | 1 | -2/+2 |
| | |||||
* | Cached functions must be accessed through the dict | David Baker | 2016-05-10 | 1 | -1/+2 |
| | |||||
* | Pass though _get_state_group_for_events | David Baker | 2016-05-10 | 1 | -0/+4 |
| | |||||
* | Pass through get_state_groups | David Baker | 2016-05-10 | 1 | -0/+4 |
| | |||||
* | Also pass through get_profile_displayname | David Baker | 2016-05-10 | 1 | -0/+4 |
| | |||||
* | Uncommit accidentally commited edit to cipher list | David Baker | 2016-05-10 | 1 | -1/+1 |
| | |||||
* | Pass through get_events to pusher too | David Baker | 2016-05-10 | 1 | -0/+1 |
| | |||||
* | Pass through _get_event_txn | David Baker | 2016-05-10 | 2 | -1/+2 |
| | |||||
* | unbreak schema | Matrix | 2016-05-10 | 2 | -0/+0 |
| | |||||
* | Merge pull request #759 from matrix-org/dbkr/email_notifs | Matthew Hodgson | 2016-05-10 | 22 | -34/+1170 |
|\ | | | | | Send email notifications for missed messages | ||||
| * | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 22 | -88/+609 |
| |\ | |||||
| * | | More consistent config naming | David Baker | 2016-05-10 | 2 | -2/+2 |
| | | | |||||
| * | | Add config option to not send email notifs for new users | David Baker | 2016-05-10 | 2 | -1/+8 |
| | | | |||||
| * | | 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 ↵ | Matthew Hodgson | 2016-05-10 | 1 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | | aka Word Remove templates-vector and theme templates with variables instead Switch to matrix.to URLs by default for links | ||||
| * | | 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 | 2 | -16/+36 |
| | | | |||||
| * | | pep8 | Matthew Hodgson | 2016-05-05 | 1 | -2/+4 |
| | | | |||||
| * | | handle fragments correctly on mxc URLs. | Matthew Hodgson | 2016-05-05 | 1 | -14/+45 |
| | | | | | | | | | | | | | | | | | | | | | switch to vector.im permalinks as matrix.to isn't ready yet. merge overlapping notifications together. give one message of context after a notification (in the unlikely event it exists, but it's possible thanks to throttling). include name of app in mail templates | ||||
| * | | spell out emailpusher full path | Matthew Hodgson | 2016-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | Include no context | David Baker | 2016-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | until we can de-dup between the context and other notifs | ||||
| * | | Add date header & message id | David Baker | 2016-05-04 | 2 | -1/+4 |
| | | | |||||
| * | | Correct SQL statement for postgres | David Baker | 2016-05-04 | 1 | -2/+3 |
| | | | | | | | | | | | | In standard sql, join binds tighter than comma, so we were joining on the wrong table. Postgres follows the standard (apparently). | ||||
| * | | Add db functions used for email to the pusher app | David Baker | 2016-05-04 | 1 | -0/+12 |
| | | | |||||
| * | | pep8 | David Baker | 2016-05-04 | 1 | -0/+1 |
| | | | |||||
| * | | copyright | Matthew Hodgson | 2016-05-04 | 1 | -0/+22 |
| | | | |||||
| * | | fix assorted typos in default config | Matthew Hodgson | 2016-05-04 | 1 | -3/+3 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -0/+1 |
| |\ \ | |||||
| * | | | Add constant for throttle multiplier | David Baker | 2016-04-29 | 1 | -1/+2 |
| | | | | |||||
| * | | | Remove unused function | David Baker | 2016-04-29 | 2 | -26/+0 |
| | | | | |||||
| * | | | Remove unused arg | David Baker | 2016-04-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Docstring | David Baker | 2016-04-29 | 1 | -0/+14 |
| | | | | |||||
| * | | | Use explicit join | David Baker | 2016-04-29 | 1 | -3/+3 |
| | | | | |||||
| * | | | Oops, actually specify the user id | David Baker | 2016-04-29 | 1 | -1/+3 |
| | | | | |||||
| * | | | Remove unnecessary if | David Baker | 2016-04-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Put spaces at start of line | David Baker | 2016-04-29 | 1 | -16/+16 |
| | | | | |||||
| * | | | Try imports in config | David Baker | 2016-04-29 | 1 | -0/+7 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | Default enable email notifs to False | David Baker | 2016-04-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | Correct public_baseurl default | David Baker | 2016-04-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Nicer get() shorthand | David Baker | 2016-04-29 | 1 | -3/+2 |
| | | | | |||||
| * | | | Remove redundant docstring | David Baker | 2016-04-29 | 1 | -4/+0 |
| | | | | |||||
| * | | | Correct default template and add text template | David Baker | 2016-04-29 | 1 | -1/+2 |
| | | | | |||||
| * | | | Send mail notifs with a plaintext part too | David Baker | 2016-04-29 | 2 | -7/+22 |
| | | | | |||||
| * | | | Add an email pusher for new users | David Baker | 2016-04-29 | 2 | -0/+27 |
| | | | | | | | | | | | | | | | | If they registered with an email address and email notifs are enabled on the HS | ||||
| * | | | pep8 newline | David Baker | 2016-04-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 35 | -323/+1188 |
| |\ \ \ | |||||
| * | | | | 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 | 2 | -3/+6 |
| | | | | | |||||
| * | | | | 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 | 2 | -8/+33 |
| | | | | | |||||
| * | | | | Linkify plain text messages too | David Baker | 2016-04-28 | 1 | -1/+12 |
| | | | | | |||||
| * | | | | Run filter_events_for_client | David Baker | 2016-04-27 | 7 | -20/+24 |
| | | | | | | | | | | | | | | | | | | | | so we don't accidentally mail out events people shouldn't see | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Say who the messages are from if there's no room name, otherwise it's a bit nonsensical | ||||
| * | | | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 4 | -23/+161 |
| | | | | | | | | | | | | | | | | | | | | Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails | ||||
| * | | | | More variable calculation for email notifs | David Baker | 2016-04-25 | 2 | -18/+74 |
| | | | | | | | | | | | | | | | | | | | | Include name of the person we're sending to and add summary text at the top giving an overview of what's happened. | ||||
| * | | | | Typo | David Baker | 2016-04-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | No we don't: it's just the display name | David Baker | 2016-04-22 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Actually do UTF8 correctly | David Baker | 2016-04-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Sort member events | David Baker | 2016-04-22 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | So names of people in a room are given in order | ||||
| * | | | | Mime part is binary so encode it first. | David Baker | 2016-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Doesn't get character enocind right yet but makes it not error. | ||||
| * | | | | Implement group-of-people names | David Baker | 2016-04-22 | 1 | -17/+14 |
| | | | | | |||||
| * | | | | No inlineCallbacks necessary on this | David Baker | 2016-04-22 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Flesh out email templating | David Baker | 2016-04-21 | 4 | -4/+208 |
| | | | | | | | | | | | | | | | | | | | | Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients. | ||||
| * | | | | Generate mails from a template | David Baker | 2016-04-20 | 4 | -31/+49 |
| | | | | | |||||
| * | | | | more pep8 | David Baker | 2016-04-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Send a rather basic email notif | David Baker | 2016-04-20 | 6 | -12/+136 |
| | | | | | | | | | | | | | | | | | | | | Also pep8 fixes | ||||
| * | | | | Add single instance & logging stuff | David Baker | 2016-04-19 | 1 | -8/+39 |
| | | | | | | | | | | | | | | | | | | | | Copy the stuff over from http pusher that prevents multiple instances of process running at once and sets up logging and measure blocks. | ||||
| * | | | | First bits of emailpusher | David Baker | 2016-04-19 | 7 | -8/+335 |
| | | | | | | | | | | | | | | | | | | | | Mostly logic of when to send an email | ||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 6 | -28/+23 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #773 from matrix-org/erikj/get_domian_from_id | Erik Johnston | 2016-05-09 | 6 | -28/+23 |
| |\ \ \ \ | | | | | | | | | | | | | Add and use get_domain_from_id | ||||
| | * | | | | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 6 | -28/+23 |
| | | | | | | |||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 13 | -58/+479 |
|\| | | | | | |||||
| * | | | | | Merge pull request #764 from matrix-org/erikj/replication_logging | Erik Johnston | 2016-05-09 | 1 | -0/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add some log information at returned replication streams | ||||
| | * | | | | | Don't warn | Erik Johnston | 2016-05-05 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Add some log information at returned replication streams | Erik Johnston | 2016-05-05 | 1 | -0/+11 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #772 from matrix-org/erikj/get_user_cache | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add cache to get_user_by_id | ||||
| | * | | | | | | Add cache to get_user_by_id | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #770 from matrix-org/erikj/transaction_reactor | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Run transaction queue on reactor | ||||
| | * | | | | | | Run transaction queue on reactor | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that any CPU work that happens doesn't block message sending. | ||||
| * | | | | | | Remove unused import | Erik Johnston | 2016-05-06 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Pull loop one level up | Erik Johnston | 2016-05-06 | 1 | -36/+41 |
| | | | | | | | |||||
| * | | | | | | Queue events for persistence | Erik Johnston | 2016-05-06 | 1 | -11/+144 |
| |/ / / / / | |||||
| * | | | | | Pull prev txn from in memory | Erik Johnston | 2016-05-06 | 1 | -5/+13 |
| | | | | | | |||||
| * | | | | | Don't needlessly enter transaction | Erik Johnston | 2016-05-06 | 1 | -9/+9 |
| | | | | | | |||||
| * | | | | | Reduce database inserts when sending transactions | Erik Johnston | 2016-05-06 | 2 | -45/+114 |
| | | | | | | |||||
| * | | | | | Rename openid/token to openid/request_token | Mark Haines | 2016-05-05 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add an openidish mechanism for proving to third parties that you own a given ↵ | Mark Haines | 2016-05-05 | 7 | -2/+193 |
| |/ / / / | | | | | | | | | | | | | | | | user_id | ||||
* | | | | | Add bulk fetch storage API | Erik Johnston | 2016-05-05 | 3 | -11/+26 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-04 | 7 | -2/+107 |
|\| | | | | |||||
| * | | | | Merge pull request #762 from matrix-org/erikj/report_event | Erik Johnston | 2016-05-04 | 6 | -1/+106 |
| |\ \ \ \ | | | | | | | | | | | | | Add /report endpoint | ||||
| | * | | | | Add primary key | Erik Johnston | 2016-05-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 4 | -1/+10 |
| | | | | | | |||||
| | * | | | | Move event_id to path | Erik Johnston | 2016-05-04 | 1 | -4/+2 |
| | | | | | | |||||
| | * | | | | Add /report endpoint | Erik Johnston | 2016-05-04 | 5 | -1/+99 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #757 from matrix-org/erikj/event_auth_typo | Erik Johnston | 2016-05-03 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | Fix typo in event_auth servlet path | ||||
| | * | | | Fix typo in event_auth servlet path | Erik Johnston | 2016-04-29 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
* | / | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 4 | -9/+78 |
|/ / / | |||||
* / / | Fix password reset | David Baker | 2016-04-29 | 1 | -0/+1 |
|/ / | | | | | | | Default requester to None, otherwise it isn't defined when resetting using email auth | ||||
* | | Fix more typos in per-request metrics | Mark Haines | 2016-04-28 | 1 | -4/+5 |
| | | |||||
* | | Fix typo in request metrics | Mark Haines | 2016-04-28 | 1 | -1/+1 |
| | | |||||
* | | fix typo | Matthew Hodgson | 2016-04-28 | 1 | -1/+1 |
| | | |||||
* | | Add a comment explaining why automatic metric reporting is disabled for ↵ | Mark Haines | 2016-04-28 | 1 | -0/+4 |
| | | | | | | | | JsonResource | ||||
* | | Check if report_metrics is True | Mark Haines | 2016-04-28 | 1 | -3/+4 |
| | | |||||
* | | Report per request metrics for all of the things using request_handler | Mark Haines | 2016-04-28 | 9 | -47/+76 |
| | | |||||
* | | Merge pull request #755 from matrix-org/markjh/right_direction | Mark Haines | 2016-04-27 | 2 | -3/+3 |
|\ \ | | | | | | | Fix backfill replication to advance the stream correctly | ||||
| * | | Fix backfill replication to advance the stream correctly | Mark Haines | 2016-04-27 | 2 | -3/+3 |
| | | | |||||
* | | | Check that somethign has happend before running the selects | Mark Haines | 2016-04-27 | 3 | -2/+14 |
|/ / | |||||
* | | Actually start the pusher daemon | Mark Haines | 2016-04-26 | 1 | -0/+2 |
| | | |||||
* | | Fix typo in default pusher config | Mark Haines | 2016-04-26 | 1 | -1/+1 |
| | | |||||
* | | Add a log context to the daemonized pusher | Mark Haines | 2016-04-26 | 1 | -1/+6 |
| | | |||||
* | | Optionally daemonize the pusher | Mark Haines | 2016-04-26 | 1 | -4/+31 |
| | | |||||
* | | Merge pull request #750 from matrix-org/erikj/jwt_optional | Erik Johnston | 2016-04-26 | 3 | -7/+23 |
|\ \ | | | | | | | Make pyjwt dependency optional | ||||
| * | | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 3 | -7/+23 |
| | | | |||||
* | | | Add a couple of update methods to the PusherSlaveStore | Mark Haines | 2016-04-26 | 1 | -0/+8 |
| | | | |||||
* | | | Remove the uncomments from the comments | Mark Haines | 2016-04-25 | 1 | -2/+2 |
| | | | |||||
* | | | Add a metrics listener and a ssh listener to the pusher | Mark Haines | 2016-04-25 | 2 | -3/+92 |
| | | | |||||
* | | | Move the listenTCP call outside the manhole function | Mark Haines | 2016-04-25 | 2 | -16/+14 |
| | | | |||||
* | | | Split out setting up the manhole to a separate file | Mark Haines | 2016-04-22 | 2 | -26/+57 |
|/ / | |||||
* | | Merge branch 'develop' into markjh/split_out_site.py | Mark Haines | 2016-04-22 | 2 | -82/+105 |
|\ \ | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
| * | | Split out create_resource_tree to a separate file | Mark Haines | 2016-04-22 | 2 | -82/+105 |
| | | | |||||
* | | | Move SynapseSite to its own file | Mark Haines | 2016-04-22 | 2 | -130/+149 |
|/ / | |||||
* | | Merge pull request #746 from matrix-org/markjh/split_out_pusher | Mark Haines | 2016-04-22 | 5 | -1/+217 |
|\ \ | | | | | | | Optionally split out the pushers into a separate process | ||||
| * | | Optionally split out the pushers into a separate process | Mark Haines | 2016-04-21 | 5 | -1/+217 |
| | | | |||||
* | | | Merge pull request #745 from matrix-org/erikj/search-index | Erik Johnston | 2016-04-22 | 4 | -7/+169 |
|\ \ \ | | | | | | | | | Optimise event_search in postgres | ||||
| * | | | Simplify query and handle finishing correctly | Erik Johnston | 2016-04-22 | 2 | -17/+16 |
| | | | | |||||
| * | | | Order NULLs first | Erik Johnston | 2016-04-21 | 2 | -5/+16 |
| | | | | |||||
| * | | | Fix query | Erik Johnston | 2016-04-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Use special UPDATE syntax | Erik Johnston | 2016-04-21 | 2 | -22/+14 |
| | | | | |||||
| * | | | Typo | Erik Johnston | 2016-04-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Need to do _background_update_progress_txn in actual transaction | Erik Johnston | 2016-04-21 | 1 | -6/+8 |
| | | | | |||||
| * | | | Update progress when creating index | Erik Johnston | 2016-04-21 | 1 | -0/+7 |
| | | | | |||||
| * | | | Fix SQL statement | Erik Johnston | 2016-04-21 | 1 | -3/+3 |
| | | | | |||||
| * | | | Create index must be on a conn | Erik Johnston | 2016-04-21 | 1 | -6/+13 |
| | | | | |||||
| * | | | Create index concurrently | Erik Johnston | 2016-04-21 | 2 | -6/+14 |
| | | | | |||||
| * | | | Add missing run_upgrade | Erik Johnston | 2016-04-21 | 1 | -0/+4 |
| | | | | |||||
| * | | | Optimise event_search in postgres | Erik Johnston | 2016-04-21 | 3 | -5/+137 |
| | | | | |||||
* | | | | Merge pull request #687 from nikriek/jwt-fix | Erik Johnston | 2016-04-21 | 2 | -3/+8 |
|\ \ \ \ | |_|/ / |/| | | | Fix issues with JWT login | ||||
| * | | | Fix issues with JWT login | Niklas Riekenbrauck | 2016-04-21 | 2 | -3/+8 |
| | | | | |||||
* | | | | Merge pull request #743 from matrix-org/markjh/slave_pushers | Mark Haines | 2016-04-21 | 1 | -0/+52 |
|\ \ \ \ | | | | | | | | | | | Replicate the pushers | ||||
| * | | | | Replicate the pushers | Mark Haines | 2016-04-21 | 1 | -0/+52 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #744 from matrix-org/markjh/replication_remove_pusher | Mark Haines | 2016-04-21 | 2 | -3/+57 |
|\ \ \ \ | | | | | | | | | | | Add a replication endpoint for deleting pushers | ||||
| * | | | | Add a replication endpoint for deleting pushers | Mark Haines | 2016-04-21 | 2 | -3/+57 |
| |/ / / | |||||
* / / / | Replicate push actions | Mark Haines | 2016-04-21 | 1 | -0/+14 |
|/ / / | |||||
* | | | Always use state cache entry if it exists | Erik Johnston | 2016-04-20 | 1 | -3/+10 |
| | | | | | | | | | | | | Also check if the resolved state matches an existing state group. | ||||
* | | | Add some logging to state resolve_events | Erik Johnston | 2016-04-20 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groups | Erik Johnston | 2016-04-19 | 1 | -3/+16 |
|\ \ \ | | | | | | | | | Add cache to _get_state_groups_from_groups | ||||
| * | | | Add cache to _get_state_groups_from_groups | Erik Johnston | 2016-04-19 | 1 | -3/+16 |
| | | | | |||||
* | | | | Merge pull request #738 from matrix-org/markjh/slaved_receipts | Mark Haines | 2016-04-19 | 1 | -0/+61 |
|\ \ \ \ | |/ / / |/| | | | Add a slaved receipts store | ||||
| * | | | Add a slaved receipts store | Mark Haines | 2016-04-19 | 1 | -0/+61 |
| | | | | |||||
* | | | | Merge pull request #737 from matrix-org/erikj/spider_ssl_factory | Erik Johnston | 2016-04-19 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Use tls_server_context_factory for SpiderEndpoint | ||||
| * | | | | Make InsecureInterceptableContextFactory work with SpiderEndpoint | Erik Johnston | 2016-04-19 | 1 | -1/+4 |
| |/ / / | |||||
* / / / | Replicate get_invited_rooms_for_user | Mark Haines | 2016-04-19 | 1 | -2/+7 |
|/ / / | |||||
* | | | Add self.media_repo to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 |
| | | | |||||
* | | | _make_dirs was moved to MediaRepository | Erik Johnston | 2016-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | Add store to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 |
| | | | |||||
* | | | Reorder imports | Erik Johnston | 2016-04-19 | 1 | -7/+8 |
| |/ |/| | |||||
* | | Move MediaRepository to media_repository module | Erik Johnston | 2016-04-19 | 5 | -489/+496 |
| | | |||||
* | | Split out BaseMediaResource into MediaRepository | Erik Johnston | 2016-04-19 | 6 | -138/+180 |
| | | | | | | | | | | | | | | | | | | This is so that a single MediaRepository can be shared across all resources, rather than having a "copy" per resource. In particular this allows us to guard against both the thumbnail and download resource triggering a download of remote content at the same time. | ||||
* | | Create log context in Measure if one doesn't exist | Erik Johnston | 2016-04-18 | 1 | -6/+17 |
| | | |||||
* | | Merge pull request #733 from matrix-org/erikj/make_member_timeout | Erik Johnston | 2016-04-18 | 1 | -1/+2 |
|\ \ | | | | | | | Lower timeout for make_membership_event | ||||
| * | | Lower timeout for make_membership_event | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Calls to make_membership_event are done in response to client requests, and so should not be retried over long timeframes. | ||||
* | | | Merge pull request #732 from matrix-org/erikj/login | Erik Johnston | 2016-04-18 | 1 | -5/+9 |
|\ \ \ | | | | | | | | | Simplify _check_password | ||||
| * | | | Simplify _check_password | Erik Johnston | 2016-04-15 | 1 | -5/+9 |
| |/ / | |||||
* | | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic ↵ | Matthew Hodgson | 2016-04-15 | 1 | -6/+18 |
| | | | | | | | | | | | | woes better | ||||
* | | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, ↵ | Matthew Hodgson | 2016-04-15 | 1 | -16/+8 |
|/ / | | | | | | | rather than relying on lxml's heuristics which seem to get it wrong | ||||
* | | Use SynapseError 504 for Timeout errors | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
| | | |||||
* | | Fix check_password rather than inverting the meaning of ↵ | Mark Haines | 2016-04-14 | 1 | -9/+12 |
| | | | | | | | | _check_local_password (#730) | ||||
* | | Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_user | David Baker | 2016-04-14 | 1 | -1/+1 |
|\ \ | | | | | | | Fix login to error for nonexistent users | ||||
| * | | Fix login to error for nonexistent users | David Baker | 2016-04-14 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixes SYN-680 | ||||
* | | | fix urlparse import thinko breaking tiny URLs | Matthew Hodgson | 2016-04-14 | 1 | -5/+5 |
| | | | |||||
* | | | Make v2_alpha reg follow the AS API specification | Kegan Dougal | 2016-04-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | The spec is clear the key should be 'user' not 'username' and this is indeed the case for v1. This is not true for v2_alpha though, which is what this commit is fixing. | ||||
* | | | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of ↵ | Matthew Hodgson | 2016-04-14 | 1 | -16/+16 |
| | | | | | | | | | | | | https://en.wikipedia.org/wiki/Billion_laughs attacks - thanks @torhve | ||||
* | | | 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 | ||||
| * | | 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 desc arg | Erik Johnston | 2016-04-14 | 1 | -1/+5 |
| | | | |||||
* | | | Add necessary logging contexts | Erik Johnston | 2016-04-14 | 1 | -24/+25 |
| | | | |||||
* | | | Add index | Erik Johnston | 2016-04-14 | 1 | -0/+18 |
| | | | |||||
* | | | Add extra Measure | Erik Johnston | 2016-04-14 | 1 | -14/+16 |
| | | | |||||
* | | | Fix query for get_unread_push_actions_for_user_in_range | Erik Johnston | 2016-04-14 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #721 from matrix-org/erikj/spider | Erik Johnston | 2016-04-14 | 4 | -38/+41 |
|\ \ \ | |/ / |/| | | Sanitize the optional dependencies for spider API | ||||
| * | | Give install requirements | Erik Johnston | 2016-04-13 | 1 | -1/+7 |
| | | | |||||
| * | | Add back in helpful description for missing url_preview_ip_range_blacklist | Erik Johnston | 2016-04-13 | 1 | -1/+5 |
| | | | |||||
| * | | Sanitize the optional dependencies for spider API | Erik Johnston | 2016-04-13 | 4 | -38/+31 |
| | | | |||||
* | | | Merge pull request #722 from matrix-org/dbkr/only_unread_event_actions | David Baker | 2016-04-13 | 1 | -9/+50 |
|\ \ \ | | | | | | | | | Only return unread notifications | ||||
| * | | | pep8 | David Baker | 2016-04-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Only return unread notifications | David Baker | 2016-04-13 | 1 | -9/+50 |
| | | | | | | | | | | | | | | | | Make get_unread_push_actions_for_user_in_range only return unread event actions, being more true to its name. Done in two separate sql queries to get actions after a read receipt and those in a room wiht no receipt at all. SQL queries by Erik. | ||||
* | | | | Merge pull request #718 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-04-13 | 1 | -5/+8 |
|\ \ \ \ | | | | | | | | | | | Don't return empty public rooms | ||||
| * | | | | Don't return empty public rooms | Erik Johnston | 2016-04-12 | 1 | -5/+8 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #720 from matrix-org/erikj/auth_chec | Erik Johnston | 2016-04-13 | 3 | -18/+35 |
|\ \ \ \ | |_|/ / |/| | | | Don't auto log failed auth checks | ||||
| * | | | Measure Auth.check | Erik Johnston | 2016-04-13 | 1 | -47/+50 |
| | | | | |||||
| * | | | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 3 | -62/+76 |
| |/ / | |||||
* / / | Unused member variable | David Baker | 2016-04-12 | 1 | -1/+0 |
|/ / | |||||
* | | Merge pull request #716 from matrix-org/dbkr/get_pushers | David Baker | 2016-04-12 | 2 | -17/+71 |
|\ \ | | | | | | | Add get endpoint for pushers | ||||
| * | | Unneccessarywhitespaceisunnecessary | David Baker | 2016-04-12 | 1 | -1/+0 |
| | | | |||||
| * | | Oops, forgot the desc. | David Baker | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| * | | Make the /set part mandatory | David Baker | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| * | | Tidy up get_pusher functions | David Baker | 2016-04-12 | 1 | -32/+30 |
| | | | | | | | | | | | | Decodes pushers rows on the main thread rather than the db thread and uses _simple_select_list. Also do the same to the function I copied and factor out the duplication into a helper function. | ||||
| * | | Mis-named function | David Baker | 2016-04-12 | 2 | -2/+2 |
| | | | |||||
| * | | Split into separate servlet classes | David Baker | 2016-04-12 | 1 | -11/+16 |
| | | | |||||
| * | | Add get endpoint for pushers | David Baker | 2016-04-11 | 2 | -1/+53 |
| | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/308 | ||||
* | | | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+9 |
| | | | |||||
* | | | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+6 |
| | | | |||||
* | | | Don't append to unused list | Erik Johnston | 2016-04-12 | 1 | -4/+0 |
| | | | |||||
* | | | Add back backfilled parameter that was removed | Erik Johnston | 2016-04-12 | 2 | -4/+7 |
| | | | |||||
* | | | Add comment | Erik Johnston | 2016-04-12 | 1 | -0/+1 |
| | | | |||||
* | | | Check if we've already backfilled events | Erik Johnston | 2016-04-12 | 2 | -7/+36 |
|/ / | |||||
* | | Fix the rule_id for .m.rule.invite_for_me (#715) | Mark Haines | 2016-04-11 | 1 | -1/+1 |
| | | |||||
* | | Move the versionstring code out of app.homeserver into util | Mark Haines | 2016-04-11 | 3 | -83/+125 |
| | | |||||
* | | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions | David Baker | 2016-04-11 | 19 | -628/+680 |
|\ \ | | | | | | | Change pushers to use the event_actions table | ||||
| * | | Run unsafe proces in a loop until we've caught up | David Baker | 2016-04-11 | 1 | -4/+11 |
| | | | | | | | | | | | | and wrap unsafe process in a try block | ||||
| * | | Actually check if we;re processing | David Baker | 2016-04-08 | 1 | -0/+2 |
| | | | |||||
| * | | Fix invite pushes | David Baker | 2016-04-08 | 4 | -39/+58 |
| | | | | | | | | | | | | | | | | | | * If the event is an invite event, add the invitee to list of user we run push rules for (if they have a pusher etc) * Move invite_for_me to be higher prio than member events otherwise member events matches them * Spell override right | ||||
| * | | 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 |
| | | | |||||
| * | | Literally a dictionary | David Baker | 2016-04-07 | 1 | -17/+17 |
| | | | |||||
| * | | generate id in the main thread | David Baker | 2016-04-07 | 1 | -3/+3 |
| | | | |||||
| * | | Only pass in what we need | David Baker | 2016-04-07 | 2 | -11/+13 |
| | | | |||||
| * | | Oops, inequality fail | David Baker | 2016-04-07 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | 2 | -0/+3 |
| | | | | | | | | | | | | saying that the min stream id won't be completely accurate all the time | ||||
| * | | pep8 | David Baker | 2016-04-07 | 1 | -0/+1 |
| | | | |||||
| * | | Fix port script for changes merged from develop | David Baker | 2016-04-07 | 1 | -1/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-04-07 | 25 | -190/+513 |
| |\ \ | | | | | | | | | | | | | dbkr/pushers_use_event_actions | ||||
| * | | | 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 | 4 | -24/+71 |
| | | | | | | | | | | | | | | | | Also fix bugs with retrying. | ||||
| * | | | pep8 | David Baker | 2016-04-06 | 4 | -4/+8 |
| | | | | |||||
| * | | | Make pushers use the event_push_actions table instead of listening on an ↵ | David Baker | 2016-04-06 | 13 | -130/+503 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | event stream & running the rules again. Sytest passes, but remaining to do: * Make badges work again * Remove old, unused code |