summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | NewsfileErik Johnston2020-07-311-0/+1
| | | * | Add ratelimiting on joinsErik Johnston2020-07-314-2/+72
| | |/ /
| | * | Fix formatting of changelog and upgrade notes v1.18.0 github/release-v1.18.0 release-v1.18.0Olivier Wilkinson (reivilibre)2020-07-302-2/+1
| | * | Add deprecation warningsOlivier Wilkinson (reivilibre)2020-07-302-0/+36
| | * | 1.18.0Olivier Wilkinson (reivilibre)2020-07-304-2/+16
| | * | Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-2914-235/+413
| |/ /
| * | 1.18.0rc2 v1.18.0rc2Richard van der Hoff2020-07-285-4/+17
| * | Typing worker needs to handle stream update requests (#7967)Erik Johnston2020-07-282-1/+2
| * | Handle replication commands synchronously where possible (#7876)Richard van der Hoff2020-07-275-86/+113
|/ /
* | update changelog v1.18.0rc1Richard van der Hoff2020-07-271-16/+4
* | 1.18.0rc1Richard van der Hoff2020-07-2776-76/+106
* | Fix error reporting when using `opentracing.trace` (#7961)Erik Johnston2020-07-273-12/+4
* | Fix typing replication not being handled on master (#7959)Erik Johnston2020-07-274-7/+12
* | Remove hacky error handling for inlineDeferreds. (#7950)Patrick Cloke2020-07-273-21/+13
* | Convert tests/rest/admin/test_room.py to unix file endings (#7953)Andrew Morgan2020-07-272-1447/+1448
* | Support oEmbed for media previews. (#7920)Patrick Cloke2020-07-273-53/+355
* | Convert state resolution to async/await (#7942)Patrick Cloke2020-07-2418-184/+198
* | Fix up types and comments that refer to Deferreds. (#7945)Patrick Cloke2020-07-249-157/+174
* | Do not convert async functions to Deferreds in the interactive_auth_handler (...Patrick Cloke2020-07-242-26/+22
* | Convert more of the media code to async/await (#7873)Patrick Cloke2020-07-244-34/+47
* | Return an empty body for OPTIONS requests. (#7886)Patrick Cloke2020-07-243-25/+12
* | Downgrade warning on client disconnect to INFO (#7928)Richard van der Hoff2020-07-243-61/+3
* | Convert presence handler helpers to async/await. (#7939)Patrick Cloke2020-07-233-24/+24
* | Update the auth providers to be async. (#7935)Patrick Cloke2020-07-234-112/+118
* | Put a cache on `/state_ids` (#7931)Richard van der Hoff2020-07-232-2/+12
* | Abort federation requests if the client disconnects early (#7930)Richard van der Hoff2020-07-232-0/+7
* | Reorder database docs to promote postgresql. (#7933)Michael Kaye2020-07-232-5/+6
* | Convert the federation agent and related code to async/await. (#7874)Patrick Cloke2020-07-235-53/+51
* | Follow-up to admin API to re-activate accounts (#7908)Patrick Cloke2020-07-223-6/+43
* | Convert the message handler to async/await. (#7884)Patrick Cloke2020-07-2210-238/+273
* | Merge pull request #7934 from matrix-org/babolivier/acme_eolBrendan Abolivier2020-07-222-2/+4
|\ \ | |/ |/|
| * Update the dates for ACME v1 EOLBrendan Abolivier2020-07-222-2/+4
|/
* Skip serializing /sync response if client has disconnected (#7927)Richard van der Hoff2020-07-222-0/+7
* Add debugging to sync response generation (#7929)Richard van der Hoff2020-07-223-2/+19
* Remove an unused prometheus metric (#7878)Richard van der Hoff2020-07-222-3/+2
* Track command processing as a background process (#7879)Richard van der Hoff2020-07-224-3/+40
* Clean up PreserveLoggingContext (#7877)Richard van der Hoff2020-07-222-16/+14
* fix an incorrect commentRichard van der Hoff2020-07-221-2/+2
* Convert room list handler to async/await. (#7912)Patrick Cloke2020-07-213-41/+32
* Element CSS and logo in email templates (#7919)Jason Robinson2020-07-214-0/+12
* Lint the contrib/ directory in CI and linting scripts, add synctl to linting ...Andrew Morgan2020-07-2011-82/+71
* Remove unused code from synapse.logging.utils. (#7897)Karthikeyan Singaravelan2020-07-202-126/+2
* Fix a typo in the sample config. (#7890)Adrian2020-07-203-2/+3
* Fix deprecation warning: import ABC from collections.abc (#7892)Karthikeyan Singaravelan2020-07-205-6/+7
* Change sample config's postgres user to synapse_user (#7889)Andrew Morgan2020-07-203-2/+3
* Fix deprecation warning due to invalid escape sequences (#7895)Karthikeyan Singaravelan2020-07-202-4/+5
* Remove Ubuntu Eoan that is now EOL (#7888)Gary Kim2020-07-172-1/+1
* Fix the trace function for async functions. (#7872)Patrick Cloke2020-07-172-23/+41
* Add help for creating a user via docker (#7885)Michael Kaye2020-07-172-0/+16
* Switch to Debian:Slim from Alpine for the docker image (#7839)Christopher May-Townsend2020-07-173-40/+30
* Stop using 'device_max_stream_id' (#7882)Erik Johnston2020-07-174-5/+3
* Fix TypeError in synapse.notifier (#7880)Erik Johnston2020-07-172-0/+9
* Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-174-4/+18
* Change "unknown room ver" logging to warning. (#7881)Erik Johnston2020-07-172-1/+2
* Convert device handler to async/await (#7871)Patrick Cloke2020-07-176-166/+162
* Convert synapse.app to async/await. (#7868)Patrick Cloke2020-07-174-41/+37
* Convert _base, profile, and _receipts handlers to async/await (#7860)Patrick Cloke2020-07-176-59/+53
* Add admin endpoint to get members in a room. (#7842)Michael Albert2020-07-165-1/+107
* Consistently use `db_to_json` to convert from database values to JSON objects...Patrick Cloke2020-07-1622-82/+80
* Combine nginx federation server blocks (#7823)Luke Faraone2020-07-161-11/+5
* Optimise queueing of inbound replication commands (#7861)Richard van der Hoff2020-07-162-116/+216
* Reject attempts to join empty rooms over federation (#7859)Richard van der Hoff2020-07-162-2/+14
* Allow moving typing off master (#7869)Erik Johnston2020-07-1610-178/+284
* Add ability to run multiple pusher instances (#7855)Erik Johnston2020-07-169-82/+293
* Merge pull request #7866 from matrix-org/rav/fix_guest_user_idRichard van der Hoff2020-07-1611-81/+196
|\
| * changelogRichard van der Hoff2020-07-161-0/+1
| * Use a postgres sequence to generate guest user IDsRichard van der Hoff2020-07-164-51/+82
| * Use SequenceGenerator for state group ID allocationRichard van der Hoff2020-07-164-26/+11
| * Use `PostgresSequenceGenerator` from `MultiWriterIdGenerator`Richard van der Hoff2020-07-161-4/+4
| * Add some helper classes for generating ID sequencesRichard van der Hoff2020-07-161-0/+98
* | Add some tiny type annotations (#7870)Richard van der Hoff2020-07-163-8/+7
* | Remove obsolete comment.Olivier Wilkinson (reivilibre)2020-07-161-2/+0
* | Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-158-13/+22
* | Avoid brand new rooms in `delete_old_current_state_events` (#7854)Richard van der Hoff2020-07-152-10/+56
* | Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into developErik Johnston2020-07-153-4/+5
|\ \ | |/ |/|
| * Fix testsErik Johnston2020-07-151-2/+2
| * Fix typoErik Johnston2020-07-151-1/+1
| * NewsfileErik Johnston2020-07-151-0/+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-155-22/+90
* | Fix client reader sharding tests (#7853)Erik Johnston2020-07-157-174/+300
|/
* Convert E2E key and room key handlers to async/await. (#7851)Patrick Cloke2020-07-155-361/+521
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-154-30/+27
* remove `retry_on_integrity_error` wrapper for persist_events (#7848)Richard van der Hoff2020-07-152-67/+1
* Fix bug in per-room message retention policies. (#7850)Patrick Cloke2020-07-142-1/+2
* Allow email subjects to be customised through Synapse's configuration (#7846)Brendan Abolivier2020-07-144-39/+202
* Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-1412-113/+775
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-146-15/+182
* Improve the type hints of synapse.api.errors. (#7820)Patrick Cloke2020-07-142-55/+74
* Clearly state built-in ACME no longer works (#7824)Luke Faraone2020-07-141-7/+5
* Correctly pass app_name to all email templates. (#7829)Erik Johnston2020-07-142-2/+9
* Support handling registration requests across multiple client readers. (#7830)Patrick Cloke2020-07-133-1/+136
* Fix handling of "off" in encryption_enabled_by_default_for_room_type (#7822)Brendan Abolivier2020-07-132-1/+7
* Update grafana dashboardRichard van der Hoff2020-07-131-85/+214
* Merge branch 'master' into developRichard van der Hoff2020-07-133-4/+14
|\
| * 1.17.0 v1.17.0 github/release-v1.17.0 release-v1.17.0Richard van der Hoff2020-07-133-4/+14
* | Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-107-28/+17
* | Add types to the server code and remove unused parameter (#7813)Patrick Cloke2020-07-102-30/+42
* | Include room states on invite events sent to ASes (#6455)Sorunome2020-07-102-4/+17
* | Merge branch 'release-v1.17.0' into developRichard van der Hoff2020-07-103-0/+41
|\|
| * Merge branch 'master' into release-v1.17.0Richard van der Hoff2020-07-103-0/+41
| |\
| | * update changelog v1.16.1 github/release-v1.16.1 release-v1.16.1Richard van der Hoff2020-07-101-1/+1
| | * fix migration, againRichard van der Hoff2020-07-101-1/+1
| | * fix changelogRichard van der Hoff2020-07-101-6/+0
| | * 1.16.1Richard van der Hoff2020-07-104-2/+26
| | * Drop incorrectly-added table `local_rejections_stream`. (#7816)Richard van der Hoff2020-07-102-0/+23
* | | Add ability to shard the federation sender (#7798)Erik Johnston2020-07-1015-157/+670
* | | Fix resync remote devices on receive PDU in worker mode. (#7815)Erik Johnston2020-07-102-8/+20
* | | Fix recursion error when fetching auth chain over federation (#7817)Erik Johnston2020-07-103-16/+44
|/ /
* | 1.17.0rc1 v1.17.0rc1Richard van der Hoff2020-07-0929-27/+54
* | Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-0931-40/+41
* | `update_membership` declaration: now always returns an event id. (#7809)Richard van der Hoff2020-07-094-9/+8
* | Improve stacktraces from exceptions in background processes (#7808)Richard van der Hoff2020-07-092-1/+10
* | Fix `can only concatenate list (not "tuple") to list` exception (#7810)Richard van der Hoff2020-07-092-1/+2
* | Pass original request headers from workers to the main process. (#7797)Patrick Cloke2020-07-092-5/+26
* | Generate real events when we reject invites (#7804)Richard van der Hoff2020-07-097-169/+184
* | Add `HomeServer.signing_key` property (#7805)Richard van der Hoff2020-07-0810-12/+12
* | Revert "Update the installation docs on apt-transport-https (#7801)"Richard van der Hoff2020-07-082-12/+0
* | Do not use simplejson in Synapse. (#7800)Patrick Cloke2020-07-086-25/+11
* | Stop passing bytes when dumping JSON (#7799)Patrick Cloke2020-07-084-6/+11
* | Update the installation docs on apt-transport-https (#7801)Dirk Heinrichs2020-07-082-0/+12
* | Merge branch 'master' into developRichard van der Hoff2020-07-083-6/+17
|\|
| * shuffle changelog slightly v1.16.0 github/release-v1.16.0 release-v1.16.0Richard van der Hoff2020-07-081-6/+5
| * 1.16.0Richard van der Hoff2020-07-083-1/+13
* | Change Caddy links (old is deprecated) (#7789)Nicolai Søborg2020-07-083-2/+3
* | Stop populating unused table `local_invites`. (#7793)Richard van der Hoff2020-07-075-81/+25
* | Refactor getting replication updates from database v2. (#7740)Erik Johnston2020-07-0711-195/+336
* | Add libwebp dependency to Dockerfile (#7791)Juho Vanhanen2020-07-062-0/+3
* | Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-065-29/+180
* | Convert the appservice handler to async/await. (#7775)Patrick Cloke2020-07-064-76/+68
* | Don't ignore `set_tweak` actions with no explicit `value`. (#7766)reivilibre2020-07-063-4/+45
* | Allow to use higher versions of prometheus_client (#7780)Oliver Kurz2020-07-062-1/+2
* | isort 5 compatibility (#7786)Will Hunt2020-07-0523-38/+22
* | Merge different Resource implementation classes (#7732)Erik Johnston2020-07-0318-318/+322
* | Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-038-48/+279
* | Allow YAML config file to contain None (#7779)Alex Kotov2020-07-032-1/+3
* | Merge tag 'v1.16.0rc2' into developPatrick Cloke2020-07-025-24/+41
|\|
| * Fix a typo. v1.16.0rc2Patrick Cloke2020-07-021-1/+1
| * Move 1.15.2 after 1.16.0rc2.Patrick Cloke2020-07-021-20/+20
| * 1.16.0rc2Patrick Cloke2020-07-024-3/+19
| * Merge branch 'master' into release-v1.16.0Patrick Cloke2020-07-0215-98/+134
| |\
| * | Fix new metric where we used ms instead of seconds (#7771)Erik Johnston2020-07-013-2/+3
* | | Merge branch 'master' into developPatrick Cloke2020-07-0215-98/+134
|\ \ \ | | |/ | |/|
| * | Merge tag 'v1.15.2'Patrick Cloke2020-07-0214-98/+133
| |\ \
| | * | Remove an extraneous space. v1.15.2 github/release-v1.15.2 release-v1.15.2Patrick Cloke2020-07-021-1/+1
| | * | Add links to the fixes.Patrick Cloke2020-07-021-2/+2
| | * | Fix tense in the release notes.Patrick Cloke2020-07-021-1/+1
| | * | 1.15.2Patrick Cloke2020-07-023-1/+27
| | * | 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-0210-94/+103
| * | | Update postgres in the Docker compose example to 12-alpine. (#7696)lub2020-06-172-1/+2
| |/ /
* | | Hack to add push priority to push notifications (#7765)reivilibre2020-07-013-8/+362
* | | Add early returns to `_check_for_soft_fail` (#7769)Richard van der Hoff2020-07-012-64/+56
* | | Use symbolic names for replication stream names (#7768)Richard van der Hoff2020-07-0111-22/+27
* | | Type checking for `FederationHandler` (#7770)Richard van der Hoff2020-07-013-17/+32
* | | Fix incorrect error message when database CTYPE was set incorrectly. (#7760)Richard van der Hoff2020-07-012-1/+2
| |/ |/|
* | Pin link in CHANGES.md v1.16.0rc1Andrew Morgan2020-07-011-1/+1
* | Fixes to CHANGES.mdAndrew Morgan2020-07-011-8/+12
* | 1.16.0rc1Andrew Morgan2020-07-0145-44/+71
* | Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-0111-189/+53
* | Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-306-71/+542
* | Add some metrics for inbound and outbound federation processing times (#7755)Erik Johnston2020-06-305-17/+43
* | Explain the purpose of the "tests" conditional dependency requirement (#7751)Andrew Morgan2020-06-302-0/+5
* | Add another yield point to state res v2 (#7746)Erik Johnston2020-06-262-2/+11
* | Move flake8 to end. Don't exit script on failure (#7738)Andrew Morgan2020-06-252-2/+3
* | Make tox actions work on Debian 10 (#7703)Dagfinn Ilmari Mannsåker2020-06-252-4/+3
* | Yield during large v2 state res. (#7735)Erik Johnston2020-06-245-11/+62
* | add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-243-4/+12
* | Set Content-Length for Metrics requests (#7730)Christian Svensson2020-06-232-1/+5
* | Sync ignored table names in synapse_port_db to current database schema (#7717)Patrick Cloke2020-06-232-4/+13
* | Allow local media to be marked as safe from being quarantined. (#7718)Patrick Cloke2020-06-227-107/+119
* | Convert directory handler to async/await (#7727)Patrick Cloke2020-06-223-40/+33
* | Speed up state res v2 across large state differences. (#7725)Erik Johnston2020-06-192-1/+3
* | Fixed typo by adding a 'g' to PostgreSQL (#7724)Jesse Riddle2020-06-192-1/+2
* | add a commentRichard van der Hoff2020-06-181-0/+2
* | Merge pull request #7716 from matrix-org/babolivier/unread_fixBrendan Abolivier2020-06-173-2/+3
|\ \
| * | Fix unread counts in syncBrendan Abolivier2020-06-173-2/+3
* | | Convert the typing handler to async/await. (#7679)Patrick Cloke2020-06-173-24/+19
* | | Require parameterized package version to be at least 0.7.0. (#7680)Oleg Girko2020-06-172-1/+3
|/ /
* | Ignore the UI Auth sessions when porting from sqlite to postgresql (#7711)Patrick Cloke2020-06-172-7/+13
* | Add support for using rust-python-jaeger-reporter (#7697)Erik Johnston2020-06-173-3/+40
* | Support running multiple media repos. (#7706)Erik Johnston2020-06-174-4/+28
* | Fetch from the r0 media path instead of the unspecced v1. (#7714)Patrick Cloke2020-06-173-5/+6
* | Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-179-51/+187
|\ \
| * \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1557-292/+363
| |\ \
| * \ \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1526-115/+448
| |\ \ \
| * | | | Incorporate reviewBrendan Abolivier2020-06-151-15/+11
| * | | | LintBrendan Abolivier2020-06-121-3/+8
| * | | | Incorporate review bitsBrendan Abolivier2020-06-123-22/+20
| * | | | Pre-populate the unread_count columnBrendan Abolivier2020-06-121-0/+5
| * | | | Don't update the schema versionBrendan Abolivier2020-06-122-1/+1
| * | | | Use attr instead of a dictBrendan Abolivier2020-06-121-21/+31
| * | | | LintBrendan Abolivier2020-06-121-3/+1
| * | | | Test that a mark_unread action updates the right counter when using a slave s...Brendan Abolivier2020-06-121-0/+15
| * | | | Remove debug loggingBrendan Abolivier2020-06-121-2/+0
| * | | | Test that a mark_unread action updates the right counterBrendan Abolivier2020-06-121-5/+16
| * | | | Fix summary rotationBrendan Abolivier2020-06-121-12/+35
| * | | | Log for invalid values of notifBrendan Abolivier2020-06-111-0/+6
| * | | | Fix SQLBrendan Abolivier2020-06-111-3/+3
| * | | | Fix schema updateBrendan Abolivier2020-06-111-1/+1
| * | | | LintBrendan Abolivier2020-06-111-1/+2
| * | | | Save the count of unread messages to event_push_summaryBrendan Abolivier2020-06-113-20/+53
| * | | | Actually act on mark_unreadBrendan Abolivier2020-06-111-3/+7
| * | | | Appease mypyBrendan Abolivier2020-06-101-1/+1
| * | | | LintBrendan Abolivier2020-06-101-3/+3
| * | | | Use temporary prefixes as per the MSCBrendan Abolivier2020-06-103-3/+5
| * | | | ChangelogBrendan Abolivier2020-06-102-1/+1
| * | | | Fix testsBrendan Abolivier2020-06-102-17/+21
| * | | | Use a more efficient way of calculating countersBrendan Abolivier2020-06-101-23/+20
| * | | | Add a new unread_counter to sync responsesBrendan Abolivier2020-06-103-3/+28
| * | | | Rename dont_push into mark_unreadBrendan Abolivier2020-06-102-5/+4
| * | | | Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-10963-30448/+65965
| |\ \ \ \
| * | | | | changelogMatthew Hodgson2019-09-191-0/+1
| * | | | | Add experimental "dont_push" push action to suppress push for notificationsMatthew Hodgson2019-09-191-5/+10
* | | | | | fix broken link in sample config (#7712)Richard van der Hoff2020-06-163-2/+3
* | | | | | Refactor getting replication updates from database. (#7636)Erik Johnston2020-06-169-72/+251
* | | | | | Fix "argument of type 'ObservableDeferred' is not iterable" error (#7708)Patrick Cloke2020-06-163-5/+7
* | | | | | Add instructions for authing with Keycloak via OpenID (#7659)hungrymonkey2020-06-162-0/+45
* | | | | | Include a user agent in federation requests. (#7677)Patrick Cloke2020-06-165-4/+43
* | | | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-1673-237/+111
* | | | | | Convert the device message and pagination handlers to async/await. (#7678)Patrick Cloke2020-06-163-31/+19
* | | | | | Create a ListenerConfig object (#7681)Richard van der Hoff2020-06-1613-167/+248
* | | | | | Merge branch 'master' into developBrendan Abolivier2020-06-167-9/+81
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix changelog wording v1.15.1 github/release-v1.15.1 release-v1.15.1Brendan Abolivier2020-06-161-2/+2
| * | | | | 1.15.1Brendan Abolivier2020-06-165-3/+17
| * | | | | Wrap register_device coroutine in an ensureDeferred (#7684)Andrew Morgan2020-06-164-5/+62
| * | | | | Merge pull request #7685 from matrix-org/babolivier/3pid_r0Brendan Abolivier2020-06-152-3/+4
| |\ \ \ \ \
| | * | | | | Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-152-3/+4
| |/ / / / /
* | | | | | Ensure the body is a string before comparing push rules. (#7701)Patrick Cloke2020-06-153-11/+33
* | | | | | Ensure etag is a string for GET room_keys/version response (#7691)Hubert Chathi2020-06-153-0/+3
* | | | | | Update m.id.phone to use 'phone' instead of 'number' (#7687)Andrew Morgan2020-06-152-2/+11
* | | | | | Fix "There was no active span when trying to log." error (#7698)Erik Johnston2020-06-152-0/+2
| |_|_|_|/ |/| | | |
* | | | | Discard RDATA from already seen positions. (#7648)Patrick Cloke2020-06-156-27/+175
* | | | | Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-1547-263/+184
* | | | | Fix warnings about losing log context during UI auth. (#7688)Patrick Cloke2020-06-122-1/+2
* | | | | Fix a typo when comparing the URI & method during UI Auth. (#7689)Patrick Cloke2020-06-122-1/+2
| |_|_|/ |/| | |
* | | | Remove "user_id" from GET /presence. (#7606)Will Hunt2020-06-112-1/+4
* | | | Merge branch 'master' into developBrendan Abolivier2020-06-113-4/+16
|\| | |
| * | | 1.15.0 v1.15.0 github/release-v1.15.0 release-v1.15.0Brendan Abolivier2020-06-113-1/+13
| * | | Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into release-...Brendan Abolivier2020-06-090-0/+0
| |\ \ \
| | * | | Update CHANGES.mdRichard van der Hoff2020-06-091-1/+1
| | | |/ | | |/|
| * / | Fix some attributionsBrendan Abolivier2020-06-091-3/+3
| |/ /
* | | Increase the default SAML session expirary time to 15 minutes. (#7664)Patrick Cloke2020-06-113-3/+4
* | | fix typo in sample_config.yaml (#7652)wondratsch2020-06-113-2/+3
* | | Take out a lock before modifying _CACHES (#7663)Richard van der Hoff2020-06-102-5/+16
* | | Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-1011-36/+275
* | | Clean-up the fallback login code. (#7657)Patrick Cloke2020-06-104-64/+130
|/ /
* | 1.15.0rc1 v1.15.0rc1Brendan Abolivier2020-06-0945-44/+67
* | Revert "1.15.0rc1"Brendan Abolivier2020-06-0945-67/+44
* | 1.15.0rc1Brendan Abolivier2020-06-0945-44/+67