Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Append _total to metric and fix up spelling | Erik Johnston | 2018-10-10 | 1 | -2/+2 |
* | Newsfile | Erik Johnston | 2018-10-09 | 1 | -0/+1 |
* | Add metric to count lazy member sync requests | Erik Johnston | 2018-10-09 | 1 | -6/+20 |
* | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptions | Erik Johnston | 2018-10-09 | 3 | -13/+36 |
|\ | |||||
| * | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 2 | -31/+16 |
| * | Use errback pattern and catch async failures | Erik Johnston | 2018-10-08 | 2 | -15/+35 |
| * | Newsfile | Erik Johnston | 2018-10-05 | 1 | -0/+1 |
| * | Log looping call exceptions | Erik Johnston | 2018-10-05 | 1 | -1/+18 |
* | | Merge pull request #4017 from matrix-org/rav/optimise_filter_events_for_server | Richard van der Hoff | 2018-10-09 | 2 | -7/+7 |
|\ \ | |/ |/| | |||||
| * | Optimisation for filter_events_for_server | Richard van der Hoff | 2018-10-08 | 2 | -7/+7 |
|/ | |||||
* | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers | Richard van der Hoff | 2018-10-04 | 2 | -33/+70 |
|\ | |||||
| * | actually exclude outliers | Richard van der Hoff | 2018-10-03 | 1 | -1/+2 |
| * | fix newsfile name | Richard van der Hoff | 2018-10-03 | 1 | -0/+0 |
| * | remove debugging | Richard van der Hoff | 2018-10-02 | 1 | -10/+0 |
| * | Fix bug in forward_extremity update logic | Richard van der Hoff | 2018-10-02 | 2 | -33/+79 |
* | | Merge branch 'master' into develop | Amber Brown | 2018-10-04 | 63 | -66/+88 |
|\ \ | |||||
| * | | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6 | Amber Brown | 2018-10-04 | 2 | -1/+9 |
| * | | full version | Amber Brown | 2018-10-04 | 1 | -1/+1 |
| * | | Merge pull request #4002 from matrix-org/rav/pin_prometheus | Richard van der Hoff | 2018-10-03 | 2 | -1/+5 |
| |\ \ | |||||
| | * | | Pin to prometheus_client<0.4 to avoid renaming all of our metrics | Richard van der Hoff | 2018-10-03 | 2 | -1/+5 |
| |/ / | |||||
| * | | Merge pull request #3998 from matrix-org/michaelkaye/build_docker_images_of_r... | Richard van der Hoff | 2018-10-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Docker build all tags starting vX.Y.Z, inc RCs | Michael Kaye | 2018-10-03 | 1 | -1/+1 |
| |/ / | |||||
| * | | some changelog fixes | Amber Brown | 2018-10-03 | 1 | -8/+4 |
| * | | changelog v0.33.6rc1 | Amber Brown | 2018-10-03 | 60 | -61/+75 |
| * | | version | Amber Brown | 2018-10-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion | Erik Johnston | 2018-10-03 | 2 | -5/+3 |
|\ \ | |||||
| * | | Sanitise error messages when user doesn't have permission to invite | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| * | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| * | | Fix handling of rejected threepid invites | Erik Johnston | 2018-10-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration | Erik Johnston | 2018-10-03 | 2 | -2/+7 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| * | | Fix exception in background metrics collection | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| |/ | |||||
* | | Merge pull request #3997 from matrix-org/erikj/fix_profile_error_handling | Erik Johnston | 2018-10-03 | 2 | -6/+3 |
|\ \ | |/ |/| | |||||
| * | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| * | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
|/ | |||||
* | Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache | Erik Johnston | 2018-10-02 | 3 | -1/+47 |
|\ | |||||
| * | Add tests | Erik Johnston | 2018-10-02 | 1 | -0/+45 |
| * | Newsfile | Erik Johnston | 2018-10-02 | 1 | -0/+1 |
| * | Fix bug when invalidating destination retry timings | Erik Johnston | 2018-10-02 | 1 | -1/+1 |
* | | Remove Jenkins & other old dev junk (#3988) | Amber Brown | 2018-10-03 | 12 | -278/+4 |
|/ | |||||
* | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-02 | 2 | -2/+3 |
|\ | |||||
| * | Merge branch 'develop' into rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-01 | 68 | -442/+779 |
| |\ | |||||
| * | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | Fix error handling for missing auth_event | Richard van der Hoff | 2018-09-26 | 1 | -2/+2 |
* | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 4 | -5/+18 |
* | | | Merge pull request #3990 from matrix-org/erikj/fix_logging_lost_connection | Erik Johnston | 2018-10-02 | 2 | -6/+22 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2018-10-02 | 1 | -0/+1 |
| * | | | Fix error when logging incomplete requests | Erik Johnston | 2018-10-02 | 1 | -6/+21 |
|/ / / | |||||
* | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 3 | -22/+24 |
|\ \ \ | |||||
| * | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 3 | -22/+24 |
| | |/ | |/| | |||||
* | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 2 | -2/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Newsfile | Erik Johnston | 2018-10-01 | 1 | -0/+1 |
| * | | Fix lazy loaded sync with rejected state events | Erik Johnston | 2018-10-01 | 1 | -2/+2 |
* | | | Update instructions to point to pip install (#3985) | Amber Brown | 2018-10-02 | 4 | -61/+29 |
* | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 3 | -118/+47 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 31 | -38/+117 |
| |\ \ \ | |||||
| * | | | | Remove redundant, failing, test | Richard van der Hoff | 2018-09-27 | 1 | -106/+0 |
| * | | | | changelog | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 |
| * | | | | Include event when resolving state for missing prevs | Richard van der Hoff | 2018-09-27 | 1 | -2/+16 |
| * | | | | Include state from remote servers in pdu handling | Richard van der Hoff | 2018-09-27 | 1 | -4/+19 |
| * | | | | Fix "unhashable type: 'list'" exception in federation handling | Richard van der Hoff | 2018-09-27 | 1 | -7/+12 |
* | | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 6 | -96/+240 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cache | Erik Johnston | 2018-10-01 | 3 | -3/+45 |
|\ \ \ \ | |||||
| * | | | | Correctly match 'dict.pop' api | Erik Johnston | 2018-10-01 | 1 | -3/+11 |
| * | | | | Don't update eviction metrics on explicit removal | Erik Johnston | 2018-10-01 | 1 | -5/+0 |
| * | | | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-28 | 51 | -426/+696 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-26 | 6 | -187/+440 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-25 | 51 | -62/+128 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-21 | 1 | -12/+9 |
| * | | | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| * | | | | | | Add a five minute cache to get_destination_retry_timings | Erik Johnston | 2018-09-21 | 2 | -1/+35 |
| * | | | | | | Make ExpiringCache slightly more performant | Erik Johnston | 2018-09-21 | 1 | -1/+5 |
* | | | | | | | Further reduce the size of the docker image (#3972) | Richard van der Hoff | 2018-10-01 | 2 | -25/+47 |
* | | | | | | | add --no-admin flag to registration script (#3836) | Bruno Windels | 2018-09-28 | 2 | -4/+15 |
* | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 3 | -30/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix complete fail to do the right thing | Richard van der Hoff | 2018-09-28 | 2 | -1/+3 |
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | | | | remove spurious federation checks on localhost | Richard van der Hoff | 2018-09-26 | 1 | -31/+6 |
* | | | | | | | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_call | Richard van der Hoff | 2018-09-28 | 2 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove redundant call to start_get_pdu_cache | Richard van der Hoff | 2018-09-28 | 2 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* / | | | | | | | build python 3 docker images on circle CI (#3976) | Jan Christian Grünhage | 2018-09-28 | 2 | -5/+12 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 2 | -3/+20 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 177 | -1345/+2545 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| * | | | | | | | | Improve performance of getting typing updates for replication | Erik Johnston | 2018-09-05 | 1 | -3/+19 |
* | | | | | | | | | Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload | Richard van der Hoff | 2018-09-27 | 2 | -0/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Do the changelog.d dance | Michael Kaye | 2018-09-27 | 1 | -0/+1 |
| * | | | | | | | | | Make a ":latest" tag, and a SHA1 commit ID one too. | Michael Kaye | 2018-09-27 | 1 | -3/+16 |
| * | | | | | | | | | Also, don't run this job on any branches | Michael Kaye | 2018-09-27 | 1 | -1/+3 |
| * | | | | | | | | | Make username configurable in the UI too | Michael Kaye | 2018-09-27 | 1 | -1/+1 |
| * | | | | | | | | | Fix typo | Michael Kaye | 2018-09-27 | 1 | -1/+1 |
| * | | | | | | | | | Build and push docker image to hub | Michael Kaye | 2018-09-27 | 1 | -0/+11 |
* | | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 3 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | more comments | Richard van der Hoff | 2018-09-27 | 2 | -6/+3 |
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 |
| * | | | | | | | | | Clarifications in FederationHandler | Richard van der Hoff | 2018-09-27 | 1 | -2/+11 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process | Amber Brown | 2018-09-27 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | | | | | | Run notify_app_services as a bg process | Richard van der Hoff | 2018-09-26 | 1 | -2/+6 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 19 | -19/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update 3970.bugfix | Amber Brown | 2018-09-27 | 1 | -1/+1 |
| * | | | | | | | | | Added changelog fragment | Schnuffle | 2018-09-27 | 1 | -0/+1 |
| * | | | | | | | | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 18 | -19/+19 |
* | | | | | | | | | | Run our oldest supported configuration in CI (#3952) | Amber Brown | 2018-09-27 | 4 | -13/+38 |
* | | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts | Richard van der Hoff | 2018-09-27 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | towncrier | Neil Johnson | 2018-09-26 | 1 | -0/+1 |
| * | | | | | | | | | fix #3854 | Neil Johnson | 2018-09-26 | 1 | -1/+4 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 3 | -2/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 3 | -2/+17 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Include eventid in log lines when processing incoming federation transactions... | Richard van der Hoff | 2018-09-27 | 6 | -57/+115 |
* | | | | | | | | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 3 | -8/+62 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3963 from matrix-org/rav/get_state_for_room_docstring | Amber Brown | 2018-09-27 | 2 | -4/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | | | | fix docstring for FederationClient.get_state_for_room | Richard van der Hoff | 2018-09-26 | 1 | -4/+4 |
|/ / / / / / / | |||||
* / / / / / / | Reduce the load on our CI (#3957) | Amber Brown | 2018-09-27 | 3 | -8/+30 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'develop' into rav/hacky_cache_factor_fix | Richard van der Hoff | 2018-09-26 | 6 | -315/+320 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len | Richard van der Hoff | 2018-09-26 | 3 | -20/+25 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Log which cache is throwing exceptions | Richard van der Hoff | 2018-09-26 | 1 | -10/+17 |
| | * | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| | * | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-26 | 1 | -10/+7 |
| * | | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctl | Amber Brown | 2018-09-26 | 3 | -285/+285 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| | * | | | | | | Move synctl into top dir to avoid a symlink | Richard van der Hoff | 2018-09-25 | 2 | -285/+284 |
* | | | | | | | | Actuall set cache factors in workers | Erik Johnston | 2018-09-26 | 1 | -5/+15 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 3 | -24/+48 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | changelog | Richard van der Hoff | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | Comments and interface cleanup for on_receive_pdu | Richard van der Hoff | 2018-09-20 | 2 | -24/+47 |
* | | | | | | | Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3 | Richard van der Hoff | 2018-09-25 | 3 | -2/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update Dockerfile | Jan Christian Grünhage | 2018-09-25 | 1 | -1/+0 |
| * | | | | | | | Update .dockerignore | Jan Christian Grünhage | 2018-09-25 | 1 | -1/+0 |
| * | | | | | | | add changelog | Jan Christian Grünhage | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | | make python 3 work in the docker container | Jan Christian Grünhage | 2018-09-20 | 3 | -2/+6 |
* | | | | | | | | Update grafana dashboard | Richard van der Hoff | 2018-09-25 | 1 | -175/+417 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 17 | -39/+13 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| * | | | | | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 16 | -39/+12 |
* | | | | | | | added "media-src: 'self'" to CSP for resources (#3578) | Jérémy Farnaud | 2018-09-25 | 2 | -0/+2 |
* | | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered | Richard van der Hoff | 2018-09-25 | 2 | -14/+36 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | | Fix spurious exceptions when client closes conncetion | Erik Johnston | 2018-09-20 | 1 | -14/+35 |
* | | | | | | | | Merge pull request #3947 from matrix-org/rav/attr_version | Richard van der Hoff | 2018-09-25 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| * | | | | | | | We require attrs 16.0.0 | Richard van der Hoff | 2018-09-25 | 1 | -1/+3 |
|/ / / / / / / | |||||
* | | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 2 | -5/+9 |
* | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-25 | 3 | -3/+13 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge tag 'v0.33.5.1' | Amber Brown | 2018-09-25 | 3 | -3/+13 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | changelog v0.33.5.1 github/release-v0.33.5.1 release-v0.33.5.1 | Amber Brown | 2018-09-25 | 2 | -2/+10 |
| | * | | | | | | | bump version | Amber Brown | 2018-09-25 | 1 | -1/+1 |
| | * | | | | | | | changelog for 3940 | Amber Brown | 2018-09-25 | 1 | -0/+2 |
| | * | | | | | | | Fix compatibility issue with older Twisted in tests. | Oleg Girko | 2018-09-25 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-24 | 42 | -40/+65 |
|\| | | | | | | | | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge tag 'v0.33.5' | Amber Brown | 2018-09-24 | 87 | -1091/+1998 |
| |\| | | | | | | |||||
| | * | | | | | | towncrier v0.33.5 github/release-v0.33.5 release-v0.33.5 | Amber Brown | 2018-09-24 | 1 | -0/+6 |
| | * | | | | | | update version | Amber Brown | 2018-09-24 | 1 | -1/+1 |
| | * | | | | | | changelog v0.33.5rc1 | Amber Brown | 2018-09-17 | 41 | -39/+58 |
| | * | | | | | | update python 3 changelog | Amber Brown | 2018-09-17 | 1 | -1/+1 |
| | * | | | | | | version | Amber Brown | 2018-09-17 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errors | Erik Johnston | 2018-09-21 | 2 | -0/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add missing logger | Erik Johnston | 2018-09-20 | 1 | -0/+4 |
| * | | | | | | | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | | | Handle exceptions thrown by background tasks | Erik Johnston | 2018-09-20 | 1 | -0/+2 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 2 | -0/+5 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links | Neil Johnson | 2018-09-20 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail... | Richard van der Hoff | 2018-09-18 | 31 | -98/+351 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | towncrier | Neil Johnson | 2018-09-13 | 1 | -0/+1 |
| * | | | | | | | fix link for case that config.email_riot_base_url is set | Neil Johnson | 2018-09-13 | 1 | -1/+1 |
* | | | | | | | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 9 | -58/+238 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cache | Erik Johnston | 2018-09-20 | 2 | -8/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix up changelog and remove spurious comment | Erik Johnston | 2018-09-19 | 2 | -3/+1 |
| * | | | | | | | pep8 | Erik Johnston | 2018-09-19 | 1 | -1/+0 |
| * | | | | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| * | | | | | | | Remove get_destination_retry_timings cache | Erik Johnston | 2018-09-19 | 1 | -5/+0 |
* | | | | | | | | Add a way to run tests in PostgreSQL in Docker (#3699) | Amber Brown | 2018-09-20 | 8 | -9/+79 |
* | | | | | | | | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 4 | -5/+77 |
* | | | | | | | | Improve the logging when handling a federation transaction (#3904) | Richard van der Hoff | 2018-09-19 | 3 | -56/+111 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #3910 from matrix-org/erikj/update_timeout | Erik Johnston | 2018-09-19 | 5 | -87/+52 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fixup | Erik Johnston | 2018-09-19 | 2 | -4/+1 |
| * | | | | | | Replace custom DeferredTimeoutError with defer.TimeoutError | Erik Johnston | 2018-09-19 | 2 | -12/+5 |
| * | | | | | | Run canceller first to allow it to generate correct error | Erik Johnston | 2018-09-19 | 1 | -2/+5 |
| * | | | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| * | | | | | | Update to use new timeout function everywhere. | Erik Johnston | 2018-09-19 | 4 | -72/+43 |
|/ / / / / / | |||||
* | | | | | | update changelog for #3909 | Richard van der Hoff | 2018-09-19 | 1 | -1/+1 |
* | | | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1 | Amber Brown | 2018-09-19 | 2 | -4/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Changelog | Travis Ralston | 2018-09-18 | 1 | -0/+1 |
| * | | | | | | Destination is a string | Travis Ralston | 2018-09-18 | 1 | -4/+4 |
* | | | | | | | Remove documentation referencing Cygwin (#3873) | Amber Brown | 2018-09-19 | 3 | -31/+10 |
* | | | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name | Amber Brown | 2018-09-19 | 2 | -3/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| * | | | | | | | Set SNI to the server_name, not whatever was in the SRV record | Richard van der Hoff | 2018-09-18 | 1 | -3/+10 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout | Amber Brown | 2018-09-19 | 2 | -1/+31 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | changelog | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| * | | | | | | Bump timeout on get_missing_events request | Richard van der Hoff | 2018-09-18 | 1 | -1/+30 |
| |/ / / / / | |||||
* | | | | | | Use directory server for room joins (#3899) | Richard van der Hoff | 2018-09-18 | 2 | -0/+6 |
* | | | | | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 5 | -186/+359 |
* | | | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_version | Amber Brown | 2018-09-19 | 2 | -0/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Create 3894.feature | Will Hunt | 2018-09-17 | 1 | -0/+1 |
| * | | | | | typo | Will Hunt | 2018-09-17 | 1 | -1/+1 |
| * | | | | | make pip happy? | Will Hunt | 2018-09-17 | 1 | -2/+4 |
| * | | | | | Use a string for versions | Will Hunt | 2018-09-17 | 1 | -1/+1 |
| * | | | | | Add python_version phone home stat | Will Hunt | 2018-09-17 | 1 | -0/+2 |
* | | | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 2 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | changelog | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| * | | | | | | don't ratelimit autojoins | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
* | | | | | | | Merge pull request #3882 from SimmyD/max_upload_docker_var | Richard van der Hoff | 2018-09-18 | 3 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables. | Simon Dwyer | 2018-09-16 | 1 | -0/+1 |
| * | | | | | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable. | Simon Dwyer | 2018-09-16 | 1 | -1/+1 |
| * | | | | | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable. | Simon Dwyer | 2018-09-16 | 1 | -0/+1 |
| * | | | | | | | Added 'MAX_UPLOAD_SIZE' variable and set default to "10M" | Simon Dwyer | 2018-09-16 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias | Richard van der Hoff | 2018-09-18 | 3 | -4/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | | | | | | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 2 | -4/+16 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metrics | Richard van der Hoff | 2018-09-18 | 3 | -12/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | | | | | | Fix more b'abcd' noise in metrics | Richard van der Hoff | 2018-09-17 | 2 | -12/+12 |
* | | | | | | | | Merge pull request #3897 from aaronraimist/synaspse-typo | Richard van der Hoff | 2018-09-18 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add changelog | Aaron Raimist | 2018-09-17 | 1 | -0/+1 |
| * | | | | | | | | Fix typo in README, synaspse -> synapse | Aaron Raimist | 2018-09-17 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | / / / / | Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logs | Richard van der Hoff | 2018-09-17 | 3 | -5/+9 |
|\| | | | | | | | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | | | | | Fix some b'abcd' noise in logs and metrics | Richard van der Hoff | 2018-09-17 | 2 | -5/+8 |
|/ / / / / / | |||||
* / / / / / | README: run python_dependencies with -m | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3888 from matrix-org/rav/nuke_nuke_rooms | Amber Brown | 2018-09-17 | 2 | -57/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | | | Remove nuke-room-from-db.sh script | Richard van der Hoff | 2018-09-17 | 1 | -57/+0 |
|/ / / / | |||||
* | | | | missing changelog | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
* | | | | mention libjemalloc in readme (#3877) | Vincent Breitmoser | 2018-09-15 | 1 | -0/+8 |
* | | | | Fix timeout function | Erik Johnston | 2018-09-15 | 1 | -1/+2 |
* | | | | Merge pull request #3875 from matrix-org/erikj/extra_timeouts | Erik Johnston | 2018-09-14 | 3 | -0/+63 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| * | | | | Add an awful secondary timeout to fix wedged requests | Erik Johnston | 2018-09-14 | 2 | -0/+62 |
|/ / / / | |||||
* | | | | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 2 | -8/+1 |
* | | | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2 | Erik Johnston | 2018-09-14 | 5 | -7/+13 |
|\ \ \ \ | |||||
| * | | | | fix | Amber Brown | 2018-09-15 | 1 | -3/+3 |
| * | | | | changelog | Amber Brown | 2018-09-15 | 1 | -0/+1 |
| * | | | | fix | Amber Brown | 2018-09-14 | 1 | -1/+4 |
| * | | | | fix | Amber Brown | 2018-09-14 | 1 | -1/+1 |
| * | | | | redact better | Amber Brown | 2018-09-14 | 1 | -2/+2 |
| * | | | | we do that higher up | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| * | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2 | Amber Brown | 2018-09-14 | 8 | -61/+55 |
| |\| | | | |||||
| * | | | | buffer? | Amber Brown | 2018-09-14 | 1 | -1/+2 |
* | | | | | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metrics | Erik Johnston | 2018-09-14 | 5 | -4/+217 |
|\ \ \ \ \ | |||||
| * | | | | | Remove spurious comment | Erik Johnston | 2018-09-14 | 1 | -2/+0 |
| * | | | | | Measure outbound requests | Erik Johnston | 2018-09-14 | 1 | -3/+6 |
| * | | | | | Newsfile | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| * | | | | | Tests | Erik Johnston | 2018-09-14 | 1 | -0/+81 |
| * | | | | | Add in flight real time metrics for Measure blocks | Erik Johnston | 2018-09-14 | 2 | -1/+131 |
|/ / / / / | |||||
* | | | | | Merge pull request #3860 from matrix-org/travis/typo-1 | Travis Ralston | 2018-09-13 | 2 | -1/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Create 3860.misc | Travis Ralston | 2018-09-13 | 1 | -0/+1 |
| * | | | | Fix minor typo in exception | Travis Ralston | 2018-09-13 | 1 | -1/+1 |
|/ / / / |