Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ | |||||
| * | | 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 |
* | | | 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 |
|/ / | |||||
* | | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 |
|\ \ | |||||
| * | | 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 neilj/server_not... | Erik Johnston | 2018-08-22 | 40 | -33/+7 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 |
| |\ \ \ | |||||
| | * | | | 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 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-17 | 83 | -54/+25 |
| | |\ \ \ \ | |||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2018-08-20 | 33 | -0/+33 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 |
| * | | | | | | | | | Merge tag 'v0.33.3rc2' into develop | Richard van der Hoff | 2018-08-21 | 42 | -42/+0 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | 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 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 1 | -0/+1 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | 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 neilj/server_not... | Neil Johnson | 2018-08-17 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... | Neil Johnson | 2018-08-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 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 neilj/server_not... | Neil Johnson | 2018-08-16 | 2 | -0/+2 |
|\| | | | | | | | |||||
| * | | | | | | | 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 neilj/server_not... | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
|\| | | | | | | | |||||
| * | | | | | | | 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 neilj/server_not... | Neil Johnson | 2018-08-15 | 2 | -0/+2 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 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 |
| * | | | | | | | | 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 neilj/server_not... | Neil Johnson | 2018-08-15 | 15 | -0/+15 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-15 | 73 | -54/+15 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | remove changelog referencing another PR | Neil Johnson | 2018-08-15 | 1 | -1/+0 |
| | * | | | | | | Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap... | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro... | Neil Johnson | 2018-08-14 | 2 | -0/+2 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | * | | | | | | | | 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 | Erik Johnston | 2018-08-08 | 1 | -0/+1 |
| * | | | | | | | | Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved... | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| * | | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Dockerised sytest (#3660) | Amber Brown | 2018-08-14 | 1 | -0/+1 |
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po... | Amber Brown | 2018-08-14 | 4 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 | 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 | Andrej Shadura | 2018-08-10 | 1 | -0/+1 |
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | 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 send_sni_for_federation_... | Jeroen | 2018-07-14 | 12 | -0/+7 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 2 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 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 mess... | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r... | Erik Johnston | 2018-08-03 | 12 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-06 | 1 | -0/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u... | Neil Johnson | 2018-08-08 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | 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 matrix-org/michaelkaye/refactor_docker_location... | Michael Kaye | 2018-08-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
* | | | | | | | Merge pull request #3638 from matrix-org/rav/refactor_federation_client_excep... | Richard van der Hoff | 2018-08-02 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_... | Erik Johnston | 2018-07-30 | 9 | -0/+9 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | improve clarity | Neil Johnson | 2018-08-01 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i... | Neil Johnson | 2018-08-01 | 6 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | 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 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [Docker] Use sorted multiline package lists | Benedikt Heine | 2018-07-19 | 1 | -0/+1 |
* | | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layer | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 | Richard van der Hoff | 2018-07-27 | 1 | -0/+1 |
* | | | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failures | Travis Ralston | 2018-07-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove pdu_failures from transactions | Travis Ralston | 2018-07-30 | 1 | -0/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchy | Richard van der Hoff | 2018-07-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
* | | | | | | | | | Only import secrets when available | Krombel | 2018-07-30 | 1 | -0/+1 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 1 | -0/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | add changelog entry for PR#3391 | Michael Telatynski | 2018-07-24 | 1 | -0/+1 |
* | | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leave | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
* | | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_id | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | 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 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | 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 | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cache | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | 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 |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c... | Erik Johnston | 2018-07-24 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | 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 erikj/client_api... | Erik Johnston | 2018-07-23 | 29 | -10/+10 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | 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 |
|\ \ \ \ \ \ |