Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | Merge pull request #768 from matrix-org/erikj/queue_evens_persist | Erik Johnston | 2016-05-09 | 1 | -11/+149 |
|\ \ | |/ |/| | Queue events by room for persistence | ||||
| * | 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 |
|/ | |||||
* | Merge pull request #767 from matrix-org/erikj/transaction_txn | Erik Johnston | 2016-05-06 | 2 | -45/+122 |
|\ | | | | | Reduce database inserts when sending transactions | ||||
| * | 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 |
|/ | |||||
* | Merge pull request #765 from matrix-org/markjh/open_id | Mark Haines | 2016-05-05 | 7 | -2/+193 |
|\ | | | | | Add an openidish mechanism for proving that you own a given user_id | ||||
| * | 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 | ||||
* | 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 |
| | | |||||
* | | starting point for doc on how log contexts are supposed to work | Matthew Hodgson | 2016-05-04 | 1 | -0/+10 |
| | | |||||
* | | 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 |
| | | |||||
* | | Merge pull request #758 from matrix-org/dbkr/fix_password_reset | David Baker | 2016-04-29 | 1 | -0/+1 |
|\ \ | |/ |/| | Fix password reset | ||||
| * | 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 |
| | |||||
* | Merge pull request #756 from matrix-org/markjh/more_metrics | Mark Haines | 2016-04-28 | 9 | -47/+81 |
|\ | | | | | Report per request metrics for all of the things using request_handler | ||||
| * | 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 |
| | | |||||
* | | Merge pull request #754 from matrix-org/markjh/check_for_nop | Mark Haines | 2016-04-27 | 3 | -2/+14 |
|\ \ | |/ |/| | Check that something has happend before running the selects | ||||
| * | 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 |
| | |||||
* | Merge pull request #753 from matrix-org/markjh/daemon_pusher | Mark Haines | 2016-04-26 | 1 | -4/+36 |
|\ | | | | | Optionally daemonize the pusher | ||||
| * | 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 |
| | | |||||
* | | Merge pull request #752 from matrix-org/markjh/more_updates | Mark Haines | 2016-04-26 | 1 | -0/+8 |
|\ \ | | | | | | | Add a couple of update methods to the PusherSlaveStore | ||||
| * | | Add a couple of update methods to the PusherSlaveStore | Mark Haines | 2016-04-26 | 1 | -0/+8 |
|/ / | |||||
* | | Merge pull request #751 from matrix-org/markjh/pusher_metrics_manhole | Mark Haines | 2016-04-26 | 2 | -3/+92 |
|\ \ | | | | | | | Add a metrics listener and a ssh listener to the pusher | ||||
| * | | 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 |
|/ / | |||||
* | | Merge pull request #749 from matrix-org/markjh/split_manhole | Mark Haines | 2016-04-25 | 2 | -23/+52 |
|\ \ | |/ |/| | Split out setting up the manhole to a separate file | ||||
| * | 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 pull request #748 from matrix-org/markjh/split_out_site.py | Mark Haines | 2016-04-22 | 2 | -130/+149 |
|\| | | | | | Move SynapseSite to its own file | ||||
| * | Merge branch 'develop' into markjh/split_out_site.py | Mark Haines | 2016-04-22 | 2 | -82/+105 |
| |\ | |/ |/| | | | | | Conflicts: synapse/app/homeserver.py | ||||
* | | Merge pull request #747 from matrix-org/markjh/http_resource_tree | Mark Haines | 2016-04-22 | 2 | -82/+105 |
|\ \ | | | | | | | Split out create_resource_tree to a separate file | ||||
| * | | 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 | 5 | -49/+250 |
|\ \ | | | | | | | Optimise event_search in postgres | ||||
| * | | Update port script | Erik Johnston | 2016-04-22 | 1 | -42/+81 |
| | | | |||||
| * | | 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 |
| |/ / | |||||
* | | | Merge pull request #742 from matrix-org/markjh/slave_event_push_actions | Mark Haines | 2016-04-21 | 2 | -0/+57 |
|\ \ \ | |/ / |/| | | Replicate push actions | ||||
| * | | Merge branch 'develop' into markjh/slave_event_push_actions | Mark Haines | 2016-04-21 | 3 | -86/+2 |
| |\ \ | |/ / |/| | | |||||
* | | | pip install new python dependencies in jenkins.sh | Mark Haines | 2016-04-21 | 3 | -86/+2 |
| | | | |||||
| * | | Merge branch 'develop' into markjh/slave_event_push_actions | Mark Haines | 2016-04-21 | 2 | -0/+2 |
| |\ \ | |/ / |/| | | |||||
* | | | Make jenkins install lxml | Erik Johnston | 2016-04-21 | 2 | -0/+2 |
| | | | |||||
| * | | Replicate push actions | Mark Haines | 2016-04-21 | 2 | -0/+57 |
|/ / | |||||
* | | Merge pull request #740 from matrix-org/erikj/state_cache | Erik Johnston | 2016-04-20 | 1 | -3/+10 |
|\ \ | | | | | | | Always use state cache entry if it exists | ||||
| * | | 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 | 4 | -3/+104 |
|\ \ \ | |/ / |/| | | Add a slaved receipts store | ||||
| * | | Add a slaved receipts store | Mark Haines | 2016-04-19 | 4 | -3/+104 |
| | | | |||||
* | | | 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 |
| |/ / | |||||
* | | | Merge pull request #736 from matrix-org/markjh/slave_invited_rooms_for_user | Mark Haines | 2016-04-19 | 2 | -2/+19 |
|\ \ \ | |/ / |/| | | Replicate get_invited_rooms_for_user | ||||
| * | | Replicate get_invited_rooms_for_user | Mark Haines | 2016-04-19 | 2 | -2/+19 |
|/ / | |||||
* | | 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 |
| | | |||||
* | | Merge pull request #735 from matrix-org/erikj/media_resource_cleanup | Erik Johnston | 2016-04-19 | 7 | -531/+580 |
|\ \ | | | | | | | Split out BaseMediaResource into MediaRepository | ||||
| * | | 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. | ||||
* | | Merge pull request #734 from matrix-org/erikj/measure | Erik Johnston | 2016-04-18 | 2 | -8/+19 |
|\ \ | | | | | | | Create log context in Measure if one doesn't exist | ||||
| * | | Create log context in Measure if one doesn't exist | Erik Johnston | 2016-04-18 | 2 | -8/+19 |
|/ / | |||||
* | | 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 | ||||
* | | Merge pull request #731 from matrix-org/erikj/timed_otu | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
|\ \ | | | | | | | Use SynapseError 504 for Timeout errors | ||||
| * | | 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 |
| | | | |||||
* | | | Merge pull request #727 from matrix-org/kegan/fix-asapi-reg | Kegsay | 2016-04-14 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Make v2_alpha reg follow the AS API specification | ||||
| * | | | 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 | ||||
* | | | Merge pull request #726 from matrix-org/erikj/push_metric | Erik Johnston | 2016-04-14 | 1 | -11/+15 |
|\ \ \ | |/ / |/| | | Measure push action generator | ||||
| * | | 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 |
| | | | |||||
* | | | Merge pull request #724 from matrix-org/erikj/push_measure | Erik Johnston | 2016-04-14 | 3 | -25/+50 |
|\ \ \ | | | | | | | | | Add push index. Add extra Measure | ||||
| * | | | 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 |
|/ / | |||||
* | | Update replication.rst | Mark Haines | 2016-04-12 | 1 | -1/+1 |
| | | |||||
* | | Add some design documentation for replication | Mark Haines | 2016-04-12 | 1 | -0/+58 |
| | | |||||
* | | 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 | ||||
* | | | Merge pull request #717 from matrix-org/erikj/backfill_state | Erik Johnston | 2016-04-12 | 2 | -15/+59 |
|\ \ \ | |/ / |/| | | Check if we've already backfilled events | ||||
| * | | 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 | 32 | -202/+776 |
| |\ \ | | | | | | | | | | | | | 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 | ||||
* | | | | PEP8 | Erik Johnston | 2016-04-11 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge pull request #688 from matrix-org/matthew/preview_urls | Matthew Hodgson | 2016-04-11 | 13 | -10/+952 |
|\ \ \ \ | | | | | | | | | | | URL previewing support | ||||
| * | | | | fix typos and needless try/except from PR review | Matthew Hodgson | 2016-04-11 | 1 | -143/+140 |
| | | | | | |||||
| * | | | | actually throw meaningful errors | Matthew Hodgson | 2016-04-08 | 2 | -14/+40 |
| | | | | | |||||
| * | | | | Fix pep8 warning | Mark Haines | 2016-04-08 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | move local_media_repository_url_cache.sql to schema v31 | Matthew Hodgson | 2016-04-08 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | fix typo | Matthew Hodgson | 2016-04-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix error checking for new SQL | Matthew Hodgson | 2016-04-08 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | more PR feedback | Matthew Hodgson | 2016-04-08 | 1 | -4/+8 |
| | | | | | |||||
| * | | | | fix SQL based on PR feedback | Matthew Hodgson | 2016-04-08 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | Add more doc | Matthew Hodgson | 2016-04-08 | 2 | -1/+4 |
| | | | | | |||||
| * | | | | Add doc | Matthew Hodgson | 2016-04-08 | 2 | -1/+23 |
| | | | | | |||||
| * | | | | Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵ | Matthew Hodgson | 2016-04-08 | 6 | -31/+214 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defaults to off. Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered. Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered. Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist Add commentary and generally address PR feedback | ||||
| * | | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-07 | 42 | -402/+1396 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 41 | -997/+1563 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | report image size (bytewise) in OG meta | Matthew Hodgson | 2016-04-03 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | char encoding | Matthew Hodgson | 2016-04-03 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | pep8 | Matthew Hodgson | 2016-04-03 | 4 | -60/+85 |
| | | | | | | |||||
| * | | | | | fix etag typing error. fix timestamp typing error | Matthew Hodgson | 2016-04-03 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | rebase all image URLs | Matthew Hodgson | 2016-04-03 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | remove stale todo | Matthew Hodgson | 2016-04-03 | 1 | -3/+0 |
| | | | | | | |||||
| * | | | | | Ensure only one download for a given URL is active at a time | Matthew Hodgson | 2016-04-03 | 1 | -1/+18 |
| | | | | | | |||||
| * | | | | | add a persistent cache of URL lookups, and fix up the in-memory one to work | Matthew Hodgson | 2016-04-03 | 4 | -14/+137 |
| | | | | | | |||||
| * | | | | | support gzip compression, and don't pass through error msgs | Matthew Hodgson | 2016-04-02 | 2 | -5/+11 |
| | | | | | | |||||
| * | | | | | how was _respond_default_thumbnail ever meant to work? | Matthew Hodgson | 2016-04-02 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | pass back SVGs as their own thumbnails | Matthew Hodgson | 2016-04-02 | 1 | -0/+20 |
| | | | | | | |||||
| * | | | | | handle missing dimensions without crashing | Matthew Hodgson | 2016-04-02 | 1 | -4/+13 |
| | | | | | | |||||
| * | | | | | make meta comparisons case insensitive | Matthew Hodgson | 2016-04-02 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | refactor calc_og; spider image URLs; fix xpath; add a (broken) ↵ | Matthew Hodgson | 2016-04-02 | 1 | -81/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | expiringcache; loads of other fixes | ||||
| * | | | | | fix assorted redirect, unicode and screenscraping bugs | Matthew Hodgson | 2016-04-01 | 1 | -78/+96 |
| | | | | | | |||||
| * | | | | | handle spidered relative images correctly | Matthew Hodgson | 2016-03-31 | 2 | -3/+13 |
| | | | | | | |||||
| * | | | | | prevent choking on invalid utf-8, and handle image thumbnailing smarter | Matthew Hodgson | 2016-03-31 | 1 | -5/+18 |
| | | | | | | |||||
| * | | | | | synthesise basig OG metadata from pages lacking it | Matthew Hodgson | 2016-03-31 | 1 | -0/+47 |
| | | | | | | |||||
| * | | | | | sync in changes from matrixfederationclient | Matthew Hodgson | 2016-03-31 | 1 | -2/+6 |
| | | | | | | |||||
| * | | | | | handle requests with missing content-length headers (e.g. YouTube) | Matthew Hodgson | 2016-03-31 | 2 | -9/+28 |
| | | | | | | |||||
| * | | | | | spell out more packages | Matthew Hodgson | 2016-03-30 | 1 | -8/+21 |
| | | | | | | |||||
| * | | | | | fix bugs | Matthew Hodgson | 2016-03-29 | 1 | -5/+6 |
| | | | | | | |||||
| * | | | | | implement redirects | Matthew Hodgson | 2016-03-29 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | debug | Matthew Hodgson | 2016-03-29 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | make it work | Matthew Hodgson | 2016-03-29 | 4 | -57/+80 |
| | | | | | | |||||
| * | | | | | make it build | Matthew Hodgson | 2016-03-29 | 3 | -9/+11 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-29 | 29 | -319/+616 |
| |\ \ \ \ \ | |||||
| | * | | | | | typo | Matthew Hodgson | 2016-03-29 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-27 | 217 | -7055/+8696 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | typo | Matthew Hodgson | 2016-03-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | initial WIP of a tentative preview_url endpoint - incomplete, untested, ↵ | Matthew Hodgson | 2016-01-24 | 5 | -1/+327 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | experimental, etc. just putting it here for safekeeping for now | ||||
* | | | | | | | | Merge pull request #677 from matrix-org/erikj/dns_cache | Erik Johnston | 2016-04-08 | 2 | -19/+56 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Read from DNS cache if within TTL | ||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache | Erik Johnston | 2016-04-07 | 60 | -1250/+2294 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Tests | Erik Johnston | 2016-04-06 | 1 | -2/+29 |
| | | | | | | | | | |||||
| * | | | | | | | | Allow clock to be passed in to func | Erik Johnston | 2016-03-31 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Read from DNS cache if within TTL | Erik Johnston | 2016-03-31 | 2 | -17/+27 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_data | Erik Johnston | 2016-04-08 | 1 | -15/+0 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | changed_presencelike_data isn't observed anywhere so can be removed | ||||
| * | | | | | | | | | changed_presencelike_data isn't observed anywhere in synapse so can be removed | Mark Haines | 2016-04-08 | 1 | -15/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 15 | -485/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want | ||||
* | | | | | | | | | | Merge pull request #710 from matrix-org/markjh/move_fire | Mark Haines | 2016-04-08 | 5 | -39/+24 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Move all the wrapper functions for distributor.fire | ||||
| * | | | | | | | | | Move all the wrapper functions for distributor.fire | Mark Haines | 2016-04-08 | 5 | -39/+24 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file. | ||||
* | | | | | | | | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data | Mark Haines | 2016-04-08 | 2 | -37/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Call profile handler get_displayname directly | ||||
| * | | | | | | | | | Call profile handler get_displayname directly rather than using ↵ | Mark Haines | 2016-04-07 | 2 | -37/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | collect_presencelike_data | ||||
* | | | | | | | | | Merge pull request #701 from DoubleMalt/ldap-auth | Erik Johnston | 2016-04-07 | 4 | -10/+134 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add LDAP authentication | ||||
| * | | | | | | | | | Add myself to AUTHORS.rst | Christoph Witzany | 2016-04-07 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Witzany <christoph@web.crofting.com> | ||||
| * | | | | | | | | | fix check for failed authentication | Christoph Witzany | 2016-04-06 | 1 | -2/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | remove line | Christoph Witzany | 2016-04-06 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | make tests for ldap more specific to not be fooled by Mocks | Christoph Witzany | 2016-04-06 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | output ldap version for info and to pacify pep8 | Christoph Witzany | 2016-04-06 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | conditionally import ldap | Christoph Witzany | 2016-04-06 | 2 | -3/+5 |
| | | | | | | | | | |