summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * Convert device handler to async/await (#7871)Patrick Cloke2020-07-171-136/+105
| * Convert _base, profile, and _receipts handlers to async/await (#7860)Patrick Cloke2020-07-174-53/+41
| * Reject attempts to join empty rooms over federation (#7859)Richard van der Hoff2020-07-161-2/+13
| * Allow moving typing off master (#7869)Erik Johnston2020-07-161-74/+167
| * Merge pull request #7866 from matrix-org/rav/fix_guest_user_idRichard van der Hoff2020-07-161-21/+1
| |\
| | * Use a postgres sequence to generate guest user IDsRichard van der Hoff2020-07-161-21/+1
| * | Add some tiny type annotations (#7870)Richard van der Hoff2020-07-161-6/+4
| * | Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-151-1/+2
| * | Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into developErik Johnston2020-07-151-2/+2
| |\ \ | | |/ | |/|
| | * Fix typoErik Johnston2020-07-151-1/+1
| | * Use get_users_in_room rather than state handler in typing for speedErik Johnston2020-07-151-2/+2
| * | Allow accounts to be re-activated from the admin APIs. (#7847)Patrick Cloke2020-07-151-20/+28
| |/
| * Convert E2E key and room key handlers to async/await. (#7851)Patrick Cloke2020-07-152-124/+98
| * Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-141-2/+206
| * Support handling registration requests across multiple client readers. (#7830)Patrick Cloke2020-07-131-1/+2
| * Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-101-1/+1
| * Fix resync remote devices on receive PDU in worker mode. (#7815)Erik Johnston2020-07-101-8/+19
| * Fix recursion error when fetching auth chain over federation (#7817)Erik Johnston2020-07-101-12/+37
| * `update_membership` declaration: now always returns an event id. (#7809)Richard van der Hoff2020-07-092-5/+5
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-091-1/+1
|\|
| * Fix `can only concatenate list (not "tuple") to list` exception (#7810)Richard van der Hoff2020-07-091-1/+1
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-0910-210/+288
|\|
| * Generate real events when we reject invites (#7804)Richard van der Hoff2020-07-093-76/+158
| * Add `HomeServer.signing_key` property (#7805)Richard van der Hoff2020-07-082-2/+2
| * Stop passing bytes when dumping JSON (#7799)Patrick Cloke2020-07-081-2/+2
| * Refactor getting replication updates from database v2. (#7740)Erik Johnston2020-07-071-0/+3
| * Convert the appservice handler to async/await. (#7775)Patrick Cloke2020-07-061-42/+32
| * isort 5 compatibility (#7786)Will Hunt2020-07-052-4/+2
| * Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-031-2/+3
| * Merge tag 'v1.16.0rc2' into developPatrick Cloke2020-07-021-1/+1
| |\
| | * Merge branch 'master' into release-v1.16.0Patrick Cloke2020-07-023-35/+14
| | |\
| | * | Fix new metric where we used ms instead of seconds (#7771)Erik Johnston2020-07-011-1/+1
| * | | Merge branch 'master' into developPatrick Cloke2020-07-023-35/+14
| |\ \ \ | | | |/ | | |/|
| * | | Add early returns to `_check_for_soft_fail` (#7769)Richard van der Hoff2020-07-011-64/+55
| * | | Type checking for `FederationHandler` (#7770)Richard van der Hoff2020-07-011-17/+30
| | |/ | |/|
* | | Merge branch 'release-v1.15.2' into matrix-org-hotfixesPatrick Cloke2020-07-023-35/+14
|\ \ \ | | |/ | |/|
| * | Correctly handle outliers as prev events over federationErik Johnston2020-07-021-3/+3
| * | Ensure that HTML pages served from Synapse include headers to avoid embedding.Patrick Cloke2020-07-022-32/+11
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2020-07-011-3/+0
|\ \ \ | | |/ | |/|
| * | Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-011-3/+0
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2020-07-012-62/+174
|\| |
| * | Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-301-62/+168
| * | Add some metrics for inbound and outbound federation processing times (#7755)Erik Johnston2020-06-301-0/+6
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-06-253-40/+33
|\| |
| * | Yield during large v2 state res. (#7735)Erik Johnston2020-06-241-0/+1
| * | Convert directory handler to async/await (#7727)Patrick Cloke2020-06-222-40/+32
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-06-171-18/+11
|\| |
| * | Convert the typing handler to async/await. (#7679)Patrick Cloke2020-06-171-18/+11
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-06-1719-173/+209
|\| |
| * | Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-171-0/+3
| |\ \
| | * \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1514-82/+60
| | |\ \
| | * \ \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-152-29/+57
| | |\ \ \
| | * | | | Appease mypyBrendan Abolivier2020-06-101-1/+1
| | * | | | LintBrendan Abolivier2020-06-101-3/+3
| | * | | | Use temporary prefixes as per the MSCBrendan Abolivier2020-06-101-1/+3
| | * | | | Add a new unread_counter to sync responsesBrendan Abolivier2020-06-101-0/+1
| | | |_|/ | | |/| |
| * | | | Refactor getting replication updates from database. (#7636)Erik Johnston2020-06-162-11/+58
| * | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-166-22/+13
| * | | | Convert the device message and pagination handlers to async/await. (#7678)Patrick Cloke2020-06-162-31/+18
| * | | | Ensure etag is a string for GET room_keys/version response (#7691)Hubert Chathi2020-06-151-0/+1
| * | | | Fix "There was no active span when trying to log." error (#7698)Erik Johnston2020-06-151-0/+1
| | |_|/ | |/| |
| * | | Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-1513-81/+59
| * | | Fix a typo when comparing the URI & method during UI Auth. (#7689)Patrick Cloke2020-06-121-1/+1
| | |/ | |/|
| * | Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-102-29/+57
| |/
* | Merge tag 'v1.15.0rc1' of github.com:matrix-org/synapse into matrix-org-hotfixesBrendan Abolivier2020-06-1014-337/+297
|\|
| * Convert the registration handler to async/await. (#7649)Patrick Cloke2020-06-081-66/+41
| * Convert user directory handler and related classes to async/await. (#7640)Patrick Cloke2020-06-054-107/+73
| * Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-051-1/+7
| * Typo fixes.Patrick Cloke2020-06-051-1/+1
| * Allow new users to be registered via the admin API even if the monthly active...Dirk Klimpel2020-06-051-1/+6
| * Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-054-56/+38
| * Cleanups to the OpenID Connect integration (#7628)Richard van der Hoff2020-06-031-7/+20
| * Check if the localpart is reserved for guests earlier in the registration flo...Brendan Abolivier2020-06-031-9/+9
| * Fix exceptions when fetching events from a down host. (#7622)Erik Johnston2020-06-031-1/+1
| * Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-031-30/+11
| * Process cross-signing keys when resyncing device lists (#7594)Brendan Abolivier2020-06-012-18/+62
| * Convert groups local and server to async/await. (#7600)Patrick Cloke2020-06-011-47/+35
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesBrendan Abolivier2020-06-012-23/+33
|\|
| * Don't fail all of an iteration of the device list retry loop on error (#7609)Brendan Abolivier2020-06-011-15/+21
| * Fix 'FederationGroupsRoomsServlet' API when group has room server is not in. ...Erik Johnston2020-05-291-8/+12
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-05-293-65/+56
|\|
| * allow emails to be passed through SAML (#7385)Christopher Cooper2020-05-271-2/+10
| * Convert identity handler to async/await. (#7561)Patrick Cloke2020-05-262-63/+46
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-05-268-150/+341
|\|
| * Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-221-3/+5
| * Add option to move event persistence off master (#7517)Erik Johnston2020-05-225-19/+61
| * Add ability to wait for replication streams (#7542)Erik Johnston2020-05-225-70/+140
| * Convert sending mail to async/await. (#7557)Erik Johnston2020-05-221-5/+4
| * On upgrade room only send canonical alias once. (#7547)Erik Johnston2020-05-221-55/+60
| * Fix exception reporting due to HTTP request errors. (#7556)Erik Johnston2020-05-221-0/+7
| * Retry to sync out of sync device lists (#7453)Brendan Abolivier2020-05-211-7/+73
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-05-2111-282/+1328
|\|
| * Hash passwords earlier in the password reset process (#7538)Patrick Cloke2020-05-201-4/+1
| * Omit displayname or avatar_url if they aren't set instead of returning null (...Aaron Raimist2020-05-191-2/+6
| * Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-181-7/+2
| |\
| * | Add type hints to room member handlers (#7513)Patrick Cloke2020-05-152-139/+173
| * | Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-152-20/+60
| * | Update the room member handler to use async/await. (#7507)Patrick Cloke2020-05-152-74/+58
| * | Ignore incoming presence updates when presence is disabled (#7508)Andrew Morgan2020-05-151-2/+4
| * | Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-141-19/+18
| |\ \
| * | | Allow censoring of events to happen on workers. (#7492)Erik Johnston2020-05-131-2/+0
| * | | Convert federation handler to async/await. (#7459)Patrick Cloke2020-05-112-21/+16
| * | | Convert search code to async/await. (#7460)Patrick Cloke2020-05-111-24/+20
| * | | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-111-14/+40
| |\ \ \
| * | | | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-082-2/+1000
| * | | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-071-1/+3
| |\ \ \ \
| * | | | | Add more type hints to SAML handler. (#7445)Patrick Cloke2020-05-071-12/+16
| * | | | | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-061-4/+8
| |\ \ \ \ \
| * | | | | | Convert the room handler to async/await. (#7396)Patrick Cloke2020-05-041-24/+18
* | | | | | | Merge branch 'rav/matrix_hacks' into matrix-org-hotfixesRichard van der Hoff2020-05-201-3/+5
|\ \ \ \ \ \ \
| * | | | | | | inline some config referencesRichard van der Hoff2020-05-201-3/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into matrix-o...Patrick Cloke2020-05-181-7/+2
|\| | | | | |
| * | | | | | Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-181-7/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-141-19/+18
|\| | | | |
| * | | | | Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-131-19/+18
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'origin/release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-111-14/+40
|\| | | |
| * | | | Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-081-14/+40
| | |_|/ | |/| |
* | | | Revert emergency registration patchesRichard van der Hoff2020-05-111-0/+12
* | | | Revert emergency registration patchesRichard van der Hoff2020-05-111-3/+1
* | | | Merge remote-tracking branch 'origin/clokep/no-validate-ui-auth-sess' into ma...Richard van der Hoff2020-05-071-1/+3
|\ \ \ \
| * | | | Propagate changes to the client dict to the database.Patrick Cloke2020-05-071-1/+3
* | | | | Merge commit '4d3ebc' into matrix-org-hotfixesRichard van der Hoff2020-05-071-12/+0
|\| | | |
| * | | | Disable validation that a UI authentication session has not been modified dur...Patrick Cloke2020-05-071-12/+0
| |/ / /
* | | | Merge branch 'release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-071-1/+3
|\| | |
| * | | Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-071-1/+3
| | |/ | |/|
| * | Merge branch 'release-v1.13.0' into erikj/faster_device_lists_fetchRichard van der Hoff2020-05-059-281/+250
| |\|
* | | fix bad mergeRichard van der Hoff2020-05-061-19/+3
* | | Merge branch 'release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-069-279/+264
|\ \ \ | | |/ | |/|
| * | async/await is_server_admin (#7363)Andrew Morgan2020-05-019-281/+250
* | | Merge erikj/faster_device_lists_fetch into matrix-org-hotfixesRichard van der Hoff2020-05-051-4/+8
|\ \ \ | | |/ | |/|
| * | Speed up fetching device lists changes in sync.Erik Johnston2020-05-051-4/+8
| |/
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2020-05-015-142/+92
|\|
| * Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-303-116/+63
| * Apply federation check for /publicRooms with filter list (#7367)Andrew Morgan2020-04-301-1/+5
| * Convert some of the federation handler methods to async/await. (#7338)Patrick Cloke2020-04-241-25/+24
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-04-2420-341/+935
|\|
| * Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-223-105/+135
| * Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-221-9/+139
| |\
| * | import urllib.parse when using urllib.parse.quote (#7319)Andrew Morgan2020-04-221-1/+1
| * | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-201-129/+9
| |\ \
| * \ \ Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-201-9/+129
| |\ \ \
| * | | | Reject unknown UI auth sessions (instead of silently generating a new one) (#...Patrick Cloke2020-04-201-65/+94
| * | | | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-171-32/+12
| * | | | Convert auth handler to async/await (#7261)Patrick Cloke2020-04-154-111/+115
| * | | | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
| * | | | Check on room creation if the user is allowed to publish the room to the room...PeerD2020-04-131-0/+7
| * | | | typosMatthew Hodgson2020-04-111-1/+1
| * | | | Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-091-0/+1
| * | | | Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-093-6/+32
| * | | | Improve error responses when a remote server doesn't allow you to access its ...Andrew Morgan2020-04-061-11/+12
| * | | | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-032-74/+91
| * | | | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-012-14/+153
| * | | | Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-011-1/+5
| * | | | Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-301-23/+2
| * | | | Transfer alias mappings when joining an upgraded room (#6946)Andrew Morgan2020-03-301-0/+3
| * | | | Merge pull request #7160 from matrix-org/dbkr/always_send_own_device_list_upd...David Baker2020-03-302-3/+18
| |\ \ \ \
| | * | | | Add explanatory commentAndrew Morgan2020-03-302-1/+4
| | * | | | blackDavid Baker2020-03-301-1/+3
| | * | | | Just add own user ID to the list we track device changes forDavid Baker2020-03-302-7/+11
| | * | | | Fix undefined variable & remove debug loggingDavid Baker2020-03-271-10/+2
| | * | | | blackDavid Baker2020-03-271-4/+4
| | * | | | Always send the user updates to their own device listDavid Baker2020-03-272-6/+20
| * | | | | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+16
| |/ / / /
| * | | | Merge pull request #7151 from matrix-org/jaywink/saml-redirect-fixJason Robinson2020-03-261-0/+4
| |\ \ \ \
| | * | | | Allow RedirectResponse in SAML response handlerJason Robinson2020-03-261-0/+4
| * | | | | Refactor the CAS code (move the logic out of the REST layer to a handler) (#7...Patrick Cloke2020-03-261-0/+204
| * | | | | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-262-0/+95
| |/ / / /
| * | | | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-261-4/+33
| * | | | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-241-2/+2
| * | | | Use the proper error code when a canonical alias that does not exist is used....Patrick Cloke2020-03-231-19/+38
| * | | | Remove concept of a non-limited stream. (#7011)Erik Johnston2020-03-202-4/+11
* | | | | Merge branch 'release-v1.12.4' into matrix-org-hotfixesRichard van der Hoff2020-04-221-9/+139
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Query missing cross-signing keys on local sig upload (#7289)Andrew Morgan2020-04-221-9/+139
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'origin/release-v1.12.4' into matrix-org-hotfixesRichard van der Hoff2020-04-212-3/+18
|\| | |
| * | | Revert "Query missing cross-signing keys on local sig upload"Richard van der Hoff2020-04-201-129/+9
| | |/ | |/|
| * | Always send the user updates to their own device list (#7160)David Baker2020-04-202-3/+18
* | | Revert recent merges of #7289 into matrix-org-hotfixesRichard van der Hoff2020-04-211-129/+9
* | | lintAndrew Morgan2020-04-171-5/+5
* | | Fix log lines, return type, tuple handlingAndrew Morgan2020-04-171-20/+20
* | | Merge branch 'release-v1.12.4' of github.com:matrix-org/synapse into matrix-o...Andrew Morgan2020-04-171-9/+129
|\| |
| * | Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-171-9/+129
* | | Merge branch 'release-v1.12.4' into HEADAndrew Morgan2020-04-141-7/+11
|\| |
| * | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-03-185-122/+154
|\|
| * Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-181-16/+25
| * Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-171-15/+1
| * Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-16/+0
| * Fix buggy condition in account validity handler (#7074)Brendan Abolivier2020-03-161-1/+5
| * Add type annotations and comments to auth handler (#7063)Patrick Cloke2020-03-121-89/+104
| * Don't filter out dummy events when we're checking the visibility of stateBrendan Abolivier2020-03-111-1/+1
| * Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-0/+16
| |\
| | * lint, fix testsdklimpel2020-03-091-1/+3
| | * updates after reviewdklimpel2020-03-091-4/+4
| | * lintdklimpel2020-03-081-4/+2
| | * changelogdklimpel2020-03-081-2/+8
| | * Add options to disable setting profile info for prevent changes.dklimpel2020-03-081-0/+10
| * | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-101-1/+19
* | | Don't filter out events when we're checking the visibility of stateBrendan Abolivier2020-03-111-1/+1
* | | Merge branch 'develop' into matrix-org-hotfixesBrendan Abolivier2020-03-095-46/+208
|\| |
| * | LintBrendan Abolivier2020-03-061-2/+1
| * | Mention the session ID in the error messageBrendan Abolivier2020-03-061-2/+3
| * | LintBrendan Abolivier2020-03-061-1/+2
| * | Make sure that is_verified is a boolean when processing room keysBrendan Abolivier2020-03-061-0/+6
| * | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-041-33/+74
| * | Merge branch 'master' into developBrendan Abolivier2020-03-032-3/+76
| |\ \
| | * | Fix wrong handler being used in SAML handlerBrendan Abolivier2020-03-031-3/+2
| | * | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-031-0/+74
| * | | Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-032-10/+51
| | |/ | |/|
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-02-2713-231/+177
|\| |
| * | Store room version on invite (#6983)Richard van der Hoff2020-02-261-0/+12
| * | Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-262-108/+89
| * | Remove redundant store_room call (#6979)Richard van der Hoff2020-02-241-23/+0
| * | Upsert room version when we join over federation (#6968)Richard van der Hoff2020-02-241-10/+12
| * | Change displayname of user as admin in rooms (#6876)Dirk Klimpel2020-02-211-1/+11
| * | Stop returning aliases as part of the room list. (#6970)Patrick Cloke2020-02-211-9/+0
| * | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-219-35/+33
| * | Merge branch 'master' into developRichard van der Hoff2020-02-211-5/+5
| |\|
| | * Small grammar fixes to the ACME v1 deprecation notice (#6944)Andrew Morgan2020-02-211-5/+5
| * | Do not send alias events when creating / upgrading a room (#6941)Patrick Cloke2020-02-202-40/+15
| |/
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2020-02-195-33/+22
|\|
| * Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-195-33/+22
| |\
| | * Make room alias lists peekableRichard van der Hoff2020-02-191-1/+3
| | * Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-193-6/+14
| | * Refactor the membership check methods in AuthRichard van der Hoff2020-02-182-28/+7
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-02-193-3/+32
|\| |
| * | Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-logBrendan Abolivier2020-02-191-1/+1
| |\ \ | | |/ | |/|
| | * Fix log in message retention purge jobsBrendan Abolivier2020-02-181-1/+1
| * | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-181-1/+16
| * | Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-181-1/+15
| |\ \ | | |/ | |/|
| | * Make the log more noticeableBrendan Abolivier2020-02-181-1/+2
| | * Print the error as an error log and raise the same exception we gotBrendan Abolivier2020-02-181-9/+10
| | * LintBrendan Abolivier2020-02-131-6/+7
| | * LintBrendan Abolivier2020-02-131-7/+6
| | * Add a comprehensive error when failing to register for an ACME accountBrendan Abolivier2020-02-131-1/+13
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-02-1811-640/+683
|\| |
| * | Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-182-40/+41
| * | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-171-1/+9
| * | Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-141-2/+12
| |/
| * Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-111-0/+1
| |\
| * | Reject device display names that are too long (#6882)Patrick Cloke2020-02-101-1/+13
| * | Add support for putting fed user query API on workers (#6873)Erik Johnston2020-02-071-19/+16
| * | Allow moving group read APIs to workers (#6866)Erik Johnston2020-02-071-131/+139
| * | Admin api to add an email address (#6789)Dirk Klimpel2020-02-072-0/+10
| * | Limit the number of events that can be requested when backfilling events (#6864)Patrick Cloke2020-02-061-0/+4
| * | pass room version into FederationClient.send_join (#6854)Richard van der Hoff2020-02-061-2/+1
| * | Third party event rules Update (#6781)PeerD2020-02-061-1/+5
| * | Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-064-11/+11
| * | Merge pull request #6823 from matrix-org/rav/redact_changes/5Richard van der Hoff2020-02-061-6/+2
| |\ \
| | * | Pass room version object into `FederationClient.get_pdu`Richard van der Hoff2020-02-051-6/+2
| * | | Merge tag 'v1.10.0rc2' into developErik Johnston2020-02-064-17/+69
| |\ \ \ | | |/ / | |/| |