Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3841 from matrix-org/erikj/manhole_key_length | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
|\ | | | | | Change the manhole SSH key to have more bits | ||||
| * | Newsfile | Erik Johnston | 2018-09-11 | 1 | -0/+1 |
| | | |||||
* | | Add JUnit summaries to CircleCI as well as merged runs (#3704) | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| | | |||||
* | | Port federation/ to py3 (#3847) | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3835 from krombel/fix_3821 | Amber Brown | 2018-09-12 | 1 | -0/+1 |
|\ \ | | | | | | | fix VOIP crashes under Python 3 | ||||
| * | | add changelog | Krombel | 2018-09-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyring | Amber Brown | 2018-09-12 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | add some logging for the keyring queue | ||||
| * | | | changelog | Richard van der Hoff | 2018-09-07 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_import | Amber Brown | 2018-09-12 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Fix jwt import check | ||||
| * | | | | changelog | Richard van der Hoff | 2018-09-07 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Port rest/ to Python 3 (#3823) | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Port crypto/ to Python 3 (#3822) | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Newsfile | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 2 | -0/+2 |
| |_|_|/ |/| | | | | | | | | | | | | | | | * speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840) | ||||
* | | | | Newsfile | Mathijs van Gorcum | 2018-09-10 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join | Amber Brown | 2018-09-07 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Send existing room tags down sync on join | ||||
| * | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' into develop | Amber Brown | 2018-09-07 | 27 | -27/+0 |
|\ \ \ | |||||
| * | | | changelog v0.33.4 github/release-v0.33.4 release-v0.33.4 | Amber Brown | 2018-09-07 | 1 | -1/+0 |
| | | | | |||||
| * | | | Create 3802.misc | Jan Christian Grünhage | 2018-09-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | version and towncrier v0.33.4rc1 | Amber Brown | 2018-09-04 | 27 | -27/+0 |
| | | | | |||||
* | | | | Port tests/ to Python 3 (#3808) | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | guest users should not be part of mau total | ||||
| * | | | towncrier | Neil Johnson | 2018-09-05 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus | Amber Brown | 2018-09-07 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Limit the number of PDUs/EDUs per fedreation transaction | ||||
| * | | | Spelling | Erik Johnston | 2018-09-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis | Amber Brown | 2018-09-07 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Only start postgres instance for postgres tests on Travis CI | ||||
| * | | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_id | Amber Brown | 2018-09-07 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Remove conn_id from repl prometheus metrics | ||||
| * | | | | Newsfile | Erik Johnston | 2018-09-03 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | User iter* during sync state calculations | ||||
| * | | | | | Newsfile | Erik Johnston | 2018-09-05 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_dep | Amber Brown | 2018-09-07 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | bump dep on pyopenssl to 16.x | ||||
| * | | | | | changelog | Richard van der Hoff | 2018-09-06 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* / | | | | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter | Richard van der Hoff | 2018-09-05 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Implement 'event_format' filter param in /sync | ||||
| * | | | | changelog | Richard van der Hoff | 2018-09-04 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Port http/ to Python 3 (#3771) | Amber Brown | 2018-09-06 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5 | Neil Johnson | 2018-09-04 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | improve human readable error messages | ||||
| * | | towncrier | Neil Johnson | 2018-09-04 | 1 | -0/+1 |
| | | | |||||
* | | | Fix tests on postgresql (#3740) | Amber Brown | 2018-09-04 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 1 | -0/+1 |
|\ \ | | | | | | | Remove unnecessary resolve_events_with_state_map | ||||
| * | | Newsfile | Erik Johnston | 2018-09-03 | 1 | -0/+1 |
| | | | |||||
* | | | Create 3378.misc | Amber Brown | 2018-09-03 | 1 | -0/+1 |
| |/ |/| | |||||
* | | typo | Neil Johnson | 2018-08-31 | 1 | -1/+1 |
| | | |||||
* | | news fragemnt | Neil Johnson | 2018-08-31 | 1 | -0/+1 |
| | | |||||
* | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init | Richard van der Hoff | 2018-08-30 | 1 | -0/+1 |
|\ \ | | | | | | | Make sure that we close db connections opened during init | ||||
| * | | changelog | Richard van der Hoff | 2018-08-28 | 1 | -0/+1 |
| | | | |||||
* | | | changelog | Krombel | 2018-08-29 | 2 | -1/+1 |
| | | | |||||
* | | | fix #3445 | Krombel | 2018-08-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3] but SortedDict only implements d.values() | ||||
* | | | Update CONTRIBUTING to clarify miscs & Markdown (#3730) | Amber Brown | 2018-08-29 | 1 | -0/+1 |
| | | | |||||
* | | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 1 | -0/+1 |
|/ / | | | | | don't return non-LL-member state in incremental sync state blocks | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | | | |||||
* | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
|/ / | |||||
* | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1 | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
|\ \ | | | | | | | Allow federation_domain_whitelist to be emtpy list | ||||
| * | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Fix bug where we broke sync when using limit_usage_by_mau | ||||
| * | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #3751 from matrix-org/rav/twisted_17 | Richard van der Hoff | 2018-08-24 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Pin to twisted 17.1 or later | ||||
| * | | changelog | Richard van der Hoff | 2018-08-24 | 1 | -0/+1 |
| | | | |||||
* | | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
|/ / | |||||
* | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3734 from matrix-org/travis/worker-docs | Travis Ralston | 2018-08-23 | 1 | -0/+1 |
|\ \ | | | | | | | Reference that the federation_reader needs the HTTP replication port set | ||||
| * | | Create 3734.misc | Travis Ralston | 2018-08-21 | 1 | -0/+1 |
| | | | |||||
* | | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-22 | 40 | -33/+7 |
|\ \ \ | | |/ | |/| | | | | neilj/server_notices_on_blocking | ||||
| * | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-22 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | Revert "Use recaptcha_ajax.js directly from Google" | Richard van der Hoff | 2018-08-13 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-event | Erik Johnston | 2018-08-22 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Allow guests to use /rooms/:roomId/event/:eventId | ||||
| | * | | | 3724.feature | Will Hunt | 2018-08-20 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Allow profile updates to happen on workers | ||||
| | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-17 | 83 | -54/+25 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/split_profiles | ||||
| | * | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor state module to support multiple room versions | ||||
| | * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-20 | 33 | -0/+33 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_state_handler | ||||
| | * | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spelling | Richard van der Hoff | 2018-08-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | limt -> limit | ||||
| | * | | | | | | | | Create 3735.misc | Travis Ralston | 2018-08-21 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.3' into develop | Richard van der Hoff | 2018-08-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-21 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Split the state_group_cache in two (#3726) | Matthew Hodgson | 2018-08-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits the state_group_cache in two. One half contains normal state events; the other contains member events. The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache. This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching. Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow. Hopefully fixes https://github.com/matrix-org/synapse/issues/3720. | ||||
| * | | | | | | | | | Merge tag 'v0.33.3rc2' into develop | Richard van der Hoff | 2018-08-21 | 42 | -42/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723)) | ||||
| | * | | | | | | | | changelog v0.33.3rc2 | Amber Brown | 2018-08-21 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-20 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | changelog v0.33.3rc1 | Amber Brown | 2018-08-21 | 42 | -42/+0 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keys | Erik Johnston | 2018-08-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't log exceptions when failing to fetch server keys | ||||
| | * | | | | | | | | Newsfile | Erik Johnston | 2018-08-21 | 1 | -0/+1 |
| | |/ / / / / / / | |||||
| * / / / / / / / | Newsfile | Erik Johnston | 2018-08-20 | 1 | -0/+1 |
| |/ / / / / / / | |||||
| * | | / / / / | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 1 | -0/+1 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-08-20 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_logging | Erik Johnston | 2018-08-20 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix logging bug in EDU handling over replication | ||||
| | * | | | | | | Newsfile | Erik Johnston | 2018-08-17 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Logcontexts for replication command handlers | ||||
| | * | | | | | | | changelog | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix logcontexts for running pushers | ||||
| | * | | | | | | | changelog | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Remove v1/register's broken shared secret functionality (#3703) | Amber Brown | 2018-08-18 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use a producer to stream back responses | ||||
| | * | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producers | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor request logging code | ||||
| | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| * | | | | | | | | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| * | | | | | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| * | | | | | | | | | Merge pull request #3708 from ↵ | Neil Johnson | 2018-08-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neilj/resource_Limit_block_event_creation Neilj/resource limit block event creation | ||||
| | * | | | | | | | | | For resource limit blocked users, prevent writing into rooms | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * / | | | | | | | | Create 3712.misc | Travis Ralston | 2018-08-17 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
| * / / / / / / / | Newsfile | Erik Johnston | 2018-08-16 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-16 | 2 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| * | | | | | | | Add GET media/v1/config (#3184) | Will Hunt | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| * | | | | | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 2 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| * | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix Mau off by one errors | ||||
| | * | | | | | | | Fix mau blocking calulation bug on login | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove incorrectly re-added changelog files | Richard van der Hoff | 2018-08-15 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were removed for the 0.33.2 release, but were incorrectly re-added in | ||||
| * | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 3 | -0/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 15 | -0/+15 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| * | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Move more federation APIs to workers | ||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 73 | -54/+15 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| | * | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | support admin_email config and pass through into blocking errors, | ||||
| | * | | | | | | remove changelog referencing another PR | Neil Johnson | 2018-08-15 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵ | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email | ||||
| | | * | | | | | | update resource limit error codes | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | update admin email to uri | Neil Johnson | 2018-08-15 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 6 | -0/+6 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | set admin email via config | Neil Johnson | 2018-08-13 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | combine mau metrics into one group | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 2 | -0/+2 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | neilj/change_prometheus_mau_metric_name | ||||
| | * | | | | | | | | Rename MAU prometheus metric | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | ||||
| | * | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | ||||
| * | | | | | | | | 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 | ||||
| * | | | | | | | | 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 |
| | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | * | | | | | | | 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 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixes test_reap_monthly_active_users so it passes under postgres | Neil Johnson | 2018-08-11 | 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 |
| | / / / / / / / / | |||||
* | | | | | / / / / | server notices for resource limit blocking | Neil Johnson | 2018-08-10 | 1 | -0/+1 |
| |_|_|_|_|/ / / / |/| | | | | | | | | |||||
* | | | | | | | | | Where server is disabled, block ability for locked out users to read new ↵ | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | messages | ||||
* | | | | | | | | 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 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | |