summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Add a 'has_consented' template var to consent formsRichard van der Hoff2018-05-223-4/+21
* Enable auto-escaping for the consent templatesRichard van der Hoff2018-05-221-1/+4
* Merge pull request #3257 from matrix-org/rav/fonx_on_no_consentRichard van der Hoff2018-05-226-2/+179
|\
| * Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-226-2/+179
|/
* Merge pull request #3236 from matrix-org/rav/consent_noticeRichard van der Hoff2018-05-2215-21/+331
|\
| * Stub out ServerNoticesSender on the workersRichard van der Hoff2018-05-226-8/+66
| * Move consent config parsing into ConsentConfigRichard van der Hoff2018-05-224-15/+21
| * Send users a server notice about consentRichard van der Hoff2018-05-2211-11/+255
| * Rename 'version' param on user consent configRichard van der Hoff2018-05-222-5/+7
* | Merge pull request #3258 from matrix-org/erikj/fixup_logcontext_rusageErik Johnston2018-05-221-11/+27
|\ \
| * | CommentErik Johnston2018-05-221-1/+1
| * | Fix logcontext resource usage trackingErik Johnston2018-05-221-11/+27
|/ /
* | Merge pull request #3252 from matrix-org/erikj/in_flight_requestsErik Johnston2018-05-222-2/+162
|\ \ | |/ |/|
| * Don't store contextErik Johnston2018-05-221-8/+5
| * Move in_flight_requests_count to be a callback metricErik Johnston2018-05-221-10/+21
| * Add in flight request metricsErik Johnston2018-05-212-2/+154
* | Merge pull request #3255 from matrix-org/rav/fix_transactionsRichard van der Hoff2018-05-212-21/+96
|\ \
| * | Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-212-25/+42
| * | Stop the transaction cache caching failuresRichard van der Hoff2018-05-212-9/+67
* | | Merge pull request #3251 from matrix-org/cohort_analyticsNeil Johnson2018-05-211-1/+5
|\ \ \ | |/ / |/| |
| * | Tighter filtering for user_daily_visitsNeil Johnson2018-05-181-1/+5
| |/
* | Merge pull request #3239 from ptman/developMichael Kaye2018-05-211-2/+2
|\ \ | |/ |/|
| * Add lxml to docker image for web previewsPaul Tötterman2018-05-181-2/+2
* | Merge pull request #3241 from matrix-org/fix_user_visits_insertionNeil Johnson2018-05-181-1/+1
|\ \ | |/ |/|
| * fix psql compatability bugNeil Johnson2018-05-181-1/+1
|/
* Merge branch 'master' into developNeil Johnson2018-05-185-19/+45
|\
| * Merge tag 'v0.29.1'Neil Johnson2018-05-184-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.0Neil Johnson2018-05-182-2/+8
| | |\
| | | * bump version, change logNeil Johnson2018-05-172-2/+8
| | * | light grammar changesNeil Johnson2018-05-171-4/+4
| | * | Note that secrets need to be retained.Michael Kaye2018-05-171-2/+7
| | * | Document macaroon env var correctlyMichael Kaye2018-05-171-2/+2
| | * | Reference synapse docker image and docker-composeMichael Kaye2018-05-171-2/+3
| | |/
| * | Merge pull request #1756 from rubo77/patch-4Richard van der Hoff2018-05-171-9/+23
| |\ \ | | |/ | |/|
| | * postgres.rst: Add instructions how to setup the postgres user and clarify the...rubo772018-05-171-9/+23
| |/
* | Merge pull request #3232 from matrix-org/rav/server_notices_roomRichard van der Hoff2018-05-1810-7/+309
|\ \
| * | Better docstringsRichard van der Hoff2018-05-181-0/+16
| * | Make sure we reject attempts to invite the notices userRichard van der Hoff2018-05-183-0/+20
| * | Replace inline docstrings with "Attributes" in class docstringRichard van der Hoff2018-05-181-23/+15
| * | fix missing yield for server_notices_roomRichard van der Hoff2018-05-171-3/+4
| * | Infrastructure for a server notices roomRichard van der Hoff2018-05-179-7/+280
* | | Merge pull request #3235 from matrix-org/rav/fix_receipts_deferredRichard van der Hoff2018-05-181-7/+11
|\ \ \
| * | | Fix error in handling receiptsRichard van der Hoff2018-05-181-7/+11
| |/ /
* | | Merge pull request #3233 from matrix-org/rav/remove_dead_codeRichard van der Hoff2018-05-181-55/+0
|\ \ \
| * | | Remove unused `update_external_syncs`Richard van der Hoff2018-05-171-55/+0
| |/ /
* | | Merge pull request #3221 from matrix-org/erikj/purge_tokenErik Johnston2018-05-183-37/+69
|\ \ \ | |/ / |/| |
| * | Clarify commentErik Johnston2018-05-161-1/+2
| * | CommentsErik Johnston2018-05-161-0/+8
| * | Move and rename variableErik Johnston2018-05-161-3/+3
| * | Make purge_history operate on tokensErik Johnston2018-05-153-21/+25
| * | Use events_to_purge table rather than tokenErik Johnston2018-05-151-15/+34
* | | Merge pull request #3225 from matrix-org/rav/move_creation_handlerRichard van der Hoff2018-05-176-11/+19
|\ \ \
| * | | Move RoomCreationHandler out of synapse.handlers.HandlersRichard van der Hoff2018-05-176-11/+19
* | | | Merge pull request #3212 from matrix-org/erikj/epa_streamErik Johnston2018-05-173-40/+18
|\ \ \ \
| * | | | Use stream rather depth ordering for push actionsErik Johnston2018-05-113-40/+18
* | | | | Merge branch 'master' into developNeil Johnson2018-05-162-3/+71
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | bump version and changelog for 0.29.0 v0.29.0Neil Johnson2018-05-162-1/+5
| * | | further musical chairsNeil Johnson2018-05-141-2/+3
| * | | rearrange and collect related PRsNeil Johnson2018-05-141-26/+27
| * | | v0.29.0-rc1: bump version and change log v0.29.0-rc1Neil Johnson2018-05-142-3/+65
| | |/ | |/|
* | | Merge pull request #3163 from matrix-org/cohort_analyticsNeil Johnson2018-05-167-5/+122
|\ \ \
| * | | remove empty lineNeil Johnson2018-05-161-1/+0
| * | | remove unused method recurring_user_daily_visit_statsNeil Johnson2018-05-161-3/+0
| * | | style and further contraining queryNeil Johnson2018-05-161-8/+12
| * | | pep8Neil Johnson2018-05-151-1/+0
| * | | Limit query load of generate_user_daily_visitsNeil Johnson2018-05-152-27/+54
| * | | instead of inserting user daily visit data at the end of the day, instead ins...Neil Johnson2018-05-142-43/+30
| * | | Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_a...Neil Johnson2018-05-14120-1181/+2386
| |\ \ \
| * | | | remove user agent from data model, will just join on user_ipsNeil Johnson2018-05-011-12/+11
| * | | | add inidexes based on usageNeil Johnson2018-05-011-6/+2
| * | | | 10 mins seems more reasonable that every minuteNeil Johnson2018-05-011-1/+1
| * | | | pep8Neil Johnson2018-04-251-3/+4
| * | | | Generate user daily statsNeil Johnson2018-04-256-5/+112
| * | | | ignore atom editor python ide filesNeil Johnson2018-04-251-0/+1
* | | | | Merge pull request #3213 from matrix-org/rav/consent_handlerRichard van der Hoff2018-05-1614-5/+446
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-1514-5/+446
* | | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivateDavid Baker2018-05-143-2/+143
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Catch failure to part user from roomDavid Baker2018-05-101-7/+13
| * | | | Many docstringsDavid Baker2018-05-102-0/+36
| * | | | Oops, don't call function passed to run_in_backgroundDavid Baker2018-05-101-1/+1
| * | | | Prefix internal functionsDavid Baker2018-05-091-7/+7
| * | | | Add the schema fileDavid Baker2018-05-091-0/+25
| * | | | Indent failDavid Baker2018-05-091-1/+1
| * | | | Part deactivated users in the backgroundDavid Baker2018-05-092-1/+61
| * | | | Part user from rooms on account deactivateDavid Baker2018-05-081-1/+15
* | | | | Merge pull request #2846 from kaiyou/feat-dockerfileMichael Kaye2018-05-1110-0/+541
|\ \ \ \ \
| * | | | | Add Docker packaging in the author listkaiyou2018-05-041-0/+3
| * | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-05-0269-496/+1028
| |\ \ \ \ \
| * | | | | | Make the logging level configurablekaiyou2018-05-012-3/+4
| * | | | | | Fix the documentation about 'POSTGRES_DB'kaiyou2018-05-011-1/+1
| * | | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-04-1451-279/+965
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-04-08179-4356/+8696
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-03-1727-39/+46
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Disable logging to file and rely on the console when using Dockerkaiyou2018-02-101-8/+1
| * | | | | | | | | Explicitely provide the postgres password to synapse in the Compose examplekaiyou2018-02-101-0/+1
| * | | | | | | | | Remove an accidentally committed test configurationkaiyou2018-02-101-1/+1
| * | | | | | | | | Generate macaroon and registration secrets, then store the results to the dat...kaiyou2018-02-102-6/+15
| * | | | | | | | | Fix the path to the log config filekaiyou2018-02-092-2/+2
| * | | | | | | | | Make SYNAPSE_MACAROON_SECRET_KEY a mandatory optionkaiyou2018-02-092-3/+4
| * | | | | | | | | Specify the Docker registry for the postgres imagekaiyou2018-02-081-1/+1
| * | | | | | | | | Specify the Docker registry in the build tagkaiyou2018-02-081-1/+1
| * | | | | | | | | Make it clear that the image has two modes of operationkaiyou2018-02-081-5/+24
| * | | | | | | | | Update to Alpine 3.7 and switch to libresslkaiyou2018-02-081-2/+2
| * | | | | | | | | Enable email server configuration from environment variableskaiyou2018-02-082-16/+24
| * | | | | | | | | Honor the SYNAPSE_REPORT_STATS parameter in the Docker imagekaiyou2018-02-081-0/+5
| * | | | | | | | | Disable the Web client in the Docker imagekaiyou2018-02-082-4/+3
| * | | | | | | | | Use 'synapse' as a default postgres user in Docker exampleskaiyou2018-02-082-3/+3
| * | | | | | | | | Refactor the start script to better handle mandatory parameterskaiyou2018-02-083-24/+35
| * | | | | | | | | Rename the permissions variable to avoid confusionkaiyou2018-02-081-3/+3
| * | | | | | | | | Add some documentation about high performance storagekaiyou2018-02-081-2/+7
| * | | | | | | | | Make it clear that two modes are avaiable in the documentation, improve the c...kaiyou2018-02-082-9/+20
| * | | | | | | | | Support loading application service files from /data/appservices/kaiyou2018-02-053-2/+18
| * | | | | | | | | Add the non-tls port to the expose listkaiyou2018-02-051-1/+1
| * | | | | | | | | Only generate configuration files when necessarykaiyou2018-02-051-5/+7
| * | | | | | | | | Do not copy documentation files to the Docker root folderkaiyou2018-02-051-1/+1
| * | | | | | | | | Point to the 'latest' tag in the Docker documentationkaiyou2018-02-052-2/+2
| * | | | | | | | | Fix a typo in the Docker READMEkaiyou2018-02-051-1/+1
| * | | | | | | | | Document the cache factor environment variable for Dockerkaiyou2018-02-051-0/+1
| * | | | | | | | | Add dynamic TURN configuration in the Docker imagekaiyou2018-02-052-2/+14
| * | | | | | | | | Add dynamic recaptcha configuration in the Docker imagekaiyou2018-02-052-0/+11
| * | | | | | | | | Remove docker related files from the python manifestkaiyou2018-02-051-0/+1
| * | | | | | | | | Run the server as an unprivileged userkaiyou2018-02-042-5/+8
| * | | | | | | | | Fix multiple typoskaiyou2018-02-043-10/+17
| * | | | | | | | | Add the build cache/ folder to gitignorekaiyou2018-02-041-0/+1
| * | | | | | | | | Update sumperdump Docker readme to match this image propertieskaiyou2018-02-041-38/+64
| * | | | | | | | | Remove etc/service files from rob's branchkaiyou2018-02-043-131/+0
| * | | | | | | | | Merge remote-tracking branch 'origin/rob/docker' into feat-dockerfilekaiyou2018-02-044-0/+201
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | docker: s/matrix-org/matrixdotorg/gRobert Swain2017-09-292-5/+5
| | * | | | | | | | | docker: Initial Dockerfile and docker-compose.yamlRobert Swain2017-09-285-0/+259
| * | | | | | | | | | Reuse environment variables of the postgres containerkaiyou2018-02-042-9/+14
| * | | | | | | | | | Provide an example docker compose filekaiyou2018-02-042-0/+34
| * | | | | | | | | | Install the postgres dependencieskaiyou2018-02-041-2/+2
| * | | | | | | | | | Support an external postgresql config in the Docker imagekaiyou2018-02-041-2/+11
| * | | | | | | | | | Generate shared secrets if not defined in the environmentkaiyou2018-02-041-4/+11
| * | | | | | | | | | Generate any missing keys before starting synapsekaiyou2018-02-041-12/+13
| * | | | | | | | | | Allow for a wheel cache and include missing files in the buildkaiyou2018-02-043-6/+13
| * | | | | | | | | | Add template config files for the Docker imagekaiyou2018-02-032-0/+217
| * | | | | | | | | | Initial commit including a Dockerfile for synapsekaiyou2018-02-032-0/+45
* | | | | | | | | | | Merge pull request #3208 from matrix-org/rav/more_refactor_request_handlerRichard van der Hoff2018-05-1123-27/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set Server header in SynapseRequestRichard van der Hoff2018-05-1023-27/+28
* | | | | | | | | | | | Merge pull request #3209 from damir-manapov/masterRichard van der Hoff2018-05-111-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | transaction_id, destination twiceDamir Manapov2018-05-101-2/+0
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-05-110-0/+0
|\| | | | | | | | | | | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | missing word :|Matthew Hodgson2018-05-011-1/+1
| * | | | | | | | | Merge branch 'release-v0.28.1'Matthew Hodgson2018-05-011-3/+3
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #3203 from matrix-org/rav/refactor_request_handlerRichard van der Hoff2018-05-109-251/+339
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Remove redundant request_handler decoratorRichard van der Hoff2018-05-107-38/+42
| * | | | | | | | | | Factor wrap_request_handler_with_logging out of wrap_request_handlerRichard van der Hoff2018-05-101-54/+66
| * | | | | | | | | | Remove include_metrics paramRichard van der Hoff2018-05-101-17/+7
| * | | | | | | | | | Move outgoing_responses_counter handling to RequestMetricsRichard van der Hoff2018-05-102-4/+2
| * | | | | | | | | | Bump requests_counter in wrapped_request_handlerRichard van der Hoff2018-05-101-4/+11
| * | | | | | | | | | Move RequestMetrics handling into SynapseRequest.processing()Richard van der Hoff2018-05-102-24/+64
| * | | | | | | | | | Make RequestMetrics take a raw time rather than a clockRichard van der Hoff2018-05-102-6/+6
| * | | | | | | | | | Move request_id management into SynapseRequestRichard van der Hoff2018-05-102-15/+25
| * | | | | | | | | | Move RequestsMetrics to its own fileRichard van der Hoff2018-05-092-124/+151
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3199 from matrix-org/erikj/pagination_syncErik Johnston2018-05-092-45/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add comment to sync as to why code path is splitErik Johnston2018-05-091-0/+5
| * | | | | | | | | | Refactor sync APIs to reuse pagination APIErik Johnston2018-05-092-44/+48
| * | | | | | | | | | Don't unnecessarily require token to be stream tokenErik Johnston2018-05-091-1/+1
* | | | | | | | | | | Merge pull request #3198 from matrix-org/erikj/fixup_return_paginationErik Johnston2018-05-093-8/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix returned token is no longer a tupleErik Johnston2018-05-091-1/+1
| * | | | | | | | | | | Fix up commentErik Johnston2018-05-091-1/+1
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_retu...Erik Johnston2018-05-094-10/+22
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Refactor get_recent_events_for_room return typeErik Johnston2018-05-093-7/+21
* | | | | | | | | | | | Merge pull request #3200 from matrix-org/erikj/remove_membership_changeErik Johnston2018-05-091-24/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_mem...Erik Johnston2018-05-094-10/+22
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3196 from matrix-org/erikj/pagination_returnErik Johnston2018-05-091-28/+49
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update commentsErik Johnston2018-05-091-5/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3195 from matrix-org/erikj/pagination_refactorErik Johnston2018-05-091-51/+27
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3194 from rubo77/fix-nukeRichard van der Hoff2018-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | nuke-room-from-db.sh: nuke from table event_search toorubo772018-05-091-0/+1
| * | | | | | | | | | | | | Dont nuke non-existing table event_search_contentrubo772018-05-091-1/+0
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3193 from matrix-org/erikj/pagination_refactorErik Johnston2018-05-091-110/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2337 from rubo77/patch-5Richard van der Hoff2018-05-091-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | nuke-room-from-db.sh: added postgresql option and helprubo772018-05-091-1/+11
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3190 from mujx/notif-token-fixRichard van der Hoff2018-05-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | notifications: Convert next_token to string according to the specKonstantinos Sideris2018-05-051-1/+1
* | | | | | | | | | | | | | Merge pull request #3186 from matrix-org/erikj/fix_int_values_metricsErik Johnston2018-05-081-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Note that label values can be anythingErik Johnston2018-05-031-1/+2
| * | | | | | | | | | | | | Fix metrics that have integer value labelsErik Johnston2018-05-031-1/+1
|/ / / / / / / / / / / / /
| | | | * / / / / / / / / Remove unused code path from member change DB funcErik Johnston2018-05-091-24/+10
| | | |/ / / / / / / / /
| | | * / / / / / / / / Refactor pagination DB API to return concrete typeErik Johnston2018-05-091-28/+48
| | |/ / / / / / / / /
| | * | | | | | | | | Remove unused from_token paramErik Johnston2018-05-091-7/+4
| | * | | | | | | | | Refactor recent events func to use pagination funcErik Johnston2018-05-091-48/+27
| |/ / / / / / / / /
| * | | | | | | | | Fix up comments and make function privateErik Johnston2018-05-091-7/+7
| * | | | | | | | | Reuse existing pagination code for context APIErik Johnston2018-05-081-75/+15
| * | | | | | | | | Parse tokens before calling DB functionErik Johnston2018-05-081-14/+18
| * | | | | | | | | Only fetch required fields from databaseErik Johnston2018-05-081-1/+2
| * | | | | | | | | Split paginate_room_events storage functionErik Johnston2018-05-081-28/+72
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3007 from matrix-org/rav/warn_on_logcontext_failRichard van der Hoff2018-05-031-2/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_failRichard van der Hoff2018-05-03173-1459/+3290
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaksRichard van der Hoff2018-05-031-3/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix logcontext leaks in rate limiterRichard van der Hoff2018-05-031-3/+14
* | | | | | | | | | | Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdownRichard van der Hoff2018-05-031-3/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't abortConnection() if the transport connection has already closed.Will Hunt2018-05-031-3/+8
* | | | | | | | | | | | Merge pull request #3178 from matrix-org/rav/fix_request_timeoutsRichard van der Hoff2018-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | add missing param to cancelled_to_request_timed_out_errorRichard van der Hoff2018-05-021-1/+1
* | | | | | | | | | | | Fix changes warningRichard van der Hoff2018-05-031-2/+2
* | | | | | | | | | | | Warn of potential client incompatibility from #3161Richard van der Hoff2018-05-031-0/+15
* | | | | | | | | | | | Merge pull request #3141 from matrix-org/erikj/fixup_stateErik Johnston2018-05-031-37/+67
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix up grammarErik Johnston2018-05-031-3/+3
| * | | | | | | | | | | | Refactor event storage to not require stateErik Johnston2018-04-271-37/+67
* | | | | | | | | | | | | Merge pull request #3161 from NotAFile/remove-v1authRichard van der Hoff2018-05-037-25/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Burminate v1authAdrian Tschira2018-04-307-25/+24
* | | | | | | | | | | | | | Merge pull request #3175 from matrix-org/erikj/escape_metric_valuesErik Johnston2018-05-032-3/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Make _escape_character take MatchObjectErik Johnston2018-05-021-2/+10
| * | | | | | | | | | | | | Escape label values in prometheus metricsErik Johnston2018-05-022-3/+40
* | | | | | | | | | | | | | Merge pull request #3170 from matrix-org/rav/more_logcontext_leaksRichard van der Hoff2018-05-022-33/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/more_logcontext_leaksRichard van der Hoff2018-05-026-6/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove spurious unittest.DEBUGRichard van der Hoff2018-05-021-1/+0
| * | | | | | | | | | | | | | | Fix a class of logcontext leaksRichard van der Hoff2018-05-022-33/+94
* | | | | | | | | | | | | | | | Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaksRichard van der Hoff2018-05-022-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix logcontext leak in media repoRichard van der Hoff2018-05-022-1/+4
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaksRichard van der Hoff2018-05-022-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix a couple of logcontext leaks in unit testsRichard van der Hoff2018-05-022-3/+9
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3168 from matrix-org/rav/fix_logformatterRichard van der Hoff2018-05-022-1/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix incorrect reference to StringIORichard van der Hoff2018-05-022-1/+39
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | missing word :|Matthew Hodgson2018-05-011-1/+1
* | | | | | | | | | | | | | Merge branch 'release-v0.28.1' into developMatthew Hodgson2018-05-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | fix markdownMatthew Hodgson2018-05-011-3/+3
* | | | | | | | | | | | | | Merge branch 'master' into developNeil Johnson2018-05-012-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | fix conflict in changelog from previous releaseNeil Johnson2018-05-016-7/+68
| |\| | | | | | | | | | |
| | * | | | | | | | | | | changelog for 0.28.1 v0.28.1Matthew Hodgson2018-05-011-2/+23
| | * | | | | | | | | | | Update __init__.pyNeil Johnson2018-05-011-1/+1
* | | | | | | | | | | | | Merge branch 'release-v0.28.1' into developRichard van der Hoff2018-05-013-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge commit '33f469b' into release-v0.28.1Richard van der Hoff2018-05-013-4/+26
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Apply some limits to depth to counter abuseRichard van der Hoff2018-05-013-4/+26
| * | | | | | | | | | | | Miscellaneous fixes to python_dependenciesRichard van der Hoff2018-05-011-1/+19
| |/ / / / / / / / / / /
* | | | | | | | | | | | Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)Will Hunt2018-04-302-8/+8
* | | | | | | | | | | | Merge pull request #3160 from krombel/fix_3076Richard van der Hoff2018-04-301-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add guard for None on purge_history apiKrombel2018-04-301-1/+14
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3129 from matrix-org/matthew/fix_group_dupsMatthew Hodgson2018-04-301-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix missing importMatthew Hodgson2018-04-281-0/+1
| * | | | | | | | | | | | pep8Matthew Hodgson2018-04-281-3/+5
| * | | | | | | | | | | | make it work with sqliteMatthew Hodgson2018-04-282-34/+54
| * | | | | | | | | | | | remove duplicates from groups tablesMatthew Hodgson2018-04-251-0/+34
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fnRichard van der Hoff2018-04-301-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove redundant call to preserve_fnRichard van der Hoff2018-04-301-4/+2
* | | | | | | | | | | | | Merge pull request #3144 from matrix-org/rav/run_in_background_exception_hand...Richard van der Hoff2018-04-301-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Trap exceptions thrown within run_in_backgroundRichard van der Hoff2018-04-271-1/+7
* | | | | | | | | | | | | | Merge pull request #3159 from NotAFile/py3-tests-configRichard van der Hoff2018-04-301-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | run config tests on py3Adrian Tschira2018-04-301-1/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3102 from NotAFile/py3-attributeerrorRichard van der Hoff2018-04-301-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add comment explaining attributeerrorAdrian Tschira2018-04-301-0/+3
| * | | | | | | | | | | | | | Make event properties raise AttributeError insteadAdrian Tschira2018-04-151-3/+12
* | | | | | | | | | | | | | | Merge pull request #3152 from NotAFile/py3-local-importsRichard van der Hoff2018-04-304-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | make imports localAdrian Tschira2018-04-284-7/+7
* | | | | | | | | | | | | | | | Merge pull request #3153 from NotAFile/py3-httplibRichard van der Hoff2018-04-301-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | move httplib import to sixAdrian Tschira2018-04-281-3/+3
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3151 from NotAFile/py3-xrange-1Richard van der Hoff2018-04-309-11/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-05 19:34:34 +0000