summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge commit '839f9b923' into dinsic-release-v1.1.0Andrew Morgan2020-02-102-4/+70
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | One shot demo server startupJorik Schellekens2019-06-172-4/+70
* | | | | | | | | | | Remove Postgres 9.4 support (#5448)Andrew Morgan2020-02-1010-79/+50
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-1810-79/+50
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsAndrew Morgan2020-02-105-19/+29
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-175-19/+29
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| | * | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | * | | | | | | | | Handle HttpResponseException when using federation client.Erik Johnston2019-06-073-18/+19
* | | | | | | | | | | Merge commit 'dd927b29e' into dinsic-release-v1.1.0Andrew Morgan2020-02-105-30/+124
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-175-30/+124
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | * | | | | | | | | | Add testErik Johnston2019-06-073-8/+70
| | * | | | | | | | | | Refactor email testsErik Johnston2019-06-071-22/+42
| | * | | | | | | | | | Fix email notifications for large unnamed rooms.Erik Johnston2019-06-071-0/+11
| | |/ / / / / / / / /
* | | | | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterAndrew Morgan2020-02-102-3/+5
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterErik Johnston2019-06-172-3/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | * | | | | | | | | | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
* | | | | | | | | | | | Move SyTest to Buildkite (#5459)Andrew Morgan2020-02-106-61/+222
|\| | | | | | | | | | |
| * | | | | | | | | | | Move SyTest to Buildkite (#5459)Amber Brown2019-06-176-76/+247
* | | | | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateAndrew Morgan2020-02-100-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-173-7/+2
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesAndrew Morgan2020-02-100-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-149-4/+284
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveAndrew Morgan2020-02-104-12/+13
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-144-12/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | NewsfileErik Johnston2019-06-141-0/+1
| | * | | | | | | | | | | | | Prometheus histograms are cumalativeErik Johnston2019-06-143-12/+12
* | | | | | | | | | | | | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-1078-208/+2109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-242-1/+2
| * | | | | | | | | | | | | | | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-224-1/+34
| * | | | | | | | | | | | | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-125-2/+104
| * | | | | | | | | | | | | | | Add some flaky sytests to a sytest-blacklist (#17)Andrew Morgan2019-12-093-0/+16
| * | | | | | | | | | | | | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-055-2/+24
| * | | | | | | | | | | | | | | Fix scripts/generate_signing_key.py import statement (#15)Andrew Morgan2019-12-032-1/+2
| * | | | | | | | | | | | | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-023-16/+87
| * | | | | | | | | | | | | | | Merge pull request #16 from matrix-org/babolivier/dinsic-state-retrievalBrendan Abolivier2019-11-293-7/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-11-291-0/+1
| | * | | | | | | | | | | | | | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-292-7/+15
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Hide expired users from user directory, optionally show on renewal (#13)Andrew Morgan2019-11-144-0/+191
| * | | | | | | | | | | | | | | Add a /user/:user_id/info servlet to give user deactivated/expired informatio...Andrew Morgan2019-11-143-6/+93
| * | | | | | | | | | | | | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-125-8/+33
| * | | | | | | | | | | | | | | Merge pull request #10 from matrix-org/babolivier/dinsic-retention-visibilityBrendan Abolivier2019-11-113-6/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-11-061-0/+1
| | * | | | | | | | | | | | | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-062-6/+19
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0116-15/+813
| * | | | | | | | | | | | | | | Merge pull request #9 from matrix-org/babolivier/ciBrendan Abolivier2019-10-315-59/+138
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Remove python TAP scriptBrendan Abolivier2019-10-311-48/+0
| | * | | | | | | | | | | | | | | Don't use test imageBrendan Abolivier2019-10-311-2/+2
| | * | | | | | | | | | | | | | | Remove CircleCI configurationBrendan Abolivier2019-10-232-111/+0
| | * | | | | | | | | | | | | | | Move sytest jobs to the right locationBrendan Abolivier2019-10-231-102/+103
| | * | | | | | | | | | | | | | | Try running the workers job on bigger agentsBrendan Abolivier2019-10-211-2/+2
| | * | | | | | | | | | | | | | | Add py3 jobs on BuildKiteBrendan Abolivier2019-10-181-2/+53
| | * | | | | | | | | | | | | | | Add TAP formatting scriptBrendan Abolivier2019-10-181-0/+48
| | * | | | | | | | | | | | | | | Add workers to buildkiteBrendan Abolivier2019-10-091-0/+25
| | * | | | | | | | | | | | | | | Try to run stuff on buildkiteBrendan Abolivier2019-10-091-6/+1
| | * | | | | | | | | | | | | | | Actually use the right imageBrendan Abolivier2019-10-091-2/+2
| | * | | | | | | | | | | | | | | Add python3 jobsBrendan Abolivier2019-10-091-4/+34
| | * | | | | | | | | | | | | | | fixBrendan Abolivier2019-10-081-1/+1
| | * | | | | | | | | | | | | | | Try to fix CircleCIBrendan Abolivier2019-10-081-1/+1
| | * | | | | | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+1
| | * | | | | | | | | | | | | | | peekBrendan Abolivier2019-10-081-1/+1
| | * | | | | | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+1
| | * | | | | | | | | | | | | | | peekBrendan Abolivier2019-10-082-0/+2
| | * | | | | | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+2
| | * | | | | | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+2
| | * | | | | | | | | | | | | | | Temporarily move the sytest job before the waitBrendan Abolivier2019-10-081-26/+27
| | * | | | | | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+1
| | * | | | | | | | | | | | | | | Try adding workers to CircleCI insteadBrendan Abolivier2019-10-071-0/+18
| | * | | | | | | | | | | | | | | Use mainline's merge_base_branch.shBrendan Abolivier2019-10-071-11/+10
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-10-071-0/+1
| | * | | | | | | | | | | | | | | First attempt at running SyTest in buildkiteBrendan Abolivier2019-10-072-0/+60
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #8 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-044-5/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixup testsBrendan Abolivier2019-10-042-4/+12
| | * | | | | | | | | | | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| | * | | | | | | | | | | | | | | LintBrendan Abolivier2019-10-041-3/+1
| | * | | | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| | * | | | | | | | | | | | | | | Lint (again)Brendan Abolivier2019-10-041-3/+1
| | * | | | | | | | | | | | | | | LintBrendan Abolivier2019-10-041-5/+5
| | * | | | | | | | | | | | | | | Add test caseBrendan Abolivier2019-10-042-1/+84
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-10-041-0/+1
| | * | | | | | | | | | | | | | | LintBrendan Abolivier2019-10-041-1/+3
| | * | | | | | | | | | | | | | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-041-2/+13
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #7 from matrix-org/babolivier/deactivation-inviteBrendan Abolivier2019-09-273-2/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix git messing upBrendan Abolivier2019-09-271-2/+3
| | * | | | | | | | | | | | | | | s/return/defer.returnValue/Brendan Abolivier2019-09-271-1/+1
| | * | | | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| | * | | | | | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| | * | | | | | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-0/+4
| | * | | | | | | | | | | | | | | Update changelog.d/6125.featureBrendan Abolivier2019-09-271-0/+1
| | * | | | | | | | | | | | | | | okBrendan Abolivier2019-09-271-1/+3
| | * | | | | | | | | | | | | | | LintBrendan Abolivier2019-09-272-1/+85
| * | | | | | | | | | | | | | | | Merge pull request #6 from matrix-org/babolivier/access-rules-membershipBrendan Abolivier2019-09-262-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-09-261-0/+1
| | * | | | | | | | | | | | | | | Allow membership events which membership isn't join or invite in restricted r...Brendan Abolivier2019-09-261-1/+9
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #5 from matrix-org/babolivier/get-retention-workerMichael Kaye2019-09-252-55/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | TypoBrendan Abolivier2019-09-241-1/+1
| | * | | | | | | | | | | | | | | Consider every room as having no retention policy if the feature is disabledBrendan Abolivier2019-09-241-0/+8
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-09-241-0/+1
| | * | | | | | | | | | | | | | | Move get_retention_policy_for_room to RoomWorkerStoreBrendan Abolivier2019-09-241-55/+55
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #4 from matrix-org/babolivier/strip_invalid_mxid_charactersBrendan Abolivier2019-09-203-2/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Remove unnecessary cast to listBrendan Abolivier2019-09-201-1/+1
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-09-191-0/+1
| | * | | | | | | | | | | | | | | LintBrendan Abolivier2019-09-191-1/+2
| | * | | | | | | | | | | | | | | Use six.moves.filter when filtering out from MXIDBrendan Abolivier2019-09-191-1/+3
| | * | | | | | | | | | | | | | | Add unit tests for strip_invalid_mxid_charactersBrendan Abolivier2019-09-191-1/+21
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-103-9/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update changelog.d/2.bugfixBrendan Abolivier2019-09-101-1/+1
| | * | | | | | | | | | | | | | | Process revocations in _on_membership_or_invite_directBrendan Abolivier2019-09-091-18/+11
| | * | | | | | | | | | | | | | | TypoBrendan Abolivier2019-09-061-1/+1
| | * | | | | | | | | | | | | | | LintBrendan Abolivier2019-09-061-1/+0
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-09-061-0/+1
| | * | | | | | | | | | | | | | | Only filter on 3PID invite tokensBrendan Abolivier2019-09-061-6/+6
| | * | | | | | | | | | | | | | | Fix bogus conflict resolutionBrendan Abolivier2019-09-061-0/+1
| | * | | | | | | | | | | | | | | Merge branch 'dinsic' into babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-066-13/+166
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Don't process revoked/redacted events as part of the room's membership infoBrendan Abolivier2019-09-062-2/+12
| | * | | | | | | | | | | | | | | | Don't treat 3PID revokation as a new 3PID inviteBrendan Abolivier2019-09-062-7/+74
| * | | | | | | | | | | | | | | | | Merge pull request #3 from matrix-org/babolivier/password-reset-template-unicodeBrendan Abolivier2019-09-095-8/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Rename io.open import to limite side-effectsBrendan Abolivier2019-09-091-2/+2
| | * | | | | | | | | | | | | | | | LintBrendan Abolivier2019-09-091-1/+1
| | * | | | | | | | | | | | | | | | Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_...Brendan Abolivier2019-09-093-7/+4
| | * | | | | | | | | | | | | | | | Read all files as UTF-8Brendan Abolivier2019-09-091-1/+2
| | * | | | | | | | | | | | | | | | Revert "Ensure the password reset template is correctly converted to binary"Brendan Abolivier2019-09-091-2/+1
| | * | | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-09-091-0/+1
| | * | | | | | | | | | | | | | | | Ensure the password reset template is correctly converted to binaryBrendan Abolivier2019-09-091-1/+2
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge pull request #1 from matrix-org/babolivier/direct-avatar-nameBrendan Abolivier2019-09-066-5/+159
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix CIBrendan Abolivier2019-09-053-5/+5
| | * | | | | | | | | | | | | | | LintBrendan Abolivier2019-09-051-2/+0
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-09-051-0/+1
| | * | | | | | | | | | | | | | | Add testsBrendan Abolivier2019-09-051-0/+105
| | * | | | | | | | | | | | | | | Forbid changing the name, avatar or topic of a direct roomBrendan Abolivier2019-09-051-0/+50
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobAndrew Morgan2020-02-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-142-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix changelogBrendan Abolivier2019-06-142-1/+2
| | * | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-06-141-0/+1
| | * | | | | | | | | | | | | | Fix background job for deactivated flagBrendan Abolivier2019-06-141-2/+4
* | | | | | | | | | | | | | | | Merge pull request #5462 from matrix-org/babolivier/account_validity_deactiva...Andrew Morgan2020-02-100-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #5462 from matrix-org/babolivier/account_validity_deactiva...Brendan Abolivier2019-06-146-27/+68
| |\| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #5460 from matrix-org/joriks/demo_python3Andrew Morgan2020-02-101-0/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #5460 from matrix-org/joriks/demo_python3Jorik Schellekens2019-06-142-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | ChangelogJorik Schellekens2019-06-141-0/+1
* | | | | | | | | | | | | | | | | Don't send renewal emails to deactivated usersAndrew Morgan2020-02-101-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-146-27/+68
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileAndrew Morgan2020-02-103-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-143-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | * | | | | | | | | | | | | | Don't log exception when failing to fetch remote content.Erik Johnston2019-06-072-6/+13
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Track deactivated accounts in the database (#5378)Andrew Morgan2020-02-101-0/+3
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-145-0/+183
* | | | | | | | | | | | | | | Use python3 in the demoAndrew Morgan2020-02-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use python3 in the demoJorik Schellekens2019-06-141-2/+2
* | | | | | | | | | | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheusAndrew Morgan2020-02-103-39/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheusErik Johnston2019-06-143-39/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | changelogAmber H. Brown2019-06-141-0/+1
| | * | | | | | | | | | | | | fix prometheus rendering errorAmber H. Brown2019-06-142-39/+24
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Updates to the federation_client script (#5447)Andrew Morgan2020-02-102-5/+39
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Updates to the federation_client script (#5447)Richard van der Hoff2019-06-132-5/+39
* | | | | | | | | | | | | | Clean up code for sending federation EDUs. (#5381)Andrew Morgan2020-02-102-14/+27
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Clean up code for sending federation EDUs. (#5381)Richard van der Hoff2019-06-132-14/+27
* | | | | | | | | | | | | | Expose statistics on extrems to prometheus (#5384)Andrew Morgan2020-02-107-114/+331
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Expose statistics on extrems to prometheus (#5384)Amber Brown2019-06-137-114/+331
* | | | | | | | | | | | | | Remove Python 2.7 support. (#5425)Andrew Morgan2020-02-1022-130/+104
|\| | | | | | | | | | | | | | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove Python 2.7 support. (#5425)Amber Brown2019-06-129-170/+25
| * | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-1118-50/+394
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-116-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-113-10/+21
| * | | | | | | | | | | | add monthly active users to phonehome stats (#5252)Neil Johnson2019-06-103-15/+31
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-1014-195/+489
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_msErik Johnston2019-06-103-1/+58
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5412 from SohamG/fix-4130Erik Johnston2019-06-102-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Accidentally reversed pep8 fixed before, fixed nowsohamg2019-06-101-1/+1
| | * | | | | | | | | | | | | Edited description to note that the arg will not work with daemonize set in t...sohamg2019-06-101-2/+3
| | * | | | | | | | | | | | | Resolved pep8 extra spacing issuesohamg2019-06-101-1/+1
| | * | | | | | | | | | | | | Added changelog file.sohamg2019-06-101-0/+1
| | * | | | | | | | | | | | | - Fix https://github.com/matrix-org/synapse/issues/4130sohamg2019-06-101-3/+15
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #5325 from matrix-org/babolivier/port_db_account_validityBrendan Abolivier2019-06-102-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Rewrite changelogBrendan Abolivier2019-06-051-1/+1
| | * | | | | | | | | | | | | Merge branch 'develop' into babolivier/port_db_account_validityBrendan Abolivier2019-06-0451-417/+529
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-06-031-0/+1
| | * | | | | | | | | | | | | | Add account_validity's email_sent column to the list of boolean columns in sy...Brendan Abolivier2019-06-031-0/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-104-3/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Liberapay is now officially recognised, update FUNDING.yml (#5386)Andrew Morgan2019-06-092-1/+3
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge tag 'v1.0.0rc1' into developNeil Johnson2019-06-0781-83/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add a sponsor button (#5382)Andrew Morgan2019-06-072-0/+4
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5932 from matrix-org/babolivier/account_validity_template... dinsic_2019-08-30 github/dinsic dinsicBrendan Abolivier2019-08-293-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bump requirement for six to 1.12Brendan Abolivier2019-08-291-1/+1
| * | | | | | | | | | | | | | | Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-292-3/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #5815 from matrix-org/babolivier/dinsic-message-retention dinsic_2019-08-29Brendan Abolivier2019-08-2813-7/+1072
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dinsic' into babolivier/dinsic-message-retentionBrendan Abolivier2019-08-2814-44/+344
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #5812 from matrix-org/babolivier/account-validity-messages dinsic_2019-08-12Michael Kaye2019-08-128-9/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | LintBrendan Abolivier2019-08-013-14/+9
| * | | | | | | | | | | | | | | | Sample configBrendan Abolivier2019-08-011-0/+10
| * | | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-08-011-0/+1
| * | | | | | | | | | | | | | | | Add testsBrendan Abolivier2019-08-011-0/+37
| * | | | | | | | | | | | | | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+74
* | | | | | | | | | | | | | | | | Merge pull request #5781 from matrix-org/baboliver/loopingcall-args dinsic_2019-08-08Michael Kaye2019-08-082-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-07-291-0/+1
| * | | | | | | | | | | | | | | | | Add kwargs and docBrendan Abolivier2019-07-291-2/+4
| * | | | | | | | | | | | | | | | | Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
* | | | | | | | | | | | | | | | | | Merge pull request #5760 from matrix-org/babolivier/access-rules-public-restr...Michael Kaye2019-08-083-16/+190
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Explain rationaleBrendan Abolivier2019-08-011-0/+4
| * | | | | | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-07-301-15/+13
| * | | | | | | | | | | | | | | | | Fix changelogBrendan Abolivier2019-07-251-1/+1
| * | | | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-07-251-0/+1
| * | | | | | | | | | | | | | | | | Merge ifsBrendan Abolivier2019-07-251-5/+4
| * | | | | | | | | | | | | | | | | DocBrendan Abolivier2019-07-251-2/+14
| * | | | | | | | | | | | | | | | | Fix status code for forbidden eventsBrendan Abolivier2019-07-251-6/+6
| * | | | | | | | | | | | | | | | | Only check the join rule on room creation if an access rule is also providedBrendan Abolivier2019-07-251-12/+12
| * | | | | | | | | | | | | | | | | Turns out the default preset is public_chatBrendan Abolivier2019-07-241-5/+3
| * | | | | | | | | | | | | | | | | Implement restrictions on new eventsBrendan Abolivier2019-07-241-1/+40
| * | | | | | | | | | | | | | | | | Implement restriction on public room creationBrendan Abolivier2019-07-241-11/+30
| * | | | | | | | | | | | | | | | | Add test caseBrendan Abolivier2019-07-241-2/+106
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Check room ID and type of redacted event (#5784) dinsic_2019-07-31Brendan Abolivier2019-07-311-17/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Ignore redactions of redactions in get_events_as_listBrendan Abolivier2019-07-311-4/+1
| * | | | | | | | | | | | | | | | Ignore invalid redactions in _get_event_from_rowBrendan Abolivier2019-07-311-0/+5
| * | | | | | | | | | | | | | | | Should now work, unless we can't find the redaction event which happens for s...Brendan Abolivier2019-07-301-18/+18
| * | | | | | | | | | | | | | | | Don't make the checks depend on recheck_redactionBrendan Abolivier2019-07-301-20/+23
| * | | | | | | | | | | | | | | | Do checks soonerBrendan Abolivier2019-07-291-21/+19
| * | | | | | | | | | | | | | | | Check room ID and type of redacted eventBrendan Abolivier2019-07-291-10/+22
|/ / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / Implement per-room message retention policiesBrendan Abolivier2019-08-2813-7/+1072
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #5702 from matrix-org/babolivier/3pid-invite dinsic_2019-07-18Brendan Abolivier2019-07-182-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix changelogBrendan Abolivier2019-07-171-1/+1
| * | | | | | | | | | | | | | | Merge branch 'dinsic' into babolivier/3pid-inviteBrendan Abolivier2019-07-175-152/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09Brendan Abolivier2019-07-095-152/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | make the base branch dinsic for dinsic dinsic_2019-06-27_1Amber H. Brown2019-07-091-4/+5
| * | | | | | | | | | | | | | | | cut down circleci config to just what dinsic needsAmber H. Brown2019-07-091-148/+2
| * | | | | | | | | | | | | | | | LintBrendan Abolivier2019-07-091-2/+2
| * | | | | | | | | | | | | | | | Add test caseBrendan Abolivier2019-07-091-0/+47
| * | | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-07-091-0/+1
| * | | | | | | | | | | | | | | | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-091-0/+4
| | * | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-07-171-0/+1
| | * | | | | | | | | | | | | | | There's no third_party_signed property in an invite's contentBrendan Abolivier2019-07-171-6/+3
| | * | | | | | | | | | | | | | | Fix check of the association between a 3PID invite and the subsequent m.room....Brendan Abolivier2019-07-171-1/+7
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #5610 from matrix-org/babolivier/power-levels dinsic_2019-07-04Brendan Abolivier2019-07-043-38/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'babolivier/power-levels' of github.com:matrix-org/synapse into ...Brendan Abolivier2019-07-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Update synapse/third_party_rules/access_rules.pyBrendan Abolivier2019-07-031-0/+1
| * | | | | | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-07-031-6/+10
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-07-031-8/+12
| * | | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-07-031-0/+1
| * | | | | | | | | | | | | | | | Change the rule for applying PL restrictionsBrendan Abolivier2019-07-031-3/+7
| * | | | | | | | | | | | | | | | Add testsBrendan Abolivier2019-07-031-4/+52
| * | | | | | | | | | | | | | | | Default return value for events we're not interested inBrendan Abolivier2019-07-031-0/+2
| * | | | | | | | | | | | | | | | Refactor part of the access rules moduleBrendan Abolivier2019-07-031-33/+47
| * | | | | | | | | | | | | | | | Implement restrictions for power levelsBrendan Abolivier2019-07-031-0/+57
* | | | | | | | | | | | | | | | | Merge pull request #5577 from matrix-org/babolivier/3pid-invite-ratelimit dinsic_2019-06-28Brendan Abolivier2019-06-282-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| * | | | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-06-281-0/+1
| * | | | | | | | | | | | | | | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
|/ / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / Add test case for #5574Brendan Abolivier2019-06-281-0/+108
|/ / / / / / / / / / / / / / /
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-03-21 00:50:04 +0000