Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
|\ | |||||
| * | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 4 | -8/+55 |
| |\ | |||||
| * | | Use the localpart in the consent uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
* | | | Merge docs on consent bits from PR #3268 into release branch | Richard van der Hoff | 2018-05-23 | 4 | -23/+271 |
|\ \ \ | |_|/ |/| | | |||||
| * | | consent_tracking.md: clarify link | Richard van der Hoff | 2018-05-23 | 1 | -1/+1 |
| * | | minor post-review tweaks | Richard van der Hoff | 2018-05-23 | 2 | -5/+5 |
| * | | mention public_baseurl | Richard van der Hoff | 2018-05-23 | 1 | -0/+9 |
| * | | fix wrapping | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
| * | | Using the manhole to send server notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+13 |
| * | | Notes on the manhole | Richard van der Hoff | 2018-05-23 | 1 | -0/+43 |
| * | | consent_tracking: formatting etc | Richard van der Hoff | 2018-05-23 | 1 | -8/+7 |
| * | | server_notices.md: fix link | Richard van der Hoff | 2018-05-23 | 1 | -2/+2 |
| * | | consent tracking docs | Richard van der Hoff | 2018-05-23 | 3 | -25/+154 |
| * | | Some docs about server notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+53 |
* | | | Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages | Richard van der Hoff | 2018-05-23 | 3 | -7/+50 |
|\ \ \ | |||||
| * | | | Support for putting %(consent_uri)s in messages | Richard van der Hoff | 2018-05-23 | 3 | -7/+50 |
| | |/ | |/| | |||||
* | | | fix typo | Richard van der Hoff | 2018-05-23 | 1 | -1/+1 |
* | | | Merge pull request #3270 from matrix-org/rav/block_remote_server_notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Block attempts to send server notices to remote users | Richard van der Hoff | 2018-05-23 | 1 | -0/+4 |
|/ / | |||||
* | | style v0.30.0-rc1 | Neil Johnson | 2018-05-23 | 1 | -3/+4 |
* | | bump version and changelog | Neil Johnson | 2018-05-23 | 2 | -1/+37 |
|/ | |||||
* | Merge pull request #3265 from matrix-org/erikj/limit_pagination | Erik Johnston | 2018-05-22 | 1 | -9/+6 |
|\ | |||||
| * | Remove unused string formatting param | Erik Johnston | 2018-05-22 | 1 | -1/+0 |
| * | Don't support limitless pagination | Erik Johnston | 2018-05-22 | 1 | -8/+6 |
|/ | |||||
* | fix synchrotron | hera | 2018-05-22 | 1 | -1/+1 |
* | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 2 | -0/+2 |
* | comment typo | David Baker | 2018-05-22 | 1 | -1/+1 |
* | Merge pull request #3262 from matrix-org/rav/has_already_consented | Richard van der Hoff | 2018-05-22 | 3 | -5/+25 |
|\ | |||||
| * | Add a 'has_consented' template var to consent forms | Richard van der Hoff | 2018-05-22 | 3 | -4/+21 |
| * | Enable auto-escaping for the consent templates | Richard van der Hoff | 2018-05-22 | 1 | -1/+4 |
* | | Merge pull request #3263 from matrix-org/rav/fix_jinja_dep | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Fix dependency on jinja2 | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3257 from matrix-org/rav/fonx_on_no_consent | Richard van der Hoff | 2018-05-22 | 6 | -2/+179 |
|\ | |||||
| * | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 6 | -2/+179 |
|/ | |||||
* | Merge pull request #3236 from matrix-org/rav/consent_notice | Richard van der Hoff | 2018-05-22 | 15 | -21/+331 |
|\ | |||||
| * | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 6 | -8/+66 |
| * | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 4 | -15/+21 |
| * | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 11 | -11/+255 |
| * | Rename 'version' param on user consent config | Richard van der Hoff | 2018-05-22 | 2 | -5/+7 |
* | | Merge pull request #3258 from matrix-org/erikj/fixup_logcontext_rusage | Erik Johnston | 2018-05-22 | 1 | -11/+27 |
|\ \ | |||||
| * | | Comment | Erik Johnston | 2018-05-22 | 1 | -1/+1 |
| * | | Fix logcontext resource usage tracking | Erik Johnston | 2018-05-22 | 1 | -11/+27 |
|/ / | |||||
* | | Merge pull request #3252 from matrix-org/erikj/in_flight_requests | Erik Johnston | 2018-05-22 | 2 | -2/+162 |
|\ \ | |/ |/| | |||||
| * | Don't store context | Erik Johnston | 2018-05-22 | 1 | -8/+5 |
| * | Move in_flight_requests_count to be a callback metric | Erik Johnston | 2018-05-22 | 1 | -10/+21 |
| * | Add in flight request metrics | Erik Johnston | 2018-05-21 | 2 | -2/+154 |
* | | Merge pull request #3255 from matrix-org/rav/fix_transactions | Richard van der Hoff | 2018-05-21 | 2 | -21/+96 |
|\ \ | |||||
| * | | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 2 | -25/+42 |
| * | | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 2 | -9/+67 |
* | | | Merge pull request #3251 from matrix-org/cohort_analytics | Neil Johnson | 2018-05-21 | 1 | -1/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | Tighter filtering for user_daily_visits | Neil Johnson | 2018-05-18 | 1 | -1/+5 |
| |/ | |||||
* | | Merge pull request #3239 from ptman/develop | Michael Kaye | 2018-05-21 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | Add lxml to docker image for web previews | Paul Tötterman | 2018-05-18 | 1 | -2/+2 |
* | | Merge pull request #3241 from matrix-org/fix_user_visits_insertion | Neil Johnson | 2018-05-18 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | fix psql compatability bug | Neil Johnson | 2018-05-18 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' into develop | Neil Johnson | 2018-05-18 | 5 | -19/+45 |
|\ | |||||
| * | Merge tag 'v0.29.1' | Neil Johnson | 2018-05-18 | 4 | -10/+22 |
| |\ | |||||
| | * | Merge branch 'release-v0.29.0' of https://github.com/matrix-org/synapse into ... v0.29.1 github/release-v0.29.0 release-v0.29.0 | Neil Johnson | 2018-05-18 | 2 | -2/+8 |
| | |\ | |||||
| | | * | bump version, change log | Neil Johnson | 2018-05-17 | 2 | -2/+8 |
| | * | | light grammar changes | Neil Johnson | 2018-05-17 | 1 | -4/+4 |
| | * | | Note that secrets need to be retained. | Michael Kaye | 2018-05-17 | 1 | -2/+7 |
| | * | | Document macaroon env var correctly | Michael Kaye | 2018-05-17 | 1 | -2/+2 |
| | * | | Reference synapse docker image and docker-compose | Michael Kaye | 2018-05-17 | 1 | -2/+3 |
| | |/ | |||||
| * | | Merge pull request #1756 from rubo77/patch-4 | Richard van der Hoff | 2018-05-17 | 1 | -9/+23 |
| |\ \ | | |/ | |/| | |||||
| | * | postgres.rst: Add instructions how to setup the postgres user and clarify the... | rubo77 | 2018-05-17 | 1 | -9/+23 |
| |/ | |||||
* | | Merge pull request #3232 from matrix-org/rav/server_notices_room | Richard van der Hoff | 2018-05-18 | 10 | -7/+309 |
|\ \ | |||||
| * | | Better docstrings | Richard van der Hoff | 2018-05-18 | 1 | -0/+16 |
| * | | Make sure we reject attempts to invite the notices user | Richard van der Hoff | 2018-05-18 | 3 | -0/+20 |
| * | | Replace inline docstrings with "Attributes" in class docstring | Richard van der Hoff | 2018-05-18 | 1 | -23/+15 |
| * | | fix missing yield for server_notices_room | Richard van der Hoff | 2018-05-17 | 1 | -3/+4 |
| * | | Infrastructure for a server notices room | Richard van der Hoff | 2018-05-17 | 9 | -7/+280 |
* | | | Merge pull request #3235 from matrix-org/rav/fix_receipts_deferred | Richard van der Hoff | 2018-05-18 | 1 | -7/+11 |
|\ \ \ | |||||
| * | | | Fix error in handling receipts | Richard van der Hoff | 2018-05-18 | 1 | -7/+11 |
| |/ / | |||||
* | | | Merge pull request #3233 from matrix-org/rav/remove_dead_code | Richard van der Hoff | 2018-05-18 | 1 | -55/+0 |
|\ \ \ | |||||
| * | | | Remove unused `update_external_syncs` | Richard van der Hoff | 2018-05-17 | 1 | -55/+0 |
| |/ / | |||||
* | | | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 3 | -37/+69 |
|\ \ \ | |/ / |/| | | |||||
| * | | Clarify comment | Erik Johnston | 2018-05-16 | 1 | -1/+2 |
| * | | Comments | Erik Johnston | 2018-05-16 | 1 | -0/+8 |
| * | | Move and rename variable | Erik Johnston | 2018-05-16 | 1 | -3/+3 |
| * | | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 3 | -21/+25 |
| * | | Use events_to_purge table rather than token | Erik Johnston | 2018-05-15 | 1 | -15/+34 |
* | | | Merge pull request #3225 from matrix-org/rav/move_creation_handler | Richard van der Hoff | 2018-05-17 | 6 | -11/+19 |
|\ \ \ | |||||
| * | | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 6 | -11/+19 |
* | | | | Merge pull request #3212 from matrix-org/erikj/epa_stream | Erik Johnston | 2018-05-17 | 3 | -40/+18 |
|\ \ \ \ | |||||
| * | | | | Use stream rather depth ordering for push actions | Erik Johnston | 2018-05-11 | 3 | -40/+18 |
* | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-05-16 | 2 | -3/+71 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | bump version and changelog for 0.29.0 v0.29.0 | Neil Johnson | 2018-05-16 | 2 | -1/+5 |
| * | | | further musical chairs | Neil Johnson | 2018-05-14 | 1 | -2/+3 |
| * | | | rearrange and collect related PRs | Neil Johnson | 2018-05-14 | 1 | -26/+27 |
| * | | | v0.29.0-rc1: bump version and change log v0.29.0-rc1 | Neil Johnson | 2018-05-14 | 2 | -3/+65 |
| | |/ | |/| | |||||
* | | | Merge pull request #3163 from matrix-org/cohort_analytics | Neil Johnson | 2018-05-16 | 7 | -5/+122 |
|\ \ \ | |||||
| * | | | remove empty line | Neil Johnson | 2018-05-16 | 1 | -1/+0 |
| * | | | remove unused method recurring_user_daily_visit_stats | Neil Johnson | 2018-05-16 | 1 | -3/+0 |
| * | | | style and further contraining query | Neil Johnson | 2018-05-16 | 1 | -8/+12 |
| * | | | pep8 | Neil Johnson | 2018-05-15 | 1 | -1/+0 |
| * | | | Limit query load of generate_user_daily_visits | Neil Johnson | 2018-05-15 | 2 | -27/+54 |
| * | | | instead of inserting user daily visit data at the end of the day, instead ins... | Neil Johnson | 2018-05-14 | 2 | -43/+30 |
| * | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_a... | Neil Johnson | 2018-05-14 | 120 | -1181/+2386 |
| |\ \ \ | |||||
| * | | | | remove user agent from data model, will just join on user_ips | Neil Johnson | 2018-05-01 | 1 | -12/+11 |
| * | | | | add inidexes based on usage | Neil Johnson | 2018-05-01 | 1 | -6/+2 |
| * | | | | 10 mins seems more reasonable that every minute | Neil Johnson | 2018-05-01 | 1 | -1/+1 |
| * | | | | pep8 | Neil Johnson | 2018-04-25 | 1 | -3/+4 |
| * | | | | Generate user daily stats | Neil Johnson | 2018-04-25 | 6 | -5/+112 |
| * | | | | ignore atom editor python ide files | Neil Johnson | 2018-04-25 | 1 | -0/+1 |
* | | | | | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 14 | -5/+446 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 14 | -5/+446 |
* | | | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate | David Baker | 2018-05-14 | 3 | -2/+143 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Catch failure to part user from room | David Baker | 2018-05-10 | 1 | -7/+13 |
| * | | | | Many docstrings | David Baker | 2018-05-10 | 2 | -0/+36 |
| * | | | | Oops, don't call function passed to run_in_background | David Baker | 2018-05-10 | 1 | -1/+1 |
| * | | | | Prefix internal functions | David Baker | 2018-05-09 | 1 | -7/+7 |
| * | | | | Add the schema file | David Baker | 2018-05-09 | 1 | -0/+25 |
| * | | | | Indent fail | David Baker | 2018-05-09 | 1 | -1/+1 |
| * | | | | Part deactivated users in the background | David Baker | 2018-05-09 | 2 | -1/+61 |
| * | | | | Part user from rooms on account deactivate | David Baker | 2018-05-08 | 1 | -1/+15 |
* | | | | | Merge pull request #2846 from kaiyou/feat-dockerfile | Michael Kaye | 2018-05-11 | 10 | -0/+541 |
|\ \ \ \ \ | |||||
| * | | | | | Add Docker packaging in the author list | kaiyou | 2018-05-04 | 1 | -0/+3 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfile | kaiyou | 2018-05-02 | 69 | -496/+1028 |
| |\ \ \ \ \ | |||||
| * | | | | | | Make the logging level configurable | kaiyou | 2018-05-01 | 2 | -3/+4 |
| * | | | | | | Fix the documentation about 'POSTGRES_DB' | kaiyou | 2018-05-01 | 1 | -1/+1 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfile | kaiyou | 2018-04-14 | 51 | -279/+965 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into feat-dockerfile | kaiyou | 2018-04-08 | 179 | -4356/+8696 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into feat-dockerfile | kaiyou | 2018-03-17 | 27 | -39/+46 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Disable logging to file and rely on the console when using Docker | kaiyou | 2018-02-10 | 1 | -8/+1 |
| * | | | | | | | | | Explicitely provide the postgres password to synapse in the Compose example | kaiyou | 2018-02-10 | 1 | -0/+1 |
| * | | | | | | | | | Remove an accidentally committed test configuration | kaiyou | 2018-02-10 | 1 | -1/+1 |
| * | | | | | | | | | Generate macaroon and registration secrets, then store the results to the dat... | kaiyou | 2018-02-10 | 2 | -6/+15 |
| * | | | | | | | | | Fix the path to the log config file | kaiyou | 2018-02-09 | 2 | -2/+2 |
| * | | | | | | | | | Make SYNAPSE_MACAROON_SECRET_KEY a mandatory option | kaiyou | 2018-02-09 | 2 | -3/+4 |
| * | | | | | | | | | Specify the Docker registry for the postgres image | kaiyou | 2018-02-08 | 1 | -1/+1 |
| * | | | | | | | | | Specify the Docker registry in the build tag | kaiyou | 2018-02-08 | 1 | -1/+1 |
| * | | | | | | | | | Make it clear that the image has two modes of operation | kaiyou | 2018-02-08 | 1 | -5/+24 |
| * | | | | | | | | | Update to Alpine 3.7 and switch to libressl | kaiyou | 2018-02-08 | 1 | -2/+2 |
| * | | | | | | | | | Enable email server configuration from environment variables | kaiyou | 2018-02-08 | 2 | -16/+24 |
| * | | | | | | | | | Honor the SYNAPSE_REPORT_STATS parameter in the Docker image | kaiyou | 2018-02-08 | 1 | -0/+5 |
| * | | | | | | | | | Disable the Web client in the Docker image | kaiyou | 2018-02-08 | 2 | -4/+3 |
| * | | | | | | | | | Use 'synapse' as a default postgres user in Docker examples | kaiyou | 2018-02-08 | 2 | -3/+3 |
| * | | | | | | | | | Refactor the start script to better handle mandatory parameters | kaiyou | 2018-02-08 | 3 | -24/+35 |
| * | | | | | | | | | Rename the permissions variable to avoid confusion | kaiyou | 2018-02-08 | 1 | -3/+3 |
| * | | | | | | | | | Add some documentation about high performance storage | kaiyou | 2018-02-08 | 1 | -2/+7 |
| * | | | | | | | | | Make it clear that two modes are avaiable in the documentation, improve the c... | kaiyou | 2018-02-08 | 2 | -9/+20 |
| * | | | | | | | | | Support loading application service files from /data/appservices/ | kaiyou | 2018-02-05 | 3 | -2/+18 |
| * | | | | | | | | | Add the non-tls port to the expose list | kaiyou | 2018-02-05 | 1 | -1/+1 |
| * | | | | | | | | | Only generate configuration files when necessary | kaiyou | 2018-02-05 | 1 | -5/+7 |
| * | | | | | | | | | Do not copy documentation files to the Docker root folder | kaiyou | 2018-02-05 | 1 | -1/+1 |
| * | | | | | | | | | Point to the 'latest' tag in the Docker documentation | kaiyou | 2018-02-05 | 2 | -2/+2 |
| * | | | | | | | | | Fix a typo in the Docker README | kaiyou | 2018-02-05 | 1 | -1/+1 |
| * | | | | | | | | | Document the cache factor environment variable for Docker | kaiyou | 2018-02-05 | 1 | -0/+1 |
| * | | | | | | | | | Add dynamic TURN configuration in the Docker image | kaiyou | 2018-02-05 | 2 | -2/+14 |
| * | | | | | | | | | Add dynamic recaptcha configuration in the Docker image | kaiyou | 2018-02-05 | 2 | -0/+11 |
| * | | | | | | | | | Remove docker related files from the python manifest | kaiyou | 2018-02-05 | 1 | -0/+1 |
| * | | | | | | | | | Run the server as an unprivileged user | kaiyou | 2018-02-04 | 2 | -5/+8 |
| * | | | | | | | | | Fix multiple typos | kaiyou | 2018-02-04 | 3 | -10/+17 |
| * | | | | | | | | | Add the build cache/ folder to gitignore | kaiyou | 2018-02-04 | 1 | -0/+1 |
| * | | | | | | | | | Update sumperdump Docker readme to match this image properties | kaiyou | 2018-02-04 | 1 | -38/+64 |
| * | | | | | | | | | Remove etc/service files from rob's branch | kaiyou | 2018-02-04 | 3 | -131/+0 |
| * | | | | | | | | | Merge remote-tracking branch 'origin/rob/docker' into feat-dockerfile | kaiyou | 2018-02-04 | 4 | -0/+201 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | docker: s/matrix-org/matrixdotorg/g | Robert Swain | 2017-09-29 | 2 | -5/+5 |
| | * | | | | | | | | | docker: Initial Dockerfile and docker-compose.yaml | Robert Swain | 2017-09-28 | 5 | -0/+259 |
| * | | | | | | | | | | Reuse environment variables of the postgres container | kaiyou | 2018-02-04 | 2 | -9/+14 |
| * | | | | | | | | | | Provide an example docker compose file | kaiyou | 2018-02-04 | 2 | -0/+34 |
| * | | | | | | | | | | Install the postgres dependencies | kaiyou | 2018-02-04 | 1 | -2/+2 |
| * | | | | | | | | | | Support an external postgresql config in the Docker image | kaiyou | 2018-02-04 | 1 | -2/+11 |
| * | | | | | | | | | | Generate shared secrets if not defined in the environment | kaiyou | 2018-02-04 | 1 | -4/+11 |
| * | | | | | | | | | | Generate any missing keys before starting synapse | kaiyou | 2018-02-04 | 1 | -12/+13 |
| * | | | | | | | | | | Allow for a wheel cache and include missing files in the build | kaiyou | 2018-02-04 | 3 | -6/+13 |
| * | | | | | | | | | | Add template config files for the Docker image | kaiyou | 2018-02-03 | 2 | -0/+217 |
| * | | | | | | | | | | Initial commit including a Dockerfile for synapse | kaiyou | 2018-02-03 | 2 | -0/+45 |
* | | | | | | | | | | | Merge pull request #3208 from matrix-org/rav/more_refactor_request_handler | Richard van der Hoff | 2018-05-11 | 23 | -27/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 23 | -27/+28 |
* | | | | | | | | | | | | Merge pull request #3209 from damir-manapov/master | Richard van der Hoff | 2018-05-11 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | transaction_id, destination twice | Damir Manapov | 2018-05-10 | 1 | -2/+0 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-05-11 | 0 | -0/+0 |
|\| | | | | | | | | | | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | missing word :| | Matthew Hodgson | 2018-05-01 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'release-v0.28.1' | Matthew Hodgson | 2018-05-01 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge pull request #3203 from matrix-org/rav/refactor_request_handler | Richard van der Hoff | 2018-05-10 | 9 | -251/+339 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Remove redundant request_handler decorator | Richard van der Hoff | 2018-05-10 | 7 | -38/+42 |
| * | | | | | | | | | | Factor wrap_request_handler_with_logging out of wrap_request_handler | Richard van der Hoff | 2018-05-10 | 1 | -54/+66 |
| * | | | | | | | | | | Remove include_metrics param | Richard van der Hoff | 2018-05-10 | 1 | -17/+7 |
| * | | | | | | | | | | Move outgoing_responses_counter handling to RequestMetrics | Richard van der Hoff | 2018-05-10 | 2 | -4/+2 |
| * | | | | | | | | | | Bump requests_counter in wrapped_request_handler | Richard van der Hoff | 2018-05-10 | 1 | -4/+11 |
| * | | | | | | | | | | Move RequestMetrics handling into SynapseRequest.processing() | Richard van der Hoff | 2018-05-10 | 2 | -24/+64 |
| * | | | | | | | | | | Make RequestMetrics take a raw time rather than a clock | Richard van der Hoff | 2018-05-10 | 2 | -6/+6 |
| * | | | | | | | | | | Move request_id management into SynapseRequest | Richard van der Hoff | 2018-05-10 | 2 | -15/+25 |
| * | | | | | | | | | | Move RequestsMetrics to its own file | Richard van der Hoff | 2018-05-09 | 2 | -124/+151 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3199 from matrix-org/erikj/pagination_sync | Erik Johnston | 2018-05-09 | 2 | -45/+54 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add comment to sync as to why code path is split | Erik Johnston | 2018-05-09 | 1 | -0/+5 |
| * | | | | | | | | | | Refactor sync APIs to reuse pagination API | Erik Johnston | 2018-05-09 | 2 | -44/+48 |
| * | | | | | | | | | | Don't unnecessarily require token to be stream token | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #3198 from matrix-org/erikj/fixup_return_pagination | Erik Johnston | 2018-05-09 | 3 | -8/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix returned token is no longer a tuple | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| * | | | | | | | | | | | Fix up comment | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_retu... | Erik Johnston | 2018-05-09 | 4 | -10/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Refactor get_recent_events_for_room return type | Erik Johnston | 2018-05-09 | 3 | -7/+21 |
* | | | | | | | | | | | | Merge pull request #3200 from matrix-org/erikj/remove_membership_change | Erik Johnston | 2018-05-09 | 1 | -24/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_mem... | Erik Johnston | 2018-05-09 | 4 | -10/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3196 from matrix-org/erikj/pagination_return | Erik Johnston | 2018-05-09 | 1 | -28/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update comments | Erik Johnston | 2018-05-09 | 1 | -5/+6 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3195 from matrix-org/erikj/pagination_refactor | Erik Johnston | 2018-05-09 | 1 | -51/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #3194 from rubo77/fix-nuke | Richard van der Hoff | 2018-05-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | nuke-room-from-db.sh: nuke from table event_search too | rubo77 | 2018-05-09 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Dont nuke non-existing table event_search_content | rubo77 | 2018-05-09 | 1 | -1/+0 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3193 from matrix-org/erikj/pagination_refactor | Erik Johnston | 2018-05-09 | 1 | -110/+99 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2337 from rubo77/patch-5 | Richard van der Hoff | 2018-05-09 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | nuke-room-from-db.sh: added postgresql option and help | rubo77 | 2018-05-09 | 1 | -1/+11 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #3190 from mujx/notif-token-fix | Richard van der Hoff | 2018-05-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | notifications: Convert next_token to string according to the spec | Konstantinos Sideris | 2018-05-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge pull request #3186 from matrix-org/erikj/fix_int_values_metrics | Erik Johnston | 2018-05-08 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Note that label values can be anything | Erik Johnston | 2018-05-03 | 1 | -1/+2 |
| * | | | | | | | | | | | | | Fix metrics that have integer value labels | Erik Johnston | 2018-05-03 | 1 | -1/+1 |
|/ / / / / / / / / / / / / | |||||
| | | | * / / / / / / / / | Remove unused code path from member change DB func | Erik Johnston | 2018-05-09 | 1 | -24/+10 |
| | | |/ / / / / / / / / | |||||
| | | * / / / / / / / / | Refactor pagination DB API to return concrete type | Erik Johnston | 2018-05-09 | 1 | -28/+48 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Remove unused from_token param | Erik Johnston | 2018-05-09 | 1 | -7/+4 |
| | * | | | | | | | | | Refactor recent events func to use pagination func | Erik Johnston | 2018-05-09 | 1 | -48/+27 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Fix up comments and make function private | Erik Johnston | 2018-05-09 | 1 | -7/+7 |
| * | | | | | | | | | Reuse existing pagination code for context API | Erik Johnston | 2018-05-08 | 1 | -75/+15 |
| * | | | | | | | | | Parse tokens before calling DB function | Erik Johnston | 2018-05-08 | 1 | -14/+18 |
| * | | | | | | | | | Only fetch required fields from database | Erik Johnston | 2018-05-08 | 1 | -1/+2 |
| * | | | | | | | | | Split paginate_room_events storage function | Erik Johnston | 2018-05-08 | 1 | -28/+72 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #3007 from matrix-org/rav/warn_on_logcontext_fail | Richard van der Hoff | 2018-05-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail | Richard van der Hoff | 2018-05-03 | 173 | -1459/+3290 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks | Richard van der Hoff | 2018-05-03 | 1 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix logcontext leaks in rate limiter | Richard van der Hoff | 2018-05-03 | 1 | -3/+14 |
* | | | | | | | | | | | Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown | Richard van der Hoff | 2018-05-03 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Don't abortConnection() if the transport connection has already closed. | Will Hunt | 2018-05-03 | 1 | -3/+8 |
* | | | | | | | | | | | | Merge pull request #3178 from matrix-org/rav/fix_request_timeouts | Richard van der Hoff | 2018-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | add missing param to cancelled_to_request_timed_out_error | Richard van der Hoff | 2018-05-02 | 1 | -1/+1 |
* | | | | | | | | | | | | Fix changes warning | Richard van der Hoff | 2018-05-03 | 1 | -2/+2 |
* | | | | | | | | | | | | Warn of potential client incompatibility from #3161 | Richard van der Hoff | 2018-05-03 | 1 | -0/+15 |
* | | | | | | | | | | | | Merge pull request #3141 from matrix-org/erikj/fixup_state | Erik Johnston | 2018-05-03 | 1 | -37/+67 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix up grammar | Erik Johnston | 2018-05-03 | 1 | -3/+3 |
| * | | | | | | | | | | | | Refactor event storage to not require state | Erik Johnston | 2018-04-27 | 1 | -37/+67 |
* | | | | | | | | | | | | | Merge pull request #3161 from NotAFile/remove-v1auth | Richard van der Hoff | 2018-05-03 | 7 | -25/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Burminate v1auth | Adrian Tschira | 2018-04-30 | 7 | -25/+24 |
* | | | | | | | | | | | | | | Merge pull request #3175 from matrix-org/erikj/escape_metric_values | Erik Johnston | 2018-05-03 | 2 | -3/+48 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Make _escape_character take MatchObject | Erik Johnston | 2018-05-02 | 1 | -2/+10 |
| * | | | | | | | | | | | | | Escape label values in prometheus metrics | Erik Johnston | 2018-05-02 | 2 | -3/+40 |
* | | | | | | | | | | | | | | Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 2 | -33/+93 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into rav/more_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 6 | -6/+71 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Remove spurious unittest.DEBUG | Richard van der Hoff | 2018-05-02 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | Fix a class of logcontext leaks | Richard van der Hoff | 2018-05-02 | 2 | -33/+94 |
* | | | | | | | | | | | | | | | | Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix logcontext leak in media repo | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix a couple of logcontext leaks in unit tests | Richard van der Hoff | 2018-05-02 | 2 | -3/+9 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge pull request #3168 from matrix-org/rav/fix_logformatter | Richard van der Hoff | 2018-05-02 | 2 | -1/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix incorrect reference to StringIO | Richard van der Hoff | 2018-05-02 | 2 | -1/+39 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | missing word :| | Matthew Hodgson | 2018-05-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'release-v0.28.1' into develop | Matthew Hodgson | 2018-05-01 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | fix markdown | Matthew Hodgson | 2018-05-01 | 1 | -3/+3 |