Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 6 | -0/+6 |
|\ | |||||
| * | Fix missing yield in ↵ | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | | | | | | | synapse.storage.monthly_active_users.initialise_reserved_users | ||||
| * | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| |\ | | | | | | | Block ability to read via sync if mau limit exceeded | ||||
| | * | Where server is disabled, block ability for locked out users to read new ↵ | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | | | | messages | ||||
| * | | Dockerised sytest (#3660) | Amber Brown | 2018-08-14 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into ↵ | Amber Brown | 2018-08-14 | 4 | -0/+4 |
| |\ \ | | | | | | | | | | | | | neilj/fix_reap_users_in_postgres | ||||
| | * | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base | Jan Christian Grünhage | 2018-08-14 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | update docker base-image to alpine 3.8 | ||||
| | | * | | update docker base-image to alpine 3.8 | Jan Christian Grünhage | 2018-08-09 | 1 | -0/+1 |
| | | |/ | |||||
| * | | | Fixes test_reap_monthly_active_users so it passes under postgres | Neil Johnson | 2018-08-11 | 1 | -0/+1 |
| | | | | |||||
* | | | | set admin email via config | Neil Johnson | 2018-08-13 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Name changelog after PR, not bug | Richard van der Hoff | 2018-08-13 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | Use recaptcha_ajax.js directly from Google | ||||
| * | | | Use recaptcha_ajax.js directly from Google | Andrej Shadura | 2018-08-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script recaptcha_ajax.js contains minified non-free code which we probably cannot redistribute. Since it talks to Google servers anyway, it is better to just download it from Google directly instead of shipping it. This fixes #1932. | ||||
* | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-tests | Amber Brown | 2018-08-11 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Blackify the tests | ||||
| * | | | changelog | Amber Brown | 2018-08-10 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'rav/fix_linearizer_cancellation' into develop | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | changelog | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
| |/ / | |||||
* | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | send SNI for federation requests | ||||
| * | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 50 | -7/+37 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 12 | -0/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | ||||
| * \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 2 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py | ||||
| * | | | | | towncrier changelog | Jeroen | 2018-06-26 | 1 | -0/+1 |
| / / / / | |||||
* | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Flag to disable HS without disabling federation | ||||
| * \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Ability to disable client/server Synapse via conf toggle | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 58 | -54/+0 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | changelog | Amber Brown | 2018-08-07 | 58 | -54/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | ||||
| * | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-03 | 12 | -0/+12 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet | ||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2018-07-31 | 1 | -0/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | more metrics for the federation and appservice senders | ||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Support for room versioning | ||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-08-06 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-08 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | neilj/reserved_users | ||||
| * | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | API for monthly_active_users table | ||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3644 from ↵ | Michael Kaye | 2018-08-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | matrix-org/michaelkaye/refactor_docker_locations_v2 Refactor Dockerfile location | ||||
| | * | | | | | | Add news entry | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Ability to whitelist specific threepids against monthly active user limiting | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Add ability to limit number of monthly active users on the server | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
|/ / / / / / | |||||
* / / / / / | newsfragment | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Clean up handling of errors from outbound requests | ||||
| * | | | | | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #3638 from ↵ | Richard van der Hoff | 2018-08-02 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/refactor_federation_client_exception_handling Factor out exception handling in federation_client | ||||
| * | | | | | | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Split out DB writes in federation handler | ||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-30 | 9 | -0/+9 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_fed_store | ||||
| * | | | | | | | Newsfile | Erik Johnston | 2018-07-27 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Initial impl of capping MAU | ||||
| * | | | | | | | | improve clarity | Neil Johnson | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-01 | 6 | -0/+6 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits | ||||
| * | | | | | | | | | mau limts | Neil Johnson | 2018-07-31 | 1 | -0/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-found | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | return 404 if room not found | ||||
| * | | | | | | | | Update 2952.bugfix | Richard van der Hoff | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | return NotFoundError if room not found | Serban Constantin | 2018-07-31 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the Client-Server API[0] we should return `M_NOT_FOUND` if the room isn't found instead of generic SynapseError. This ensures that /directory/list API returns 404 for room not found instead of 400. [0]: https://matrix.org/docs/spec/client_server/unstable.html#get-matrix-client-r0-directory-list-room-roomid Signed-off-by: Serban Constantin <serban.constantin@gmail.com> | ||||
* | | | | | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 1 | -0/+1 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3543 from bebehei/docker | Jan Christian Grünhage | 2018-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improvements for Docker usage | ||||
| * | | | | | | | | [Docker] Use sorted multiline package lists | Benedikt Heine | 2018-07-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches docker best practices. Signed-off-by: Benedikt Heine <bebe@bebehei.de> | ||||
* | | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layer | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | rename replication_layer to federation_client | ||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-07-31 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decorator | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | Rewrite cache list decorator | ||||
| * | | | | | | | | | Rewrite cache list decorator | Richard van der Hoff | 2018-07-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it was complicated and annoyed me. I suspect this will be more efficient too. | ||||
* | | | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failures | Travis Ralston | 2018-07-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Remove pdu_failures from transactions | ||||
| * | | | | | | | | | Remove pdu_failures from transactions | Travis Ralston | 2018-07-30 | 1 | -0/+1 |
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | The field is never read from, and all the opportunities given to populate it are not utilized. It should be very safe to remove this. | ||||
* | | | | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchy | Richard van der Hoff | 2018-07-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Make EventStore inherit from EventFederationStore | ||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Only import secrets when available | Krombel | 2018-07-30 | 1 | -0/+1 |
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secrets got introduced in python 3.6 so this class is not available in 3.5 and before. This now checks for the current running version and only tries using secrets if the version is 3.6 or above Signed-Off-By: Matthias Kesler <krombel@krombel.de> | ||||
* | | | | | | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 1 | -0/+1 |
| |/ / / / / / |/| | | | | | | | | | | | | | make /context lazyload & filter aware. | ||||
* | | | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | if inviter_display_name == ""||None then default to inviter MXID | ||||
| * | | | | | | add changelog entry for PR#3391 | Michael Telatynski | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | ||||
* | | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leave | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update the send_leave path to be an event_id | ||||
| * | | | | | | | Create 3616.misc | Travis Ralston | 2018-07-26 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_content | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Stop populating events.content | ||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * attempt at deduplicating lazy-loaded members as per the proposal; we can deduplicate redundant lazy-loaded members which are sent in the same sync sequence. we do this heuristically rather than requiring the client to somehow tell us which members it has chosen to cache, by instead caching the last N members sent to a client, and not sending them again. For now we hardcode N to 100. Each cache for a given (user,device) tuple is in turn cached for up to X minutes (to avoid the caches building up). For now we hardcode X to 30. * add include_redundant_members filter option & make it work * remove stale todo * add tests for _get_some_state_from_cache * incorporate review | ||||
* | | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_id | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Remove some redundant joins on event_edges.room_id | ||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
| |/ / / / / / | |||||
* / / / / / / | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call. | ||||
* | | | | | | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Implement the lazy_load_members room state filter parameter | ||||
| * \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 10 | -0/+10 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | changelog | Matthew Hodgson | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Create 3609.misc | Travis Ralston | 2018-07-25 | 1 | -0/+1 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3603 from matrix-org/erikj/handle_outliers | Erik Johnston | 2018-07-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Correctly handle outliers during persist events | ||||
| * | | | | | | | | Newsfile | Erik Johnston | 2018-07-25 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_more | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix another logcontext leak in _persist_events | ||||
| * | | | | | | | | | Fix another logcontext leak in _persist_events | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to run the errback in the sentinel context to avoid losing our own context. Also: add logging to runInteraction to help identify where "Starting db connection from sentinel context" warnings are coming from | ||||
* | | | | | | | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_error | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix occasional 'tuple index out of range' error | ||||
| * | | | | | | | | | Fix occasional 'tuple index out of range' error | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in _delete_existing_rows_txn which was introduced in #3435 (though it's been on matrix-org-hotfixes for *years*). This code is only called when there is some sort of conflict the first time we try to persist an event, so it only happens rarely. Still, the exceptions are annoying. | ||||
* | | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cache | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix updating of cached remote profiles | ||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* / / / / / / / / | Changelog | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Move newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+0 |
| | | | | | | | | |||||
* | | | | | | | | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3595 from matrix-org/erikj/use_deltas | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use deltas to calculate current state deltas | ||||
| * | | | | | | | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3587 from matrix-org/rav/better_exception_logging | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improve logging for exceptions when handling PDUs | ||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-07-23 | 1 | -0/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groups | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixes and optimisations for resolve_state_groups | ||||
| * | | | | | | | newsfile | Richard van der Hoff | 2018-07-23 | 1 | -0/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Remove redundant checks on room forgottenness | ||||
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 4 | -0/+4 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-23 | 7 | -0/+5 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Remove redundant checks on room forgottenness | Richard van der Hoff | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3550 | ||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-24 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | erikj/speed_up_calculate_state_delta | ||||
| * | | | | | | | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 2 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge pull request #3555 from matrix-org/erikj/client_apis_move | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Make client_reader support some more read only APIs | ||||
| | | * \ \ \ \ \ \ | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 5 | -0/+4 |
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | |||||
| | | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-23 | 29 | -10/+10 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/client_apis_move | ||||
| | | * | | | | | | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | changelog | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
| | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * / | | | | | | | | Changelog | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* / / / / / / / / | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
|/ / / / / / / / | |||||
* | | | / / / / | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+0 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'develop' into matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 17 | -2/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Changelog | Richard van der Hoff | 2018-07-20 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixes | Richard van der Hoff | 2018-07-20 | 2 | -0/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | A set of improvements to the Limiter | ||||
| | * | | | | | changelogs | Richard van der Hoff | 2018-07-20 | 2 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 1 | -0/+0 |
| |/ / / / / | |||||
| * | | | | | changelog | Amber Brown | 2018-07-19 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into develop | Amber Brown | 2018-07-19 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | 0.33.0 final changelog v0.33.0 | Amber Brown | 2018-07-19 | 20 | -13/+0 |
| | | | | | | | |||||
| | * | | | | | update changelogs | Amber Brown | 2018-07-19 | 6 | -2/+4 |
| | | | | | | | |||||
| | * | | | | | Revert "0.33.0rc1 changelog" | Amber Brown | 2018-07-19 | 19 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21d3b879433e040babd43c89b62827f92e3ac861. | ||||
| * | | | | | | Don't spew errors because we can't save metrics (#3563) | Amber Brown | 2018-07-19 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/release-v0.33.0' into develop | Richard van der Hoff | 2018-07-19 | 20 | -10/+1 |
| |\| | | | | | |||||
| | * | | | | | changelog | Richard van der Hoff | 2018-07-19 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | 0.33.0rc1 changelog v0.33.0rc1 | Amber Brown | 2018-07-18 | 19 | -10/+0 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3556 from matrix-org/rav/background_processes | Richard van der Hoff | 2018-07-19 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Run things as background processes | ||||
| | * | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_code | Erik Johnston | 2018-07-19 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add response code to response timer metrics | ||||
| | * | | | | | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3553 from matrix-org/rav/background_process_tracking | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Resource tracking for background processes | ||||
| | * | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Remove event re-signing hacks | ||||
| | * | | | | | Add changelog | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaults | David Baker | 2018-07-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Comment dummy TURN parameters in default config | ||||
| | * | | | | | I failed to correctly guess the PR number | David Baker | 2018-07-11 | 1 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | Comment dummy TURN parameters in default config | David Baker | 2018-07-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This default config is parsed and used a base before the actual config is overlaid, so with these values not commented out, the code to detect when no turn params were set and refuse to generate credentials was never firing because the dummy default was always set. | ||||
| * | | | | | | changelog | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor and optimze filter_events_for_server | ||||
| | * | | | | | | Changelog | Richard van der Hoff | 2018-07-16 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2018-07-17 | 1 | -0/+0 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cache | Amber Brown | 2018-07-17 | 1 | -0/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't return unknown entities in get_entities_changed | ||||
| | * | | | | | | Newsfile | Erik Johnston | 2018-07-13 | 1 | -0/+0 |
| | |/ / / / / | |||||
| * | | | | / | check isort by travis | Krombel | 2018-07-16 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Use parse and asserts from http.servlet | ||||
| | * | | | | | add changelog | Krombel | 2018-07-13 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 1 | -0/+0 |
| |/ / / / / | |||||
| * | | | | | better changelog | Richard van der Hoff | 2018-07-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | changelog | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cache | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Reduce set building in get_entities_changed | ||||
| | * | | | | changelog | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | changelog | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #3505 from matrix-org/erikj/receipts_cahce | Erik Johnston | 2018-07-12 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | Use stream cache in get_linearized_receipts_for_room | ||||
| | * | | | Newsfile | Erik Johnston | 2018-07-10 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | changelog | Matthew Hodgson | 2018-07-12 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3498 from OlegGirko/fix_attrs_syntax | Amber Brown | 2018-07-11 | 1 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use more portable syntax using attrs package. Newer syntax attr.ib(factory=dict) is just a syntactic sugar for attr.ib(default=attr.Factory(dict)) It was introduced in newest version of attrs package (18.1.0) and doesn't work with older versions. We should either require minimum version of attrs to be 18.1.0, or use older (slightly more verbose) syntax. Requiring newest version is not a good solution because Linux distributions may have older version of attrs (17.4.0 in Fedora 28), and requiring to build (and package) newer version just to use newer syntactic sugar in only one test is just too much. It's much better to fix that test to use older syntax. Signed-off-by: Oleg Girko <ol@infoserver.lv> | ||||
| * | | | changelog entry | Amber Brown | 2018-07-11 | 1 | -0/+0 |
| | | | | |||||
* | | | | Attempt to include db threads in cpu usage stats (#3496) | Richard van der Hoff | 2018-07-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Let's try to include time spent in the DB threads in the per-request/block cpu usage metrics. | ||||
* | | | | Refactor logcontext resource usage tracking (#3501) | Richard van der Hoff | 2018-07-10 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | Factor out the resource usage tracking out to a separate object, which can be passed around and copied independently of the logcontext itself. | ||||
* | | | | changelog | Richard van der Hoff | 2018-07-09 | 1 | -0/+1 |
|/ / / | |||||
* | / | changelog | Amber Brown | 2018-07-09 | 1 | -0/+0 |
| |/ |/| | |||||
* | | Add an isort configuration (#3463) | Amber Brown | 2018-07-09 | 1 | -0/+0 |
| | | |||||
* | | changelog v0.32.2 github/release-v0.32.2 release-v0.32.2 | Amber Brown | 2018-07-07 | 1 | -1/+0 |
| | | |||||
* | | Correct attrs package name in requirements (#3492) | Amber Brown | 2018-07-07 | 2 | -0/+2 |
| | | |||||
* | | changelog v0.32.0rc1 | Amber Brown | 2018-07-05 | 28 | -19/+0 |
| | | |||||
* | | ACL changelog | Amber Brown | 2018-07-05 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3483 from matrix-org/rav/more_server_name_validation | Erik Johnston | 2018-07-05 | 1 | -0/+1 |
|\ \ | | | | | | | More server_name validation | ||||
| * | | More server_name validation | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | We need to do a bit more validation when we get a server name, but don't want to be re-doing it all over the shop, so factor out a separate parse_and_validate_server_name, and do the extra validation. Also, use it to verify the server name in the config file. | ||||
* | | | Merge pull request #3481 from matrix-org/rav/fix_cachedescriptor_test | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Reinstate lost run_on_reactor in unit test | ||||
| * | | Reinstate lost run_on_reactor in unit test | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| |/ | | | | | | | | | | | | | | | a61738b removed a call to run_on_reactor from a unit test, but that call was doing something useful, in making the function in question asynchronous. Reinstate the call and add a check that we are testing what we wanted to be testing. | ||||
* | | Merge pull request #3473 from matrix-org/erikj/thread_cache | Erik Johnston | 2018-07-04 | 1 | -0/+1 |
|\ \ | | | | | | | Invalidate cache on correct thread | ||||
| * | | Correct newsfile | Erik Johnston | 2018-07-02 | 2 | -0/+1 |
| | | | |||||
| * | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #3474 from matrix-org/erikj/py3_auth | Erik Johnston | 2018-07-04 | 1 | -0/+0 |
|\ \ \ | |_|/ |/| | | Fix up auth check | ||||
| * | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 |
| |/ | |||||
* | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 1 | -0/+1 |
| | | | | | | | | | | Make sure that server_names used in auth headers are sane, and reject them with a sensible error code, before they disappear off into the depths of the system. | ||||
* | | news snippet | Matthew Hodgson | 2018-07-02 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #3467 from matrix-org/hawkowl/contributor-requirements | Matthew Hodgson | 2018-06-30 | 1 | -0/+0 |
|\ | | | | | Clarify "real name" in contributor requirements | ||||
| * | topfile | Amber Brown | 2018-06-29 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 1 | -0/+1 |
|\ \ | | | | | | | Check the state of prev_events a bit more thoroughly when coming over federation | ||||
| * | | topfile update | Amber Brown | 2018-06-28 | 1 | -2/+1 |
| | | | |||||
| * | | topfile | Amber Brown | 2018-06-27 | 1 | -0/+2 |
| | | | |||||
* | | | add towncrier snippet | Matthew Hodgson | 2018-06-28 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 1 | -0/+1 |
| | | |||||
* | | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454) | Amber Brown | 2018-06-28 | 1 | -0/+0 |
|/ | |||||
* | Better testing framework for homeserver-using things (#3446) | Amber Brown | 2018-06-27 | 1 | -0/+0 |
| | |||||
* | Revert "Try to not use as much CPU in the StreamChangeCache" | Matthew Hodgson | 2018-06-26 | 1 | -0/+0 |
| | |||||
* | fixes | Amber Brown | 2018-06-26 | 1 | -0/+0 |
| | |||||
* | Use towncrier to build the changelog (#3425) | Amber Brown | 2018-06-25 | 15 | -0/+10 |