Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | * | | | | clean up impl, and import idna directly | Richard van der Hoff | 2019-06-10 | 2 | -15/+12 |
| | * | | | | Share an SSL context object between SSL connections | Richard van der Hoff | 2019-06-09 | 1 | -60/+89 |
| * | | | | | Merge branch 'erikj/fix_null_valid_until_ms' of github.com:matrix-org/synapse... | Erik Johnston | 2019-06-10 | 3 | -1/+58 |
| |\ \ \ \ \ | |||||
| | * | | | | | Newsfile | Erik Johnston | 2019-06-10 | 1 | -0/+1 |
| | * | | | | | Fix key verification when key stored with null valid_until_ms | Erik Johnston | 2019-06-10 | 2 | -1/+57 |
| | |/ / / / | |||||
| * / / / / | Improve startup checks for insecure notary configs (#5392) | Richard van der Hoff | 2019-06-10 | 3 | -11/+24 |
| |/ / / / | |||||
| * | | | | 1.0.0rc1 v1.0.0rc1 | Neil Johnson | 2019-06-07 | 81 | -83/+84 |
| * | | | | Automatically retry builds when a buildkite agent is lost (#5380) | Andrew Morgan | 2019-06-07 | 2 | -0/+67 |
| * | | | | Prevent multiple device list updates from breaking a batch send (#5156) | Andrew Morgan | 2019-06-06 | 4 | -31/+196 |
| * | | | | Set default room version to v4. (#5379) | Neil Johnson | 2019-06-06 | 5 | -3/+11 |
| * | | | | Merge pull request #5320 from matrix-org/hawkowl/full-schema-v1 | Erik Johnston | 2019-06-06 | 7 | -2/+2356 |
| |\ \ \ \ | |||||
| | * | | | | fix maybe | Amber H. Brown | 2019-06-07 | 1 | -20/+2 |
| | * | | | | just user dir? | Amber H. Brown | 2019-06-07 | 1 | -1/+19 |
| | * | | | | remove background updates that arent needed | Amber H. Brown | 2019-06-07 | 1 | -33/+1 |
| | * | | | | add more comments | Amber Brown | 2019-06-06 | 1 | -0/+5 |
| | * | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1 | Amber Brown | 2019-06-04 | 45 | -329/+299 |
| | |\ \ \ \ | |||||
| | * | | | | | add stuff in bg updates | Amber Brown | 2019-06-04 | 1 | -10/+62 |
| | * | | | | | WHY IS THIS CALLED A SLIGHTLY DIFFERENT THING | Amber Brown | 2019-06-03 | 1 | -0/+1 |
| | * | | | | | more fix | Amber Brown | 2019-06-03 | 2 | -0/+4 |
| | * | | | | | more fix | Amber Brown | 2019-06-03 | 2 | -2/+38 |
| | * | | | | | fix schemas | Amber Brown | 2019-06-03 | 5 | -61/+22 |
| | * | | | | | full schema | Amber Brown | 2019-06-03 | 3 | -0/+2315 |
| | * | | | | | prepare | Amber Brown | 2019-06-03 | 1 | -2/+14 |
| * | | | | | | remove bloat | Neil Johnson | 2019-06-06 | 1 | -10/+1 |
| * | | | | | | Add ability to perform password reset via email without trusting the identity... | Andrew Morgan | 2019-06-06 | 20 | -71/+922 |
| * | | | | | | Stop hardcoding trust of old matrix.org key (#5374) | Richard van der Hoff | 2019-06-06 | 6 | -95/+293 |
| * | | | | | | Neilj/1.0 upgrade notes (#5371) | Neil Johnson | 2019-06-06 | 4 | -8/+79 |
| * | | | | | | Regen sample config before kicking off agents (#5370) | Andrew Morgan | 2019-06-06 | 2 | -2/+3 |
| * | | | | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369) | Richard van der Hoff | 2019-06-06 | 2 | -1/+8 |
| * | | | | | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytest | Erik Johnston | 2019-06-06 | 2 | -1/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Better words | Erik Johnston | 2019-06-06 | 1 | -1/+1 |
| | * | | | | | | Newsfile | Erik Johnston | 2019-05-21 | 1 | -0/+1 |
| | * | | | | | | Fix get_max_topological_token to never return None | Erik Johnston | 2019-05-21 | 1 | -1/+11 |
| * | | | | | | | Merge pull request #5089 from dnaf/m-heroes-empty-room-name | Brendan Abolivier | 2019-06-06 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add credit in the changelog | Brendan Abolivier | 2019-06-06 | 2 | -1/+1 |
| | * | | | | | | | Simplify condition | Brendan Abolivier | 2019-06-06 | 1 | -2/+2 |
| | * | | | | | | | Simplify condition | Brendan Abolivier | 2019-06-05 | 1 | -3/+2 |
| | * | | | | | | | Merge branch 'develop' into m-heroes-empty-room-name | Brendan Abolivier | 2019-06-05 | 350 | -3583/+9622 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Lint | Katie Wolfe | 2019-04-24 | 1 | -1/+1 |
| | * | | | | | | | | Clean up code | Katie Wolfe | 2019-04-24 | 1 | -2/+3 |
| | * | | | | | | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -3/+4 |
| | * | | | | | | | | Add full stop to 5084.bugfix | Katie Wolfe | 2019-04-24 | 1 | -1/+1 |
| | * | | | | | | | | Add changelog.d/5084.bugfix | Katie Wolfe | 2019-04-24 | 1 | -0/+1 |
| | * | | | | | | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -5/+3 |
| * | | | | | | | | | Merge pull request #5359 from matrix-org/rav/enable_tls_verification | Richard van der Hoff | 2019-06-06 | 4 | -12/+19 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification | Richard van der Hoff | 2019-06-05 | 28 | -43/+219 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Update sample config | Richard van der Hoff | 2019-06-05 | 1 | -4/+4 |
| | * | | | | | | | | | | Validate federation server TLS certificates by default. | Richard van der Hoff | 2019-06-05 | 3 | -8/+15 |
| * | | | | | | | | | | | Merge pull request #5361 from matrix-org/rav/generate_signing_key | Richard van der Hoff | 2019-06-06 | 2 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | add a script to generate new signing_key files | Richard van der Hoff | 2019-06-05 | 2 | -0/+38 |
| * | | | | | | | | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_members | Brendan Abolivier | 2019-06-06 | 2 | -15/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Properly format the changelog | Brendan Abolivier | 2019-06-05 | 1 | -1/+1 |
| | * | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-06-05 | 1 | -0/+1 |
| | * | | | | | | | | | | | | Do user_id != me checks before deciding whether we should pick heroes from th... | Brendan Abolivier | 2019-06-05 | 1 | -15/+19 |
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5 | Richard van der Hoff | 2019-06-06 | 2 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Implement room v5 which enforces signing key validity | Richard van der Hoff | 2019-06-05 | 2 | -5/+7 |
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #5353 from matrix-org/rav/verify_key_logging | Richard van der Hoff | 2019-06-06 | 6 | -56/+86 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Associate a request_name with each verify request, for logging | Richard van der Hoff | 2019-06-05 | 6 | -56/+86 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #5362 from matrix-org/rav/fix_custom_ca | Richard van der Hoff | 2019-06-05 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix `federation_custom_ca_list` configuration option. | Richard van der Hoff | 2019-06-05 | 2 | -1/+2 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Neilj/add r0.5 to versions (#5360) | Neil Johnson | 2019-06-05 | 2 | -0/+2 |
| * | | | | | | | | | | | Fix background updates to handle redactions/rejections (#5352) | Erik Johnston | 2019-06-06 | 5 | -12/+117 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fix notes about well-known and acme (#5357) | Richard van der Hoff | 2019-06-05 | 2 | -6/+6 |
| * | | | | | | | | | | Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essential | Erik Johnston | 2019-06-05 | 2 | -12/+47 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Add logging when request fails and clarify we ignore errors. | Erik Johnston | 2019-06-05 | 1 | -4/+12 |
| | * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-03 | 1 | -0/+1 |
| | * | | | | | | | | | | Fix handling of failures when calling /event_auth. | Erik Johnston | 2019-06-03 | 1 | -12/+38 |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Neilj/changelog clean up (#5356) | Neil Johnson | 2019-06-05 | 12 | -12/+12 |
| * | | | | | | | | | | Neilj/mau tracking config explainer (#5284) | Neil Johnson | 2019-06-05 | 3 | -0/+33 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Add a test room version where we enforce key validity (#5348) | Richard van der Hoff | 2019-06-05 | 3 | -22/+38 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Clean up debug logging (#5347) | Richard van der Hoff | 2019-06-05 | 4 | -8/+20 |
| * | | | | | | | | Rename VerifyKeyRequest.deferred field (#5343) | Richard van der Hoff | 2019-06-05 | 2 | -12/+13 |
| * | | | | | | | | Call RetryLimiter correctly (#5340) | Richard van der Hoff | 2019-06-04 | 2 | -1/+8 |
| * | | | | | | | | Fix failure to fetch batches of PDUs (#5342) | Richard van der Hoff | 2019-06-04 | 2 | -0/+2 |
| * | | | | | | | | Rename get_events->get_events_from_store_or_dest (#5344) | Richard van der Hoff | 2019-06-04 | 2 | -20/+14 |
| * | | | | | | | | Merge pull request #5341 from matrix-org/babolivier/email_config | Brendan Abolivier | 2019-06-04 | 2 | -42/+58 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge pull request #5324 from matrix-org/erikj/ignore_null | Erik Johnston | 2019-06-04 | 2 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix | Erik Johnston | 2019-06-03 | 1 | -1/+2 |
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-03 | 1 | -0/+1 |
| | * | | | | | | | | | Ignore room state with null bytes in for room stats | Erik Johnston | 2019-06-03 | 1 | -0/+15 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval (#5335) | Richard van der Hoff | 2019-06-04 | 2 | -23/+38 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval | Richard van der Hoff | 2019-06-03 | 2 | -23/+38 |
| * | | | | | | | | | | Don't do long retries when calling the key notary server. (#5334) | Richard van der Hoff | 2019-06-04 | 2 | -1/+1 |
| * | | | | | | | | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se... | Richard van der Hoff | 2019-06-04 | 4 | -40/+66 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | changelog | Richard van der Hoff | 2019-06-04 | 1 | -0/+1 |
| | * | | | | | | | | | | Notary server: make requests to origins in parallel | Richard van der Hoff | 2019-06-04 | 2 | -11/+11 |
| | * | | | | | | | | | | Don't bomb out on direct key fetches as soon as one fails | Richard van der Hoff | 2019-06-04 | 2 | -29/+41 |
| | * | | | | | | | | | | Reduce timeout for outbound /key/v2/server requests. | Richard van der Hoff | 2019-06-03 | 1 | -0/+13 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Improve docstrings on MatrixFederationClient. (#5332) | Richard van der Hoff | 2019-06-04 | 2 | -16/+56 |
| * | | | | | | | | | | Hawkowl/fix missing auth (#5328) | Amber Brown | 2019-06-04 | 2 | -0/+2 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Enforce validity period on server_keys for fed requests. (#5321) | Richard van der Hoff | 2019-06-03 | 6 | -88/+228 |
| * | | | | | | | | | Revert "Newsfile" | Erik Johnston | 2019-06-03 | 1 | -1/+0 |
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-03 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-... | Richard van der Hoff | 2019-06-03 | 2 | -12/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Stop overwriting server keys with other keys | Richard van der Hoff | 2019-05-31 | 2 | -12/+3 |
| * | | | | | | | | | Unify v1 and v2 REST client APIs (#5226) | Amber Brown | 2019-06-03 | 43 | -317/+296 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_length | Richard van der Hoff | 2019-06-01 | 4 | -2/+76 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add some tests | Richard van der Hoff | 2019-06-01 | 1 | -2/+60 |
| | * | | | | | | | | Limit displaynames and avatar URLs | Richard van der Hoff | 2019-06-01 | 3 | -0/+16 |