| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | replacing portions | Amber Brown | 2018-05-21 | 23 | -414/+268 |
| * | don't need the resource portion | Amber Brown | 2018-05-21 | 1 | -23/+0 |
| * | look at the Prometheus metrics instead | Amber Brown | 2018-05-21 | 1 | -5/+3 |
| * | remove old metrics libs | Amber Brown | 2018-05-21 | 2 | -450/+0 |
| * | 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 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 |
| |/ | |||||
| * | 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 #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 |
| * | | | | | | | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-05-01 | 2 | -2/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | fix conflict in changelog from previous release | Neil Johnson | 2018-05-01 | 6 | -7/+68 |
| | |\| | | | | | | | | | | |||||
| | | * | | | | | | | | | | changelog for 0.28.1 v0.28.1 | Matthew Hodgson | 2018-05-01 | 1 | -2/+23 |
| | | * | | | | | | | | | | Update __init__.py | Neil Johnson | 2018-05-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | Merge branch 'release-v0.28.1' into develop | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge commit '33f469b' into release-v0.28.1 | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 |
| | * | | | | | | | | | | | Miscellaneous fixes to python_dependencies | Richard van der Hoff | 2018-05-01 | 1 | -1/+19 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157) | Will Hunt | 2018-04-30 | 2 | -8/+8 |
| * | | | | | | | | | | | Merge pull request #3160 from krombel/fix_3076 | Richard van der Hoff | 2018-04-30 | 1 | -1/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | add guard for None on purge_history api | Krombel | 2018-04-30 | 1 | -1/+14 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #3129 from matrix-org/matthew/fix_group_dups | Matthew Hodgson | 2018-04-30 | 1 | -0/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | fix missing import | Matthew Hodgson | 2018-04-28 | 1 | -0/+1 |
| | * | | | | | | | | | | | pep8 | Matthew Hodgson | 2018-04-28 | 1 | -3/+5 |
| | * | | | | | | | | | | | make it work with sqlite | Matthew Hodgson | 2018-04-28 | 2 | -34/+54 |
| | * | | | | | | | | | | | remove duplicates from groups tables | Matthew Hodgson | 2018-04-25 | 1 | -0/+34 |
| * | | | | | | | | | | | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Remove redundant call to preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 |
| * | | | | | | | | | | | | | Merge pull request #3144 from matrix-org/rav/run_in_background_exception_hand... | Richard van der Hoff | 2018-04-30 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Trap exceptions thrown within run_in_background | Richard van der Hoff | 2018-04-27 | 1 | -1/+7 |
| * | | | | | | | | | | | | | | Merge pull request #3159 from NotAFile/py3-tests-config | Richard van der Hoff | 2018-04-30 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | run config tests on py3 | Adrian Tschira | 2018-04-30 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge pull request #3102 from NotAFile/py3-attributeerror | Richard van der Hoff | 2018-04-30 | 1 | -3/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | add comment explaining attributeerror | Adrian Tschira | 2018-04-30 | 1 | -0/+3 |
| | * | | | | | | | | | | | | | | Make event properties raise AttributeError instead | Adrian Tschira | 2018-04-15 | 1 | -3/+12 |
| * | | | | | | | | | | | | | | | Merge pull request #3152 from NotAFile/py3-local-imports | Richard van der Hoff | 2018-04-30 | 4 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | make imports local | Adrian Tschira | 2018-04-28 | 4 | -7/+7 |
| * | | | | | | | | | | | | | | | | Merge pull request #3153 from NotAFile/py3-httplib | Richard van der Hoff | 2018-04-30 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | move httplib import to six | Adrian Tschira | 2018-04-28 | 1 | -3/+3 |
| | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #3151 from NotAFile/py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 9 | -11/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 42 | -121/+161 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Move more xrange to six | Adrian Tschira | 2018-04-28 | 9 | -11/+28 |
| | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge branch 'rav/test_36' into develop | Richard van der Hoff | 2018-04-30 | 1 | -5/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | add py36 to build matrix | Richard van der Hoff | 2018-04-30 | 1 | -5/+13 |
| * | | | | | | | | | | | | | | | | | | Merge pull request #3150 from NotAFile/py3-listcomp-yield | Richard van der Hoff | 2018-04-30 | 1 | -5/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Don't yield in list comprehensions | Adrian Tschira | 2018-04-28 | 1 | -5/+9 |
| | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3085 from NotAFile/py3-config-text-mode | Richard van der Hoff | 2018-04-30 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | open log_config in text mode too | Adrian Tschira | 2018-04-28 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | Open config file in non-bytes mode | Adrian Tschira | 2018-04-10 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | Merge pull request #3084 from NotAFile/py3-certs-byte-mode | Richard van der Hoff | 2018-04-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | Open certificate files as bytes | Adrian Tschira | 2018-04-10 | 1 | -2/+2 |
| | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #3154 from NotAFile/py3-stringio | Richard van der Hoff | 2018-04-30 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | replace stringIO imports | Adrian Tschira | 2018-04-28 | 2 | -3/+3 |
| | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3145 from NotAFile/py3-tests | Richard van der Hoff | 2018-04-30 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Update tox.ini | Richard van der Hoff | 2018-04-30 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Add py3 tests to tox with folders that work | Adrian Tschira | 2018-04-27 | 1 | -1/+9 |
| | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #3155 from NotAFile/py3-bytes-1 | Richard van der Hoff | 2018-04-30 | 4 | -7/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | more bytes strings | Adrian Tschira | 2018-04-29 | 4 | -7/+10 |
| | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #3140 from matrix-org/rav/use_run_in_background | Richard van der Hoff | 2018-04-30 | 22 | -72/+98 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | pep8; remove spurious import | Richard van der Hoff | 2018-04-27 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 28 | -261/+416 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 22 | -71/+97 |
| | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3156 from NotAFile/py3-hmac-bytes | Richard van der Hoff | 2018-04-30 | 2 | -11/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Construct HMAC as bytes on py3 | Adrian Tschira | 2018-04-29 | 2 | -11/+15 |
| | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 8 | -21/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 8 | -21/+20 |
| | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #3127 from matrix-org/rav/deferred_timeout | Richard van der Hoff | 2018-04-27 | 7 | -130/+135 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/deferred_timeout | Richard van der Hoff | 2018-04-27 | 28 | -261/+416 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-04-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-27 | 1 | -1/+1 |
| | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #3142 from matrix-org/rav/reraise | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | reraise exceptions more carefully | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
| | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-27 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | Merge pull request #3136 from matrix-org/rav/fix_dependencies | Richard van der Hoff | 2018-04-27 | 2 | -2/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | also upgrade pip when installing | Richard van der Hoff | 2018-04-27 | 1 | -0/+4 |
| | * | | | | | | | | | | | | | | | jenkins build: make sure we have a recent setuptools | Richard van der Hoff | 2018-04-26 | 1 | -1/+12 |
| | * | | | | | | | | | | | | | | | Miscellaneous fixes to python_dependencies | Richard van der Hoff | 2018-04-26 | 1 | -1/+19 |
| * | | | | | | | | | | | | | | | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions | Richard van der Hoff | 2018-04-27 | 20 | -237/+335 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 20 | -237/+335 |
| | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #3139 from matrix-org/rav/consume_errors | Richard van der Hoff | 2018-04-27 | 3 | -5/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Add missing consumeErrors | Richard van der Hoff | 2018-04-27 | 3 | -5/+9 |
| | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge tag 'v0.28.0' | Neil Johnson | 2018-04-27 | 4 | -7/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | update changelog and bump version to 0.28.0 v0.28.0 release-v0.28.0-rc1 | Neil Johnson | 2018-04-26 | 2 | -1/+10 |
| | * | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into release-... | Neil Johnson | 2018-04-26 | 2 | -4/+4 |
| | |\| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-24 | 1 | -2/+1 |
| * | | | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-24 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | Merge branch 'develop' into rav/deferred_timeout | Richard van der Hoff | 2018-04-27 | 11 | -21/+148 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api | Erik Johnston | 2018-04-26 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Fix media admin APIs | Erik Johnston | 2018-04-26 | 1 | -2/+2 |
| | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Merge pull request #3130 from matrix-org/erikj/fix_quarantine_room | Erik Johnston | 2018-04-25 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Also fix reindexing of search | Erik Johnston | 2018-04-25 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | Fix quarantine media admin API | Erik Johnston | 2018-04-25 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-04-24 | 2 | -3/+44 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Bump version and update changelog v0.28.0-rc1 | Neil Johnson | 2018-04-24 | 2 | -3/+44 |
| | * | | | | | | | | | | | | Revert "Bump version and update changelog" | Neil Johnson | 2018-04-24 | 2 | -41/+3 |
| | * | | | | | | | | | | | | Bump version and update changelog | Neil Johnson | 2018-04-24 | 2 | -3/+41 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #3118 from matrix-org/rav/reject_prev_events | Richard van der Hoff | 2018-04-23 | 2 | -9/+94 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Remove spurious param | Richard van der Hoff | 2018-04-23 | 1 | -1/+0 |
| | * | | | | | | | | | | | | accept stupid events over backfill | Richard van der Hoff | 2018-04-20 | 1 | -4/+9 |
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |