Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add some flaky sytests to a sytest-blacklist (#17) | Andrew Morgan | 2019-12-09 | 3 | -0/+16 |
* | Add limit_profile_requests_to_known_users option (#18) | Andrew Morgan | 2019-12-05 | 5 | -2/+24 |
* | Fix scripts/generate_signing_key.py import statement (#15) | Andrew Morgan | 2019-12-03 | 2 | -1/+2 |
* | Capatilise letters after a - in new user displaynames (#14) | Andrew Morgan | 2019-12-02 | 3 | -16/+87 |
* | Merge pull request #16 from matrix-org/babolivier/dinsic-state-retrieval | Brendan Abolivier | 2019-11-29 | 3 | -7/+16 |
|\ | |||||
| * | Changelog | Brendan Abolivier | 2019-11-29 | 1 | -0/+1 |
| * | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-29 | 2 | -7/+15 |
|/ | |||||
* | Hide expired users from user directory, optionally show on renewal (#13) | Andrew Morgan | 2019-11-14 | 4 | -0/+191 |
* | Add a /user/:user_id/info servlet to give user deactivated/expired informatio... | Andrew Morgan | 2019-11-14 | 3 | -6/+93 |
* | Create configurable ratelimiter for 3pid invites (#11) | Andrew Morgan | 2019-11-12 | 5 | -8/+33 |
* | Merge pull request #10 from matrix-org/babolivier/dinsic-retention-visibility | Brendan Abolivier | 2019-11-11 | 3 | -6/+20 |
|\ | |||||
| * | Changelog | Brendan Abolivier | 2019-11-06 | 1 | -0/+1 |
| * | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 2 | -6/+19 |
|/ | |||||
* | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 16 | -15/+813 |
* | Merge pull request #9 from matrix-org/babolivier/ci | Brendan Abolivier | 2019-10-31 | 5 | -59/+138 |
|\ | |||||
| * | Remove python TAP script | Brendan Abolivier | 2019-10-31 | 1 | -48/+0 |
| * | Don't use test image | Brendan Abolivier | 2019-10-31 | 1 | -2/+2 |
| * | Remove CircleCI configuration | Brendan Abolivier | 2019-10-23 | 2 | -111/+0 |
| * | Move sytest jobs to the right location | Brendan Abolivier | 2019-10-23 | 1 | -102/+103 |
| * | Try running the workers job on bigger agents | Brendan Abolivier | 2019-10-21 | 1 | -2/+2 |
| * | Add py3 jobs on BuildKite | Brendan Abolivier | 2019-10-18 | 1 | -2/+53 |
| * | Add TAP formatting script | Brendan Abolivier | 2019-10-18 | 1 | -0/+48 |
| * | Add workers to buildkite | Brendan Abolivier | 2019-10-09 | 1 | -0/+25 |
| * | Try to run stuff on buildkite | Brendan Abolivier | 2019-10-09 | 1 | -6/+1 |
| * | Actually use the right image | Brendan Abolivier | 2019-10-09 | 1 | -2/+2 |
| * | Add python3 jobs | Brendan Abolivier | 2019-10-09 | 1 | -4/+34 |
| * | fix | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 |
| * | Try to fix CircleCI | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 |
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 |
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 |
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 |
| * | peek | Brendan Abolivier | 2019-10-08 | 2 | -0/+2 |
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+2 |
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+2 |
| * | Temporarily move the sytest job before the wait | Brendan Abolivier | 2019-10-08 | 1 | -26/+27 |
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 |
| * | Try adding workers to CircleCI instead | Brendan Abolivier | 2019-10-07 | 1 | -0/+18 |
| * | Use mainline's merge_base_branch.sh | Brendan Abolivier | 2019-10-07 | 1 | -11/+10 |
| * | Changelog | Brendan Abolivier | 2019-10-07 | 1 | -0/+1 |
| * | First attempt at running SyTest in buildkite | Brendan Abolivier | 2019-10-07 | 2 | -0/+60 |
|/ | |||||
* | Merge pull request #8 from matrix-org/babolivier/3pid-invite-revoked | Brendan Abolivier | 2019-10-04 | 4 | -5/+100 |
|\ | |||||
| * | Fixup tests | Brendan Abolivier | 2019-10-04 | 2 | -4/+12 |
| * | Typo | Brendan Abolivier | 2019-10-04 | 1 | -1/+1 |
| * | Lint | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 |
| * | Incorporate review | Brendan Abolivier | 2019-10-04 | 1 | -14/+8 |
| * | Lint (again) | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 |
| * | Lint | Brendan Abolivier | 2019-10-04 | 1 | -5/+5 |
| * | Add test case | Brendan Abolivier | 2019-10-04 | 2 | -1/+84 |
| * | Changelog | Brendan Abolivier | 2019-10-04 | 1 | -0/+1 |
| * | Lint | Brendan Abolivier | 2019-10-04 | 1 | -1/+3 |
| * | Don't 500 code when trying to exchange a revoked 3PID invite | Brendan Abolivier | 2019-10-04 | 1 | -2/+13 |
|/ | |||||
* | Merge pull request #7 from matrix-org/babolivier/deactivation-invite | Brendan Abolivier | 2019-09-27 | 3 | -2/+94 |
|\ | |||||
| * | Fix git messing up | Brendan Abolivier | 2019-09-27 | 1 | -2/+3 |
| * | s/return/defer.returnValue/ | Brendan Abolivier | 2019-09-27 | 1 | -1/+1 |
| * | Incorporate review | Brendan Abolivier | 2019-09-27 | 1 | -4/+2 |
| * | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| * | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -0/+4 |
| * | Update changelog.d/6125.feature | Brendan Abolivier | 2019-09-27 | 1 | -0/+1 |
| * | ok | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| * | Lint | Brendan Abolivier | 2019-09-27 | 2 | -1/+85 |
* | | Merge pull request #6 from matrix-org/babolivier/access-rules-membership | Brendan Abolivier | 2019-09-26 | 2 | -1/+10 |
|\ \ | |/ |/| | |||||
| * | Changelog | Brendan Abolivier | 2019-09-26 | 1 | -0/+1 |
| * | Allow membership events which membership isn't join or invite in restricted r... | Brendan Abolivier | 2019-09-26 | 1 | -1/+9 |
|/ | |||||
* | Merge pull request #5 from matrix-org/babolivier/get-retention-worker | Michael Kaye | 2019-09-25 | 2 | -55/+64 |
|\ | |||||
| * | Typo | Brendan Abolivier | 2019-09-24 | 1 | -1/+1 |
| * | Consider every room as having no retention policy if the feature is disabled | Brendan Abolivier | 2019-09-24 | 1 | -0/+8 |
| * | Changelog | Brendan Abolivier | 2019-09-24 | 1 | -0/+1 |
| * | Move get_retention_policy_for_room to RoomWorkerStore | Brendan Abolivier | 2019-09-24 | 1 | -55/+55 |
|/ | |||||
* | Merge pull request #4 from matrix-org/babolivier/strip_invalid_mxid_characters | Brendan Abolivier | 2019-09-20 | 3 | -2/+26 |
|\ | |||||
| * | Remove unnecessary cast to list | Brendan Abolivier | 2019-09-20 | 1 | -1/+1 |
| * | Changelog | Brendan Abolivier | 2019-09-19 | 1 | -0/+1 |
| * | Lint | Brendan Abolivier | 2019-09-19 | 1 | -1/+2 |
| * | Use six.moves.filter when filtering out from MXID | Brendan Abolivier | 2019-09-19 | 1 | -1/+3 |
| * | Add unit tests for strip_invalid_mxid_characters | Brendan Abolivier | 2019-09-19 | 1 | -1/+21 |
|/ | |||||
* | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-invite | Brendan Abolivier | 2019-09-10 | 3 | -9/+79 |
|\ | |||||
| * | Update changelog.d/2.bugfix | Brendan Abolivier | 2019-09-10 | 1 | -1/+1 |
| * | Process revocations in _on_membership_or_invite_direct | Brendan Abolivier | 2019-09-09 | 1 | -18/+11 |
| * | Typo | Brendan Abolivier | 2019-09-06 | 1 | -1/+1 |
| * | Lint | Brendan Abolivier | 2019-09-06 | 1 | -1/+0 |
| * | Changelog | Brendan Abolivier | 2019-09-06 | 1 | -0/+1 |
| * | Only filter on 3PID invite tokens | Brendan Abolivier | 2019-09-06 | 1 | -6/+6 |
| * | Fix bogus conflict resolution | Brendan Abolivier | 2019-09-06 | 1 | -0/+1 |
| * | Merge branch 'dinsic' into babolivier/dinsic-3pid-invite | Brendan Abolivier | 2019-09-06 | 6 | -13/+166 |
| |\ | |||||
| * | | Don't process revoked/redacted events as part of the room's membership info | Brendan Abolivier | 2019-09-06 | 2 | -2/+12 |
| * | | Don't treat 3PID revokation as a new 3PID invite | Brendan Abolivier | 2019-09-06 | 2 | -7/+74 |
* | | | Merge pull request #3 from matrix-org/babolivier/password-reset-template-unicode | Brendan Abolivier | 2019-09-09 | 5 | -8/+7 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Rename io.open import to limite side-effects | Brendan Abolivier | 2019-09-09 | 1 | -2/+2 |
| * | | Lint | Brendan Abolivier | 2019-09-09 | 1 | -1/+1 |
| * | | Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_... | Brendan Abolivier | 2019-09-09 | 3 | -7/+4 |
| * | | Read all files as UTF-8 | Brendan Abolivier | 2019-09-09 | 1 | -1/+2 |
| * | | Revert "Ensure the password reset template is correctly converted to binary" | Brendan Abolivier | 2019-09-09 | 1 | -2/+1 |
| * | | Changelog | Brendan Abolivier | 2019-09-09 | 1 | -0/+1 |
| * | | Ensure the password reset template is correctly converted to binary | Brendan Abolivier | 2019-09-09 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #1 from matrix-org/babolivier/direct-avatar-name | Brendan Abolivier | 2019-09-06 | 6 | -5/+159 |
|\ \ | |/ |/| | |||||
| * | Fix CI | Brendan Abolivier | 2019-09-05 | 3 | -5/+5 |
| * | Lint | Brendan Abolivier | 2019-09-05 | 1 | -2/+0 |
| * | Changelog | Brendan Abolivier | 2019-09-05 | 1 | -0/+1 |
| * | Add tests | Brendan Abolivier | 2019-09-05 | 1 | -0/+105 |
| * | Forbid changing the name, avatar or topic of a direct room | Brendan Abolivier | 2019-09-05 | 1 | -0/+50 |
|/ | |||||
* | Merge pull request #5932 from matrix-org/babolivier/account_validity_template... dinsic_2019-08-30 github/dinsic dinsic | Brendan Abolivier | 2019-08-29 | 3 | -4/+7 |
|\ | |||||
| * | Bump requirement for six to 1.12 | Brendan Abolivier | 2019-08-29 | 1 | -1/+1 |
| * | Fix encoding for account validity HTML files on Python 2 | Brendan Abolivier | 2019-08-29 | 2 | -3/+6 |
|/ | |||||
* | Merge pull request #5815 from matrix-org/babolivier/dinsic-message-retention dinsic_2019-08-29 | Brendan Abolivier | 2019-08-28 | 13 | -7/+1072 |
|\ | |||||
| * | Merge branch 'dinsic' into babolivier/dinsic-message-retention | Brendan Abolivier | 2019-08-28 | 14 | -44/+344 |
| |\ | |/ |/| | |||||
* | | Merge pull request #5812 from matrix-org/babolivier/account-validity-messages dinsic_2019-08-12 | Michael Kaye | 2019-08-12 | 8 | -9/+117 |
|\ \ | |||||
| * | | Lint | Brendan Abolivier | 2019-08-01 | 3 | -14/+9 |
| * | | Sample config | Brendan Abolivier | 2019-08-01 | 1 | -0/+10 |
| * | | Changelog | Brendan Abolivier | 2019-08-01 | 1 | -0/+1 |
| * | | Add tests | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| * | | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 5 | -9/+74 |
* | | | Merge pull request #5781 from matrix-org/baboliver/loopingcall-args dinsic_2019-08-08 | Michael Kaye | 2019-08-08 | 2 | -2/+5 |
|\ \ \ | |||||
| * | | | Changelog | Brendan Abolivier | 2019-07-29 | 1 | -0/+1 |
| * | | | Add kwargs and doc | Brendan Abolivier | 2019-07-29 | 1 | -2/+4 |
| * | | | Add ability to pass arguments to looping calls | Brendan Abolivier | 2019-07-29 | 1 | -2/+2 |
* | | | | Merge pull request #5760 from matrix-org/babolivier/access-rules-public-restr... | Michael Kaye | 2019-08-08 | 3 | -16/+190 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Explain rationale | Brendan Abolivier | 2019-08-01 | 1 | -0/+4 |
| * | | | Incorporate review | Brendan Abolivier | 2019-07-30 | 1 | -15/+13 |
| * | | | Fix changelog | Brendan Abolivier | 2019-07-25 | 1 | -1/+1 |
| * | | | Changelog | Brendan Abolivier | 2019-07-25 | 1 | -0/+1 |
| * | | | Merge ifs | Brendan Abolivier | 2019-07-25 | 1 | -5/+4 |
| * | | | Doc | Brendan Abolivier | 2019-07-25 | 1 | -2/+14 |
| * | | | Fix status code for forbidden events | Brendan Abolivier | 2019-07-25 | 1 | -6/+6 |
| * | | | Only check the join rule on room creation if an access rule is also provided | Brendan Abolivier | 2019-07-25 | 1 | -12/+12 |
| * | | | Turns out the default preset is public_chat | Brendan Abolivier | 2019-07-24 | 1 | -5/+3 |
| * | | | Implement restrictions on new events | Brendan Abolivier | 2019-07-24 | 1 | -1/+40 |
| * | | | Implement restriction on public room creation | Brendan Abolivier | 2019-07-24 | 1 | -11/+30 |
| * | | | Add test case | Brendan Abolivier | 2019-07-24 | 1 | -2/+106 |
| |/ / | |||||
* | | | Check room ID and type of redacted event (#5784) dinsic_2019-07-31 | Brendan Abolivier | 2019-07-31 | 1 | -17/+32 |
|\ \ \ | |/ / |/| | | |||||
| * | | Ignore redactions of redactions in get_events_as_list | Brendan Abolivier | 2019-07-31 | 1 | -4/+1 |
| * | | Ignore invalid redactions in _get_event_from_row | Brendan Abolivier | 2019-07-31 | 1 | -0/+5 |
| * | | Should now work, unless we can't find the redaction event which happens for s... | Brendan Abolivier | 2019-07-30 | 1 | -18/+18 |
| * | | Don't make the checks depend on recheck_redaction | Brendan Abolivier | 2019-07-30 | 1 | -20/+23 |
| * | | Do checks sooner | Brendan Abolivier | 2019-07-29 | 1 | -21/+19 |
| * | | Check room ID and type of redacted event | Brendan Abolivier | 2019-07-29 | 1 | -10/+22 |
|/ / | |||||
| * | Implement per-room message retention policies | Brendan Abolivier | 2019-08-28 | 13 | -7/+1072 |
|/ | |||||
* | Merge pull request #5702 from matrix-org/babolivier/3pid-invite dinsic_2019-07-18 | Brendan Abolivier | 2019-07-18 | 2 | -1/+5 |
|\ | |||||
| * | Fix changelog | Brendan Abolivier | 2019-07-17 | 1 | -1/+1 |
| * | Merge branch 'dinsic' into babolivier/3pid-invite | Brendan Abolivier | 2019-07-17 | 5 | -152/+59 |
| |\ | |/ |/| | |||||
* | | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09 | Brendan Abolivier | 2019-07-09 | 5 | -152/+59 |
|\ \ | |||||
| * | | make the base branch dinsic for dinsic dinsic_2019-06-27_1 | Amber H. Brown | 2019-07-09 | 1 | -4/+5 |
| * | | cut down circleci config to just what dinsic needs | Amber H. Brown | 2019-07-09 | 1 | -148/+2 |
| * | | Lint | Brendan Abolivier | 2019-07-09 | 1 | -2/+2 |
| * | | Add test case | Brendan Abolivier | 2019-07-09 | 1 | -0/+47 |
| * | | Changelog | Brendan Abolivier | 2019-07-09 | 1 | -0/+1 |
| * | | Allow newly-registered users to lookup their own profiles | Brendan Abolivier | 2019-07-09 | 1 | -0/+4 |
| | * | Changelog | Brendan Abolivier | 2019-07-17 | 1 | -0/+1 |
| | * | There's no third_party_signed property in an invite's content | Brendan Abolivier | 2019-07-17 | 1 | -6/+3 |
| | * | Fix check of the association between a 3PID invite and the subsequent m.room.... | Brendan Abolivier | 2019-07-17 | 1 | -1/+7 |
| |/ |/| | |||||
* | | Merge pull request #5610 from matrix-org/babolivier/power-levels dinsic_2019-07-04 | Brendan Abolivier | 2019-07-04 | 3 | -38/+173 |
|\ \ | |||||
| * \ | Merge branch 'babolivier/power-levels' of github.com:matrix-org/synapse into ... | Brendan Abolivier | 2019-07-03 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Update synapse/third_party_rules/access_rules.py | Brendan Abolivier | 2019-07-03 | 1 | -0/+1 |
| * | | | Incorporate review | Brendan Abolivier | 2019-07-03 | 1 | -6/+10 |
| |/ / | |||||
| * | | Incorporate review | Brendan Abolivier | 2019-07-03 | 1 | -8/+12 |
| * | | Changelog | Brendan Abolivier | 2019-07-03 | 1 | -0/+1 |
| * | | Change the rule for applying PL restrictions | Brendan Abolivier | 2019-07-03 | 1 | -3/+7 |
| * | | Add tests | Brendan Abolivier | 2019-07-03 | 1 | -4/+52 |
| * | | Default return value for events we're not interested in | Brendan Abolivier | 2019-07-03 | 1 | -0/+2 |
| * | | Refactor part of the access rules module | Brendan Abolivier | 2019-07-03 | 1 | -33/+47 |
| * | | Implement restrictions for power levels | Brendan Abolivier | 2019-07-03 | 1 | -0/+57 |
* | | | Merge pull request #5577 from matrix-org/babolivier/3pid-invite-ratelimit dinsic_2019-06-28 | Brendan Abolivier | 2019-06-28 | 2 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Only ratelimit when sending the email | Brendan Abolivier | 2019-06-28 | 1 | -1/+2 |
| * | | Changelog | Brendan Abolivier | 2019-06-28 | 1 | -0/+1 |
| * | | Don't update the ratelimiter before sending a 3PID invite | Brendan Abolivier | 2019-06-28 | 1 | -1/+1 |
|/ / | |||||
* / | Add test case for #5574 | Brendan Abolivier | 2019-06-28 | 1 | -0/+108 |
|/ | |||||
* | Merge pull request #5574 from matrix-org/babolivier/fix-3pid-bind dinsic_2019-06-27 | Brendan Abolivier | 2019-06-27 | 1 | -3/+8 |
|\ | |||||
| * | Fix new 3PID bindings being associated with rewritten IS's server names inste... | Brendan Abolivier | 2019-06-27 | 1 | -3/+8 |
* | | Merge pull request #5542 from matrix-org/babolivier/federation-publicrooms dinsic_2019-06-24 | Brendan Abolivier | 2019-06-24 | 6 | -20/+49 |
|\ \ | |||||
| * | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 6 | -20/+49 |
|/ / | |||||
* | | Merge pull request #5495 from matrix-org/babolivier/deactivate_bg_job_typo dinsic_2019-06-19 | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 |
|\ \ | |||||
| * | | Fix typo in deactivation background job | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 |
* | | | Merge pull request #5484 from matrix-org/babolivier/dinsic_access_rules | Brendan Abolivier | 2019-06-19 | 3 | -0/+812 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add tests for constraints on changing the rule for a room | Brendan Abolivier | 2019-06-18 | 1 | -0/+60 |
| * | | Add tests for 3PID invites | Brendan Abolivier | 2019-06-18 | 1 | -12/+146 |
| * | | Don't process 3PIDs in _apply_restricted | Brendan Abolivier | 2019-06-18 | 1 | -1/+3 |
| * | | Remove unused import | Brendan Abolivier | 2019-06-18 | 1 | -1/+0 |
| * | | Add tests for inviting with access rules | Brendan Abolivier | 2019-06-18 | 1 | -2/+102 |
| * | | Lint | Brendan Abolivier | 2019-06-18 | 1 | -1/+0 |
| * | | Remove unused imports | Brendan Abolivier | 2019-06-18 | 1 | -3/+0 |
| * | | Lint | Brendan Abolivier | 2019-06-18 | 1 | -1/+1 |
| * | | Add tests for room creation hook | Brendan Abolivier | 2019-06-18 | 1 | -0/+136 |
| * | | Incorporate review | Brendan Abolivier | 2019-06-18 | 1 | -78/+69 |
| * | | Fixes | Brendan Abolivier | 2019-06-18 | 1 | -0/+5 |
| * | | Docstrings | Brendan Abolivier | 2019-06-17 | 1 | -27/+154 |
| * | | Rename into RoomAccessRules | Brendan Abolivier | 2019-06-17 | 2 | -1/+1 |
| * | | Fix function call | Brendan Abolivier | 2019-06-17 | 1 | -1/+1 |
| * | | Implement rules change | Brendan Abolivier | 2019-06-17 | 1 | -1/+40 |
| * | | Improve doc | Brendan Abolivier | 2019-06-17 | 1 | -3/+8 |
| * | | Implement 3PID invite hook | Brendan Abolivier | 2019-06-17 | 1 | -7/+49 |
| * | | Implement restricted rules and room creation hook | Brendan Abolivier | 2019-06-17 | 1 | -11/+43 |
| * | | Implement rules for direct | Brendan Abolivier | 2019-06-17 | 1 | -12/+100 |
| * | | Backbone | Brendan Abolivier | 2019-06-17 | 1 | -0/+11 |
| * | | Base | Brendan Abolivier | 2019-06-17 | 2 | -0/+45 |
|/ / | |||||
* | | Merge pull request #5481 from matrix-org/babolivier/third_party_rules_3pid | Brendan Abolivier | 2019-06-17 | 3 | -1/+43 |
|\ \ | |||||
| * | | Make check_threepid_can_be_invited async | Brendan Abolivier | 2019-06-17 | 1 | -0/+1 |
| * | | Changelog | Brendan Abolivier | 2019-06-17 | 1 | -0/+1 |
| * | | Add third party rules hook for 3PID invites | Brendan Abolivier | 2019-06-17 | 2 | -1/+41 |
* | | | Merge pull request #5474 from matrix-org/erikj/add_create_room_hook | Erik Johnston | 2019-06-17 | 3 | -6/+38 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2019-06-17 | 1 | -0/+1 |
| |/ / | |||||
| * / | Add third party rules hook into create room | Erik Johnston | 2019-06-17 | 2 | -6/+37 |
|/ / | |||||
* | | Merge pull request #5471 from matrix-org/erikj/3pid_remote_invite_state | Brendan Abolivier | 2019-06-17 | 3 | -7/+2 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2019-06-14 | 1 | -0/+1 |
| * | | Fix 3PID invite room state over federation. | Erik Johnston | 2019-06-14 | 1 | -6/+0 |
| * | | Change to absolute path for contrib/docker | Neil Johnson | 2019-06-13 | 1 | -1/+1 |
* | | | Merge branch 'babolivier/third_party_event_rules' into dinsic | Brendan Abolivier | 2019-06-14 | 9 | -4/+282 |
|\ \ \ | |||||
| * | | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 9 | -4/+284 |
* | | | | Merge pull request #5466 from matrix-org/babolivier/fix_deactivation_bg_job | Brendan Abolivier | 2019-06-14 | 2 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | Fix changelog | Brendan Abolivier | 2019-06-14 | 2 | -1/+2 |
| * | | | | Changelog | Brendan Abolivier | 2019-06-14 | 1 | -0/+1 |
| * | | | | Fix background job for deactivated flag | Brendan Abolivier | 2019-06-14 | 1 | -2/+4 |
* | | | | | Merge pull request #5463 from matrix-org/babolivier/account_validity_deactiva... | Brendan Abolivier | 2019-06-14 | 6 | -27/+69 |
|\| | | | | |||||
| * | | | | Fix test | Brendan Abolivier | 2019-06-14 | 1 | -1/+2 |
| * | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 6 | -27/+68 |
|/ / / / | |||||
* | | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 5 | -0/+183 |
* | | | | Merge pull request #5420 from matrix-org/babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-14 | 5 | -0/+78 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'dinsic' into babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-14 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Make index unique | Brendan Abolivier | 2019-06-14 | 1 | -0/+1 |
* | | | | | Merge pull request #5416 from matrix-org/babolivier/fix_profile_replication | Brendan Abolivier | 2019-06-13 | 5 | -3/+32 |
|\ \ \ \ \ | |||||
| | * \ \ \ | Merge branch 'babolivier/fix_profile_replication' into babolivier/userdir_hid... | Brendan Abolivier | 2019-06-13 | 2 | -2/+15 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Lint | Brendan Abolivier | 2019-06-13 | 1 | -1/+1 |
| * | | | | | Fix snafu | Brendan Abolivier | 2019-06-13 | 1 | -2/+3 |
| * | | | | | Create the index in a background update | Brendan Abolivier | 2019-06-13 | 2 | -3/+15 |
| * | | | | | Fix bogus changelog | Brendan Abolivier | 2019-06-12 | 1 | -1/+1 |
| * | | | | | Lint | Brendan Abolivier | 2019-06-12 | 1 | -1/+0 |
| * | | | | | Merge branch 'dinsic' into babolivier/fix_profile_replication | Brendan Abolivier | 2019-06-12 | 187 | -1929/+11277 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | Fix bogus changelog | Brendan Abolivier | 2019-06-12 | 1 | -1/+1 |
| | * | | | | Lint | Brendan Abolivier | 2019-06-12 | 1 | -1/+0 |
| | * | | | | Merge branch 'dinsic' into babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-12 | 188 | -1929/+11277 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Regenerate full schemas | Brendan Abolivier | 2019-06-12 | 2 | -2/+17 |
* | | | | | | Fix path for password policy endpoints | Brendan Abolivier | 2019-06-12 | 1 | -2/+2 |
* | | | | | | Merge branch 'master' into dinsic | Brendan Abolivier | 2019-06-12 | 151 | -1604/+8497 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | 1.0.0 v1.0.0 | Erik Johnston | 2019-06-11 | 6 | -4/+28 |
| * | | | | | Merge pull request #5424 from matrix-org/erikj/change_password_reset_links | Erik Johnston | 2019-06-11 | 12 | -32/+262 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bump bleach version so that tests can run on old deps. | Erik Johnston | 2019-06-11 | 5 | -25/+1 |
| | * | | | | | Newsfile | Erik Johnston | 2019-06-11 | 1 | -0/+1 |
| | * | | | | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 6 | -7/+260 |
| | | |_|/ / | | |/| | | | |||||
| * / | | | | Neilj/improve federation docs (#5419) | Neil Johnson | 2019-06-11 | 4 | -16/+106 |
| |/ / / / | |||||
| * | | | | 1.0.0rc3 v1.0.0rc3 | Erik Johnston | 2019-06-11 | 2 | -1/+7 |
| * | | | | Fix defaults on checking threepids | Erik Johnston | 2019-06-10 | 2 | -1/+2 |
| * | | | | Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zero | Erik Johnston | 2019-06-10 | 2 | -0/+5 |
| |\ \ \ \ | |||||
| | * | | | | Update changelog.d/5418.bugfix | Erik Johnston | 2019-06-10 | 1 | -1/+1 |
| | * | | | | Newsfile | Erik Johnston | 2019-06-10 | 1 | -0/+1 |
| | * | | | | Fix bug sending federation transactions with lots of EDUs | Erik Johnston | 2019-06-10 | 1 | -0/+4 |
| * | | | | | 1.0.0rc2 v1.0.0rc2 | Erik Johnston | 2019-06-10 | 5 | -4/+12 |
| * | | | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_context | Erik Johnston | 2019-06-10 | 10 | -182/+455 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | fix ci on py2, again | Richard van der Hoff | 2019-06-10 | 1 | -1/+1 |
| | * | | | | rename gutwrenched attr | Richard van der Hoff | 2019-06-10 | 1 | -5/+9 |
| | * | | | | fix CI on python 2.7 | Richard van der Hoff | 2019-06-10 | 1 | -6/+4 |
| | * | | | | fix build fails | Richard van der Hoff | 2019-06-10 | 2 | -1/+4 |
| | * | | | | Tests for SSL certs for federation connections | Richard van der Hoff | 2019-06-10 | 6 | -106/+343 |
| | * | | | | Fix federation connections to literal IP addresses | Richard van der Hoff | 2019-06-10 | 2 | -6/+11 |