Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Check dependencies on setup in the nicer way. (#5989) | Jorik Schellekens | 2019-09-11 | 4 | -28/+20 | |
* | | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2019-09-11 | 2 | -2/+27 | |
* | | | Remove origin parameter from add_display_name_to_third_party_invite and add p... | Andrew Morgan | 2019-09-11 | 4 | -4/+10 | |
|/ / | ||||||
* | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Erik Johnston | 2019-09-10 | 4 | -42/+46 | |
|\ \ | ||||||
| * | | Add changelog | Andrew Morgan | 2019-09-10 | 3 | -4/+5 | |
| * | | Use account_threepid_delegate for 3pid validation | Andrew Morgan | 2019-09-10 | 3 | -42/+45 | |
* | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Jason Robinson | 2019-09-09 | 4 | -10/+69 | |
|\ \ \ | ||||||
| * | | | Fix code style, again | Jason Robinson | 2019-09-09 | 1 | -3/+1 | |
| * | | | Simplify count_real_users SQL to only count user_type is null rows | Jason Robinson | 2019-09-09 | 1 | -1/+1 | |
| * | | | Simplify is_real_user_txn check to trust user_type is null if real user | Jason Robinson | 2019-09-09 | 1 | -1/+1 | |
| * | | | Auto-fix a few code style issues | Jason Robinson | 2019-09-09 | 1 | -4/+4 | |
| * | | | Only count real users when checking for auto-creation of auto-join room | Jason Robinson | 2019-09-09 | 4 | -10/+71 | |
* | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Erik Johnston | 2019-09-09 | 6 | -2/+220 | |
|\ \ \ \ | ||||||
| * | | | | Fix comments | Erik Johnston | 2019-09-09 | 1 | -2/+3 | |
| * | | | | Default to censoring redactions after seven days | Erik Johnston | 2019-09-09 | 2 | -7/+11 | |
| * | | | | Use better names in SQL | Erik Johnston | 2019-09-09 | 1 | -5/+8 | |
| * | | | | Fixup comment | Erik Johnston | 2019-09-09 | 1 | -4/+12 | |
| * | | | | Don't start looping call unless enabled | Erik Johnston | 2019-09-09 | 1 | -1/+2 | |
| * | | | | Handle setting retention period to 0 | Erik Johnston | 2019-09-09 | 2 | -2/+2 | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red... | Erik Johnston | 2019-09-05 | 144 | -1781/+2395 | |
| |\ \ \ \ | ||||||
| * | | | | | Fix test | Erik Johnston | 2019-09-05 | 1 | -1/+3 | |
| * | | | | | Make redaction retention period configurable | Erik Johnston | 2019-09-05 | 4 | -3/+27 | |
| * | | | | | Newsfile | Erik Johnston | 2019-08-30 | 1 | -0/+1 | |
| * | | | | | Censor redactions in DB after a month | Erik Johnston | 2019-08-30 | 3 | -1/+175 | |
* | | | | | | Add a build info metric to Prometheus (#6005) | Amber Brown | 2019-09-10 | 3 | -2/+33 | |
* | | | | | | Merge pull request #6003 from matrix-org/erikj/push_opentracing | Erik Johnston | 2019-09-09 | 2 | -1/+13 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-09-09 | 1 | -0/+1 | |
| * | | | | | Add opentracing span for HTTP push | Erik Johnston | 2019-09-09 | 1 | -1/+12 | |
|/ / / / / | ||||||
* | | | | | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 7 | -60/+226 | |
* | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2019-09-06 | 2 | -1/+8 | |
* | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag | Erik Johnston | 2019-09-06 | 3 | -2/+7 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Newsfile | Erik Johnston | 2019-09-06 | 1 | -0/+1 | |
| * | | | | Correctly handle non-bool m.federate flag | Erik Johnston | 2019-09-06 | 2 | -2/+6 | |
* | | | | | Merge pull request #5993 from matrix-org/anoa/worker_store_reg | Erik Johnston | 2019-09-06 | 2 | -79/+80 | |
|\ \ \ \ \ | ||||||
| * | | | | | Move delete_threepid_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -25/+25 | |
| * | | | | | Change changelog | Andrew Morgan | 2019-09-06 | 2 | -1/+1 | |
| * | | | | | Move get_threepid_validation_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -54/+54 | |
| * | | | | | Add changelog | Andrew Morgan | 2019-09-06 | 1 | -0/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fix | Erik Johnston | 2019-09-06 | 3 | -2/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Apply suggestions from code review | Andrew Morgan | 2019-09-06 | 2 | -2/+2 | |
| * | | | | Add changelog | Andrew Morgan | 2019-09-06 | 1 | -0/+1 | |
| * | | | | Fix destructuring assumption bug | Andrew Morgan | 2019-09-06 | 2 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs | Erik Johnston | 2019-09-06 | 2 | -5/+6 | |
|\ \ \ \ | ||||||
| * | | | | Update changelog | Erik Johnston | 2019-09-06 | 1 | -1/+1 | |
| * | | | | Newsfile | Erik Johnston | 2019-09-06 | 1 | -0/+1 | |
| * | | | | Don't assume there is a 'self' arg in @trace decorator | Erik Johnston | 2019-09-06 | 1 | -5/+5 | |
* | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser... | Andrew Morgan | 2019-09-06 | 29 | -302/+820 | |
|/ / / / | ||||||
* | | | | Trace how long it takes for the send trasaction to complete, including retrys... | Jorik Schellekens | 2019-09-05 | 4 | -38/+58 | |
* | | | | Gracefully handle log context slips and missing opentracing import errors. (#... | Jorik Schellekens | 2019-09-05 | 2 | -24/+59 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... | Erik Johnston | 2019-09-05 | 5 | -8/+16 | |
|\ \ \ | ||||||
| * | | | use access methods (duh..) | Jorik Schellekens | 2019-09-05 | 1 | -1/+3 | |
| * | | | Bugfix phrasing | Jorik Schellekens | 2019-09-05 | 1 | -1/+1 | |
| * | | | Opentracing context cannot be none | Jorik Schellekens | 2019-09-05 | 1 | -1/+1 | |
| * | | | newsfile | Jorik Schellekens | 2019-09-05 | 1 | -0/+1 | |
| * | | | Link the send loop with the edus contexts | Jorik Schellekens | 2019-09-05 | 3 | -7/+12 | |
* | | | | Add opentracing to all client servlets (#5983) | Jorik Schellekens | 2019-09-05 | 6 | -18/+26 | |
* | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2019-09-05 | 4 | -47/+132 | |
* | | | | Fix opentracing contexts missing from outbound replication requests (#5982) | Jorik Schellekens | 2019-09-05 | 2 | -4/+17 | |
* | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2019-09-05 | 3 | -1/+36 | |
|/ / / | ||||||
* | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2019-09-04 | 4 | -64/+10 | |
* | | | Cleanup event auth type initialisation (#5975) | Andrew Morgan | 2019-09-04 | 2 | -5/+6 | |
* | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 11 | -641/+1642 | |
* | | | code cleanups | Andrew Morgan | 2019-09-03 | 1 | -7/+2 | |
* | | | Ensure the list media admin API is always available (#5966) | Travis Ralston | 2019-09-03 | 2 | -2/+6 | |
* | | | Fix docstring | Andrew Morgan | 2019-09-03 | 1 | -2/+1 | |
* | | | Remove unnecessary variable declaration | Andrew Morgan | 2019-09-03 | 1 | -1/+0 | |
* | | | Docker packaging should not su-exec or chmod if already running as UID/GID (#... | Michael Kaye | 2019-09-03 | 2 | -35/+50 | |
* | | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Travis Ralston | 2019-09-03 | 2 | -0/+2 | |
* | | | fix typo | Matthew Hodgson | 2019-09-03 | 1 | -1/+1 | |
* | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 15 | -20/+1 | |
* | | | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 8 | -58/+118 | |
* | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2019-09-02 | 3 | -137/+2 | |
* | | | fix thumbnail storage location (#5915) | L0ric0 | 2019-09-02 | 2 | -1/+2 | |
* | | | Update INSTALL.md to say that Python 2 is no longer supported (#5953) | Aaron Raimist | 2019-09-02 | 2 | -2/+3 | |
* | | | Revert "Add m.id_access_token flag (#5930)" (#5945) | Andrew Morgan | 2019-08-30 | 2 | -7/+1 | |
* | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 81 | -286/+287 | |
* | | | Move buildkite config to the pipelines repo (#5943) | Amber Brown | 2019-08-31 | 3 | -310/+16 | |
* | | | Add m.id_access_token flag (#5930) | Andrew Morgan | 2019-08-30 | 2 | -1/+7 | |
* | | | Removed unused jenkins/ folder and script (#5938) | Amber Brown | 2019-08-30 | 2 | -16/+1 | |
* | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) | Andrew Morgan | 2019-08-30 | 4 | -166/+9 | |
* | | | Fix buildkite pipeline plugin matrix-org/annotate using the wrong variable co... | Amber Brown | 2019-08-30 | 1 | -3/+3 | |
* | | | Fix coverage in sytest and use plugins for buildkite (#5922) | Amber Brown | 2019-08-29 | 8 | -32/+92 | |
|/ / | ||||||
* | | Add a link to python's logging config schema (#5926) | Jorik Schellekens | 2019-08-28 | 3 | -2/+5 | |
* | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 5 | -2/+9 | |
|\ \ | ||||||
| * | | Removing entry for 5903 | Will Hunt | 2019-08-28 | 1 | -1/+0 | |
| * | | Apply suggestions from code review | Will Hunt | 2019-08-23 | 1 | -2/+2 | |
| * | | Update changelog | Half-Shot | 2019-08-23 | 1 | -1/+1 | |
| * | | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 | |
| * | | Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent | Half-Shot | 2019-08-23 | 2 | -1/+3 | |
| |\ \ | ||||||
| | * | | Add changelog | Half-Shot | 2019-08-23 | 1 | -0/+1 | |
| | * | | Add bot type | Half-Shot | 2019-08-23 | 1 | -1/+2 | |
| * | | | Fix registration test | Half-Shot | 2019-08-23 | 1 | -0/+1 | |
| * | | | newsfile 5902 | Half-Shot | 2019-08-23 | 1 | -0/+1 | |
| * | | | Ignore consent for support users | Half-Shot | 2019-08-23 | 1 | -0/+1 | |
| * | | | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 | |
| |/ / | ||||||
* | | | Let synctl use a config directory. (#5904) | Jorik Schellekens | 2019-08-28 | 3 | -6/+15 | |
* | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2019-08-28 | 4 | -9/+166 | |
* | | | Config templating (#5900) | Jorik Schellekens | 2019-08-28 | 9 | -46/+366 | |
* | | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 31 | -82/+1328 | |
* | | | Fix a cache-invalidation bug for worker-based deployments (#5920) | Richard van der Hoff | 2019-08-28 | 2 | -8/+17 | |
* | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 5 | -9/+62 | |
|\ \ \ | ||||||
| * | | | Document GET method for retrieving admin bit of user in admin API | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -0/+19 | |
| * | | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 4 | -9/+43 | |
* | | | | Typographical corrections in docker/README (#5921) | Victor Goff | 2019-08-28 | 1 | -5/+5 | |
* | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | reivilibre | 2019-08-28 | 4 | -16/+96 | |
|\ \ \ \ | ||||||
| * | | | | Newsfile on one line | Olivier Wilkinson (reivilibre) | 2019-08-20 | 1 | -2/+1 | |
| * | | | | Use MSC2197 on stable prefix as it has almost finished FCP | Olivier Wilkinson (reivilibre) | 2019-08-20 | 2 | -26/+4 | |
| * | | | | Newsfile | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -0/+2 | |
| * | | | | Add support for inbound MSC2197 requests on unstable Federation API | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -1/+59 | |
| * | | | | Support MSC2197 outbound with unstable prefix | Olivier Wilkinson (reivilibre) | 2019-08-15 | 2 | -16/+59 | |
* | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookups | Erik Johnston | 2019-08-27 | 7 | -215/+283 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix off by one error in SRV result shuffling | Erik Johnston | 2019-08-27 | 1 | -8/+13 | |
| * | | | | | Fixup comments | Erik Johnston | 2019-08-23 | 1 | -1/+9 | |
| * | | | | | Fix logcontexts | Erik Johnston | 2019-08-23 | 1 | -4/+8 | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_l... | Erik Johnston | 2019-08-22 | 47 | -284/+850 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Make changelog entry be a feature | Erik Johnston | 2019-08-20 | 1 | -0/+0 | |
| * | | | | | | Remove now unused pick_server_from_list | Erik Johnston | 2019-08-20 | 1 | -30/+0 | |
| * | | | | | | Fixup _sort_server_list to be slightly more efficient | Erik Johnston | 2019-08-20 | 1 | -2/+11 | |
| * | | | | | | Remove test debugs | Erik Johnston | 2019-08-20 | 3 | -3/+0 | |
| * | | | | | | Newsfile | Erik Johnston | 2019-08-15 | 1 | -0/+1 | |
| * | | | | | | Refactor MatrixFederationAgent to retry SRV. | Erik Johnston | 2019-08-15 | 4 | -194/+268 | |
* | | | | | | | Allow schema deltas to be engine-specific (#5911) | reivilibre | 2019-08-27 | 2 | -5/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style (Black) | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -3/+1 | |
| * | | | | | | | Newsfile | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -0/+1 | |
| * | | | | | | | Allow schema deltas to be engine-specific | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -5/+21 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Richard van der Hoff | 2019-08-27 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Increase max display name limit | Neil Johnson | 2019-08-24 | 2 | -1/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5895 from matrix-org/erikj/notary_key | Erik Johnston | 2019-08-27 | 5 | -26/+56 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't implicitly include server signing key | Erik Johnston | 2019-08-23 | 1 | -7/+6 | |
| * | | | | | | | Fixup review comments | Erik Johnston | 2019-08-23 | 3 | -6/+6 | |
| * | | | | | | | Newsfile | Erik Johnston | 2019-08-21 | 1 | -0/+1 | |
| * | | | | | | | Only sign when we respond to remote key requests | Erik Johnston | 2019-08-21 | 2 | -23/+16 | |
| * | | | | | | | Add config option for keys to use to sign keys | Erik Johnston | 2019-08-21 | 3 | -9/+46 | |
* | | | | | | | | Update 5909.misc | Richard van der Hoff | 2019-08-27 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #5909 from aaronraimist/public_base_url | Richard van der Hoff | 2019-08-27 | 3 | -2/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | Add changelog | Aaron Raimist | 2019-08-26 | 1 | -0/+1 | |
| * | | | | | | | public_base_url is actually public_baseurl | Aaron Raimist | 2019-08-26 | 2 | -2/+2 | |
| | |/ / / / / | |/| | | | | | ||||||
* / | | | | | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 6 | -0/+132 | |
|/ / / / / / | ||||||
* | | | | | | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 9 | -94/+234 | |
* | | | | | | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis... | Richard van der Hoff | 2019-08-22 | 2 | -53/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove shared secret registration from client/r0/register endpoint | Manuel Stahl | 2019-08-22 | 2 | -53/+5 | |
* | | | | | | | Opentracing across workers (#5771) | Jorik Schellekens | 2019-08-22 | 5 | -83/+123 | |
* | | | | | | | Revert "Do not send consent notices if "no-consent-required" is set" | Brendan Abolivier | 2019-08-22 | 1 | -4/+0 | |
* | | | | | | | Revert "Add "require_consent" parameter for registration" | Brendan Abolivier | 2019-08-22 | 3 | -18/+3 | |
* | | | | | | | Do not send consent notices if "no-consent-required" is set | Half-Shot | 2019-08-22 | 1 | -0/+4 | |
* | | | | | | | Add "require_consent" parameter for registration | Half-Shot | 2019-08-22 | 3 | -3/+18 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail | Erik Johnston | 2019-08-22 | 4 | -72/+164 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Change jitter to be a factor rather than absolute value | Erik Johnston | 2019-08-20 | 2 | -13/+14 | |
| * | | | | | | Fixup changelog and remove debug logging | Erik Johnston | 2019-08-16 | 3 | -5/+2 | |
| * | | | | | | Newsfile | Erik Johnston | 2019-08-15 | 1 | -0/+1 | |
| * | | | | | | Retry well known on fail. | Erik Johnston | 2019-08-15 | 3 | -67/+160 | |
* | | | | | | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 7 | -7/+142 | |
* | | | | | | | Add missing index on users_in_public_rooms. (#5894) | Richard van der Hoff | 2019-08-22 | 2 | -0/+18 | |
* | | | | | | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 6 | -0/+232 | |
* | | | | | | | Improve error msg when key-fetch fails (#5896) | Richard van der Hoff | 2019-08-22 | 2 | -5/+8 | |
* | | | | | | | Drop some unused tables. (#5893) | Richard van der Hoff | 2019-08-21 | 4 | -47/+23 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Refactor the Appservice scheduler code (#5886) | Richard van der Hoff | 2019-08-20 | 3 | -49/+68 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Refactor the Appservice scheduler code | Richard van der Hoff | 2019-08-20 | 3 | -49/+68 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Avoid deep recursion in appservice recovery (#5885) | Richard van der Hoff | 2019-08-20 | 2 | -18/+26 | |
* | | | | | | Opentracing doc update (#5776) | Jorik Schellekens | 2019-08-20 | 2 | -27/+41 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_comments | Erik Johnston | 2019-08-19 | 2 | -17/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-16 | 1 | -0/+1 | |
| * | | | | | Remove logging for #5407 and update comments | Erik Johnston | 2019-08-15 | 1 | -17/+5 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-08-17 | 6 | -15/+66 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | 1.3.1 v1.3.1 release-v1.3.1 | Richard van der Hoff | 2019-08-17 | 5 | -5/+28 | |
| * | | | | Drop dependency on sdnotify (#5871) | Richard van der Hoff | 2019-08-17 | 3 | -11/+38 | |
| * | | | | add attribution | Richard van der Hoff | 2019-08-16 | 1 | -1/+1 | |
| * | | | | Add changelog entry. | Chris Moos | 2019-08-16 | 1 | -0/+1 | |
| * | | | | Fix issue with Synapse not starting up. Fixes #5866. | Chris Moos | 2019-08-16 | 1 | -1/+1 | |
* | | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_index | Hubert Chathi | 2019-08-16 | 3 | -1/+20 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix changelog | Hubert Chathi | 2019-08-15 | 1 | -1/+1 | |
| * | | | | | update set_e2e_room_key to agree with fixed index | Hubert Chathi | 2019-08-14 | 1 | -1/+1 | |
| * | | | | | add changelog | Hubert Chathi | 2019-08-14 | 1 | -0/+1 | |
| * | | | | | add the version field to the index for e2e_room_keys | Hubert Chathi | 2019-08-14 | 1 | -0/+18 | |
* | | | | | | Opentracing misc (#5856) | Jorik Schellekens | 2019-08-16 | 4 | -16/+25 | |
* | | | | | | Fix up password reset template config names (#5863) | Andrew Morgan | 2019-08-15 | 3 | -10/+11 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-08-15 | 6 | -14/+28 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge tag 'v1.3.0' | Brendan Abolivier | 2019-08-15 | 237 | -2739/+4310 | |
| |\ \ \ \ | ||||||
| | * | | | | 1.3.0 v1.3.0 release-v1.3.0 | Brendan Abolivier | 2019-08-15 | 5 | -6/+14 | |
| | * | | | | Remove libsqlite3-dev from required build dependencies. (#5766) | Andrew Morgan | 2019-08-15 | 3 | -5/+4 | |
| | * | | | | Merge pull request #5851 from matrix-org/rei/roomdir_maybedeferred | reivilibre | 2019-08-15 | 2 | -2/+10 | |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | Update changelog.d/5851.bugfix | reivilibre | 2019-08-14 | 1 | -2/+2 | |
| | | * | | | Newsfile | Olivier Wilkinson (reivilibre) | 2019-08-14 | 1 | -0/+2 | |
| | | * | | | Wrap `get_local_public_room_list` call in `maybeDeferred` because it | Olivier Wilkinson (reivilibre) | 2019-08-14 | 1 | -2/+8 | |
| | |/ / / | ||||||
| * | | | | make user creation steps clearer | Neil Johnson | 2019-08-08 | 1 | -5/+4 | |
* | | | | | Don't create broken room when power_level_content_override.users does not con... | Michael Telatynski | 2019-08-15 | 2 | -1/+14 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookup | Erik Johnston | 2019-08-14 | 5 | -27/+137 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Newsfile | Erik Johnston | 2019-08-13 | 1 | -0/+1 | |
| * | | | Retry well-known lookup before expiry. | Erik Johnston | 2019-08-13 | 4 | -27/+136 | |
* | | | | 1.3.0rc1 v1.3.0rc1 | Brendan Abolivier | 2019-08-13 | 63 | -62/+75 | |
* | | | | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startup | Brendan Abolivier | 2019-08-13 | 2 | -1/+2 | |
|\ \ \ \ | ||||||
| * | | | | changelog | Amber H. Brown | 2019-08-14 | 1 | -0/+1 | |
| * | | | | fix config being a dict, actually | Amber H. Brown | 2019-08-14 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop | Erik Johnston | 2019-08-13 | 4 | -21/+55 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Remove redundant return | Erik Johnston | 2019-08-13 | 1 | -1/+0 | |
| * | | | Clarify docstring | Erik Johnston | 2019-08-13 | 1 | -1/+1 | |
| * | | | Newsfile | Erik Johnston | 2019-08-01 | 1 | -0/+1 | |
| * | | | Handle pusher being deleted during processing. | Erik Johnston | 2019-08-01 | 3 | -21/+55 | |
* | | | | Don't load the media repo when configured to use an external media repo (#5754) | Amber Brown | 2019-08-13 | 10 | -91/+188 | |
* | | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known | Erik Johnston | 2019-08-13 | 4 | -171/+222 | |
|\ \ \ \ | ||||||
| * | | | | Make default well known cache global again. | Erik Johnston | 2019-08-13 | 1 | -1/+4 | |
| * | | | | Newsfile | Erik Johnston | 2019-08-12 | 1 | -0/+1 | |
| * | | | | Move well known lookup into a separate clas | Erik Johnston | 2019-08-07 | 3 | -173/+216 | |
| * | | | | Add a lower bound for TTL on well known results. | Erik Johnston | 2019-08-06 | 2 | -2/+6 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pauses | Erik Johnston | 2019-08-13 | 2 | -128/+143 | |
|\ \ \ \ | ||||||
| * | | | | Newsfile | Erik Johnston | 2019-08-06 | 1 | -0/+1 | |
| * | | | | Don't unnecessarily block notifying of new events. | Erik Johnston | 2019-08-06 | 1 | -128/+142 | |
* | | | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_vis | Erik Johnston | 2019-08-12 | 2 | -4/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-12 | 1 | -0/+1 | |
| * | | | | | Whitelist history visbility sytests for worker mode | Erik Johnston | 2019-08-12 | 1 | -4/+0 | |
* | | | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-script | Erik Johnston | 2019-08-12 | 2 | -1/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Changelogs should end in '.' or '!' | Erik Johnston | 2019-08-12 | 1 | -1/+1 | |
| * | | | | | Fix curl command typo in purge_remote_media.sh | Thomas Citharel | 2019-08-09 | 2 | -1/+2 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #5788 from matrix-org/rav/metaredactions | Richard van der Hoff | 2019-08-12 | 3 | -101/+183 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | changelog | Richard van der Hoff | 2019-07-30 | 1 | -0/+1 | |
| * | | | | Handle loops in redaction events | Richard van der Hoff | 2019-07-30 | 2 | -60/+106 | |
| * | | | | recursively fetch redactions | Richard van der Hoff | 2019-07-30 | 1 | -32/+36 | |
| * | | | | split _get_events_from_db out of _enqueue_events | Richard van der Hoff | 2019-07-29 | 1 | -32/+51 | |
| * | | | | Return dicts from _fetch_event_list | Richard van der Hoff | 2019-07-29 | 1 | -15/+27 | |
* | | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_sync | Erik Johnston | 2019-08-06 | 2 | -6/+38 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-06 | 1 | -0/+1 | |
| * | | | | | Handle TimelineBatch being limited and empty. | Erik Johnston | 2019-08-06 | 1 | -6/+37 | |
| | |/ / / | |/| | | | ||||||
* / | | | | Return 404 instead of 403 when retrieving an event without perms (#5798) | Andrew Morgan | 2019-08-06 | 2 | -3/+12 | |
|/ / / / | ||||||
* | | | | Account validity: allow defining HTML templates to serve the us… (#5807) | Brendan Abolivier | 2019-08-01 | 8 | -11/+119 | |
|\ \ \ \ | ||||||
| * | | | | Lint | Brendan Abolivier | 2019-08-01 | 3 | -17/+10 | |
| * | | | | 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/+76 | |
* | | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachable | Erik Johnston | 2019-08-01 | 2 | -4/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-01 | 1 | -0/+1 | |
| * | | | | | Return 502 not 500 when failing to reach any remote server. | Erik Johnston | 2019-08-01 | 1 | -4/+3 | |
* | | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806) | Andrew Morgan | 2019-08-01 | 2 | -21/+22 | |
* | | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_error | Erik Johnston | 2019-08-01 | 2 | -1/+7 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-01 | 1 | -0/+1 | |
| * | | | | | Handle incorrectly encoded query params correctly | Erik Johnston | 2019-08-01 | 1 | -1/+6 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #5805 from matrix-org/erikj/validate_state | Erik Johnston | 2019-08-01 | 2 | -2/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 | |
| * | | | | | Validate well-known state events are state events. | Erik Johnston | 2019-07-31 | 1 | -2/+9 | |
* | | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstone | Erik Johnston | 2019-08-01 | 2 | -0/+10 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fix spelling. | Erik Johnston | 2019-08-01 | 2 | -2/+4 | |
| |/ / / / | ||||||
| * | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 | |
| * | | | | Don't allow clients to send tombstones that reference the same room | Erik Johnston | 2019-07-31 | 1 | -0/+7 | |
* | | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room | Erik Johnston | 2019-08-01 | 2 | -1/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 | |
| * | | | | | Deny redaction of events in a different room. | Erik Johnston | 2019-07-31 | 1 | -1/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errors | Erik Johnston | 2019-08-01 | 3 | -32/+61 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-30 | 1 | -0/+1 | |
| * | | | | | Don't log as exception when failing durig backfill | Erik Johnston | 2019-07-30 | 1 | -0/+3 | |
| * | | | | | Correctly handle errors doing requests to group servers | Erik Johnston | 2019-07-29 | 1 | -32/+57 |