summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Add typing info to Notifier (#8058)Erik Johnston2020-08-113-52/+89
|/ /
* | Reduce INFO logging (#8050)Erik Johnston2020-08-113-25/+73
* | Change the default log config to reduce disk I/O and storage (#8040)Erik Johnston2020-08-111-5/+36
* | Implement login blocking based on SAML attributes (#8052)Richard van der Hoff2020-08-114-11/+147
|/
* Add an assertion on prev_events in create_new_client_event (#8041)Richard van der Hoff2020-08-101-0/+9
* Implement new experimental push rules (#7997)Brendan Abolivier2020-08-104-14/+244
|\
| * TypoBrendan Abolivier2020-08-101-1/+1
| * LintBrendan Abolivier2020-08-101-2/+2
| * why mypy whyBrendan Abolivier2020-08-101-1/+3
| * LintBrendan Abolivier2020-08-061-1/+1
| * Incorporate reviewBrendan Abolivier2020-08-061-2/+2
| * Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-08-06350-1509/+1754
| |\
| * | Incorporate reviewBrendan Abolivier2020-08-064-21/+12
| * | Fix PUT /pushrules to use the right rule IDsBrendan Abolivier2020-08-031-2/+9
| * | Back out the database hack and replace it with a temporary config settingBrendan Abolivier2020-08-034-48/+20
| * | Fix cache nameBrendan Abolivier2020-07-311-1/+1
| * | Fix cache invalidation callsBrendan Abolivier2020-07-312-2/+2
| * | LintBrendan Abolivier2020-07-301-19/+32
| * | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-07-3096-1714/+2102
| |\ \
| * | | Implement new experimental push rules with a database hack to enable themBrendan Abolivier2020-07-283-14/+259
* | | | Convert directory, e2e_room_keys, end_to_end_keys, monthly_active_users datab...Patrick Cloke2020-08-075-102/+95
* | | | Convert additional database stores to async/await (#8045)Patrick Cloke2020-08-074-150/+104
* | | | Add a comment about SSLv23_METHOD (#8043)Richard van der Hoff2020-08-071-0/+8
* | | | Don't log OPTIONS request at INFO (#8049)Erik Johnston2020-08-071-1/+7
* | | | Remove unnecessary maybeDeferred calls (#8044)Patrick Cloke2020-08-074-7/+4
* | | | Add health check endpoint (#8048)Erik Johnston2020-08-074-3/+48
* | | | Reduce unnecessary whitespace in JSON. (#7372)David Vo2020-08-0714-53/+55
* | | | Revert #7736 (#8039)Brendan Abolivier2020-08-067-162/+15
* | | | Convert some util functions to async (#8035)Patrick Cloke2020-08-062-28/+27
* | | | Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-0612-92/+78
* | | | Convert run_as_background_process inner function to async. (#8032)Patrick Cloke2020-08-063-26/+15
* | | | Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-064-73/+144
| |_|/ |/| |
* | | Rename database classes to make some sense (#8033)Erik Johnston2020-08-05314-1152/+1232
* | | Stop the parent process flushing the logs on exit (#8012)Richard van der Hoff2020-08-051-2/+8
* | | Fix async/await calls for broken media providers. (#8027)Patrick Cloke2020-08-042-22/+20
* | | Convert the SimpleHttpClient to async. (#8016)Patrick Cloke2020-08-042-32/+25
* | | Convert streams to async. (#8014)Patrick Cloke2020-08-048-29/+25
* | | re-implement daemonize (#8011)Richard van der Hoff2020-08-043-14/+134
* | | Remove signature check on v1 identity server lookups (#8001)Andrew Morgan2020-08-031-31/+3
* | | Prevent join->join membership transitions changing member count (#7977)Andrew Morgan2020-08-033-6/+62
* | | Implement handling of HTTP HEAD requests. (#7999)Patrick Cloke2020-08-031-5/+11
* | | Convert the crypto module to async/await. (#8003)Patrick Cloke2020-08-031-109/+92
* | | Allow guests to operate in encrypted rooms (#7314)Michael Albert2020-08-031-1/+1
* | | Convert replication code to async/await. (#7987)Patrick Cloke2020-08-0310-38/+28
* | | Convert ACME code to async/await. (#7989)Patrick Cloke2020-08-032-14/+10
* | | Fix some comments and types in service notices (#7996)Patrick Cloke2020-07-315-59/+54
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l...Erik Johnston2020-07-3156-964/+1051
|\ \ \ | | |/ | |/|
| * | Fix invite rejection when we have no forward-extremeties (#7980)Richard van der Hoff2020-07-301-8/+21
| * | Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-3011-23/+81
| |\ \
| * | | Convert federation client to async/await. (#7975)Patrick Cloke2020-07-306-162/+128
| * | | Convert appservice to async. (#7973)Patrick Cloke2020-07-304-65/+46
| * | | Convert some of the data store to async. (#7976)Patrick Cloke2020-07-306-188/+160
| * | | Ensure that remove_pusher is always async (#7981)Patrick Cloke2020-07-301-1/+1
| * | | Ensure the msg property of HttpResponseException is a string. (#7979)Patrick Cloke2020-07-292-7/+16
| * | | Remove from the event_relations table when purging historical events. (#7978)Patrick Cloke2020-07-291-0/+2
| * | | Add additional logging for SAML sessions. (#7971)Patrick Cloke2020-07-291-0/+3
| * | | Re-implement unread counts (#7736)Brendan Abolivier2020-07-297-15/+162
| * | | Various improvements to the docs (#7899)Aaron Raimist2020-07-291-18/+0
| * | | Convert storage layer to async/await. (#7963)Patrick Cloke2020-07-283-140/+145
| * | | Add an option to disable purge in delete room admin API (#7964)Dirk Klimpel2020-07-281-1/+10
| * | | Move some log lines from default logger to sql/transaction loggers (#7952)Andrew Morgan2020-07-281-8/+10
| * | | Use the JSON module from the std library instead of simplejson. (#7936)Patrick Cloke2020-07-282-1/+13
| * | | Option to allow server admins to join complex rooms (#7902)lugino-emeritus2020-07-282-2/+13
| * | | Merge tag 'v1.18.0rc2' into developRichard van der Hoff2020-07-285-88/+113
| |\ \ \
| * | | | Convert the remaining media repo code to async / await. (#7947)Patrick Cloke2020-07-275-107/+130
| * | | | Convert a synapse.events to async/await. (#7949)Patrick Cloke2020-07-278-72/+73
| * | | | Convert groups and visibility code to async / await. (#7951)Patrick Cloke2020-07-272-31/+24
| * | | | Convert push to async/await. (#7948)Patrick Cloke2020-07-277-141/+97
* | | | | Add ratelimiting on joinsErik Johnston2020-07-312-2/+56
| |_|/ / |/| | |
* | | | 1.18.0Olivier Wilkinson (reivilibre)2020-07-301-1/+1
* | | | Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-2910-22/+80
| |/ / |/| |
* | | 1.18.0rc2 v1.18.0rc2Richard van der Hoff2020-07-281-1/+1
* | | Typing worker needs to handle stream update requests (#7967)Erik Johnston2020-07-281-1/+1
* | | Handle replication commands synchronously where possible (#7876)Richard van der Hoff2020-07-273-86/+111
|/ /
* | 1.18.0rc1Richard van der Hoff2020-07-271-1/+1
* | Fix error reporting when using `opentracing.trace` (#7961)Erik Johnston2020-07-272-12/+3
* | Fix typing replication not being handled on master (#7959)Erik Johnston2020-07-273-7/+11
* | Remove hacky error handling for inlineDeferreds. (#7950)Patrick Cloke2020-07-272-21/+12
* | Support oEmbed for media previews. (#7920)Patrick Cloke2020-07-271-45/+220
* | Convert state resolution to async/await (#7942)Patrick Cloke2020-07-2412-134/+124
* | Fix up types and comments that refer to Deferreds. (#7945)Patrick Cloke2020-07-247-157/+172
* | Do not convert async functions to Deferreds in the interactive_auth_handler (...Patrick Cloke2020-07-241-26/+21
* | Convert more of the media code to async/await (#7873)Patrick Cloke2020-07-242-33/+42
* | Return an empty body for OPTIONS requests. (#7886)Patrick Cloke2020-07-241-19/+5
* | Downgrade warning on client disconnect to INFO (#7928)Richard van der Hoff2020-07-241-3/+1
* | Convert presence handler helpers to async/await. (#7939)Patrick Cloke2020-07-232-24/+23
* | Update the auth providers to be async. (#7935)Patrick Cloke2020-07-232-19/+23
* | Put a cache on `/state_ids` (#7931)Richard van der Hoff2020-07-231-2/+11
* | Abort federation requests if the client disconnects early (#7930)Richard van der Hoff2020-07-231-0/+6
* | Convert the federation agent and related code to async/await. (#7874)Patrick Cloke2020-07-232-16/+10
* | Follow-up to admin API to re-activate accounts (#7908)Patrick Cloke2020-07-222-6/+42
* | Convert the message handler to async/await. (#7884)Patrick Cloke2020-07-221-136/+152
|/
* Skip serializing /sync response if client has disconnected (#7927)Richard van der Hoff2020-07-221-0/+6
* Add debugging to sync response generation (#7929)Richard van der Hoff2020-07-222-2/+18
* Remove an unused prometheus metric (#7878)Richard van der Hoff2020-07-221-3/+1
* Track command processing as a background process (#7879)Richard van der Hoff2020-07-222-3/+38
* Clean up PreserveLoggingContext (#7877)Richard van der Hoff2020-07-221-16/+13
* fix an incorrect commentRichard van der Hoff2020-07-221-2/+2
* Convert room list handler to async/await. (#7912)Patrick Cloke2020-07-212-41/+31
* Element CSS and logo in email templates (#7919)Jason Robinson2020-07-213-0/+11
* Remove unused code from synapse.logging.utils. (#7897)Karthikeyan Singaravelan2020-07-201-126/+0
* Fix a typo in the sample config. (#7890)Adrian2020-07-201-1/+1
* Fix deprecation warning: import ABC from collections.abc (#7892)Karthikeyan Singaravelan2020-07-204-6/+6
* Change sample config's postgres user to synapse_user (#7889)Andrew Morgan2020-07-201-1/+1
* Fix the trace function for async functions. (#7872)Patrick Cloke2020-07-171-23/+40
* Stop using 'device_max_stream_id' (#7882)Erik Johnston2020-07-173-5/+2
* Fix TypeError in synapse.notifier (#7880)Erik Johnston2020-07-171-0/+8
* Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-172-3/+14
* Change "unknown room ver" logging to warning. (#7881)Erik Johnston2020-07-171-1/+1
* Convert device handler to async/await (#7871)Patrick Cloke2020-07-172-138/+131
* Convert synapse.app to async/await. (#7868)Patrick Cloke2020-07-173-41/+36
* Convert _base, profile, and _receipts handlers to async/await (#7860)Patrick Cloke2020-07-174-53/+41
* Add admin endpoint to get members in a room. (#7842)Michael Albert2020-07-162-0/+27
* Consistently use `db_to_json` to convert from database values to JSON objects...Patrick Cloke2020-07-1621-82/+79
* Optimise queueing of inbound replication commands (#7861)Richard van der Hoff2020-07-161-116/+215
* 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-169-178/+283
* Add ability to run multiple pusher instances (#7855)Erik Johnston2020-07-167-82/+99
* Merge pull request #7866 from matrix-org/rav/fix_guest_user_idRichard van der Hoff2020-07-169-80/+184
|\
| * Use a postgres sequence to generate guest user IDsRichard van der Hoff2020-07-163-50/+71
| * 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-162-8/+6
* | 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-157-13/+21
* | Avoid brand new rooms in `delete_old_current_state_events` (#7854)Richard van der Hoff2020-07-151-10/+55
* | 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-152-21/+37
* | Fix client reader sharding tests (#7853)Erik Johnston2020-07-152-1/+28
|/
* Convert E2E key and room key handlers to async/await. (#7851)Patrick Cloke2020-07-152-124/+98
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-151-5/+3
* remove `retry_on_integrity_error` wrapper for persist_events (#7848)Richard van der Hoff2020-07-151-67/+0
* Fix bug in per-room message retention policies. (#7850)Patrick Cloke2020-07-141-1/+1
* Allow email subjects to be customised through Synapse's configuration (#7846)Brendan Abolivier2020-07-142-37/+132
* Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-146-113/+273
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-142-6/+47
* Improve the type hints of synapse.api.errors. (#7820)Patrick Cloke2020-07-141-55/+73
* Correctly pass app_name to all email templates. (#7829)Erik Johnston2020-07-141-2/+8
* Support handling registration requests across multiple client readers. (#7830)Patrick Cloke2020-07-131-1/+2
* Fix handling of "off" in encryption_enabled_by_default_for_room_type (#7822)Brendan Abolivier2020-07-131-1/+6
* Merge branch 'master' into developRichard van der Hoff2020-07-131-1/+1
|\
| * 1.17.0 v1.17.0 github/release-v1.17.0 release-v1.17.0Richard van der Hoff2020-07-131-1/+1
* | Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-105-27/+15
* | Add types to the server code and remove unused parameter (#7813)Patrick Cloke2020-07-101-30/+41
* | Include room states on invite events sent to ASes (#6455)Sorunome2020-07-101-4/+16
* | Merge branch 'release-v1.17.0' into developRichard van der Hoff2020-07-101-0/+22
|\|
| * Merge branch 'master' into release-v1.17.0Richard van der Hoff2020-07-101-0/+22
| |\
| | * fix migration, againRichard van der Hoff2020-07-101-1/+1
| | * 1.16.1Richard van der Hoff2020-07-101-1/+1
| | * Drop incorrectly-added table `local_rejections_stream`. (#7816)Richard van der Hoff2020-07-101-0/+22
* | | Add ability to shard the federation sender (#7798)Erik Johnston2020-07-1011-125/+349
* | | 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-102-16/+43
|/ /
* | 1.17.0rc1 v1.17.0rc1Richard van der Hoff2020-07-091-1/+1
* | Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-0924-33/+33
* | `update_membership` declaration: now always returns an event id. (#7809)Richard van der Hoff2020-07-093-9/+7
* | Improve stacktraces from exceptions in background processes (#7808)Richard van der Hoff2020-07-091-1/+9
* | Fix `can only concatenate list (not "tuple") to list` exception (#7810)Richard van der Hoff2020-07-091-1/+1
* | Pass original request headers from workers to the main process. (#7797)Patrick Cloke2020-07-091-5/+25
* | Generate real events when we reject invites (#7804)Richard van der Hoff2020-07-096-169/+183
* | Add `HomeServer.signing_key` property (#7805)Richard van der Hoff2020-07-088-7/+9
* | Do not use simplejson in Synapse. (#7800)Patrick Cloke2020-07-085-25/+10
* | Stop passing bytes when dumping JSON (#7799)Patrick Cloke2020-07-083-6/+10
* | Merge branch 'master' into developRichard van der Hoff2020-07-081-1/+1
|\|
| * 1.16.0Richard van der Hoff2020-07-081-1/+1
* | Stop populating unused table `local_invites`. (#7793)Richard van der Hoff2020-07-073-80/+24
* | Refactor getting replication updates from database v2. (#7740)Erik Johnston2020-07-0710-195/+335
* | Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-062-25/+58
* | Convert the appservice handler to async/await. (#7775)Patrick Cloke2020-07-062-43/+32
* | Don't ignore `set_tweak` actions with no explicit `value`. (#7766)reivilibre2020-07-061-4/+27
* | Allow to use higher versions of prometheus_client (#7780)Oliver Kurz2020-07-061-1/+1
* | isort 5 compatibility (#7786)Will Hunt2020-07-0515-25/+15
* | Merge different Resource implementation classes (#7732)Erik Johnston2020-07-0315-309/+256
* | Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-035-18/+84
* | Merge tag 'v1.16.0rc2' into developPatrick Cloke2020-07-023-3/+3
|\|
| * 1.16.0rc2Patrick Cloke2020-07-021-1/+1
| * Merge branch 'master' into release-v1.16.0Patrick Cloke2020-07-0211-97/+106
| |\
| * | Fix new metric where we used ms instead of seconds (#7771)Erik Johnston2020-07-012-2/+2
* | | Merge branch 'master' into developPatrick Cloke2020-07-0211-97/+106
|\ \ \ | | |/ | |/|
| * | 1.15.2Patrick Cloke2020-07-021-1/+1
| * | 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
* | | Hack to add push priority to push notifications (#7765)reivilibre2020-07-011-3/+14
* | | Add early returns to `_check_for_soft_fail` (#7769)Richard van der Hoff2020-07-011-64/+55
* | | Use symbolic names for replication stream names (#7768)Richard van der Hoff2020-07-0110-22/+26
* | | Type checking for `FederationHandler` (#7770)Richard van der Hoff2020-07-011-17/+30
* | | Fix incorrect error message when database CTYPE was set incorrectly. (#7760)Richard van der Hoff2020-07-011-1/+1
| |/ |/|
* | 1.16.0rc1Andrew Morgan2020-07-011-1/+1
* | Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-016-142/+33
* | Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-303-67/+273
* | Add some metrics for inbound and outbound federation processing times (#7755)Erik Johnston2020-06-304-17/+42
* | Explain the purpose of the "tests" conditional dependency requirement (#7751)Andrew Morgan2020-06-301-0/+4
* | Add another yield point to state res v2 (#7746)Erik Johnston2020-06-261-2/+10
* | Yield during large v2 state res. (#7735)Erik Johnston2020-06-243-11/+52
* | add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-241-1/+4
* | Set Content-Length for Metrics requests (#7730)Christian Svensson2020-06-231-1/+4
* | Allow local media to be marked as safe from being quarantined. (#7718)Patrick Cloke2020-06-224-35/+52
* | Convert directory handler to async/await (#7727)Patrick Cloke2020-06-222-40/+32
* | Speed up state res v2 across large state differences. (#7725)Erik Johnston2020-06-191-1/+2
* | add a commentRichard van der Hoff2020-06-181-0/+2
* | Merge pull request #7716 from matrix-org/babolivier/unread_fixBrendan Abolivier2020-06-172-2/+2
|\ \
| * | Fix unread counts in syncBrendan Abolivier2020-06-172-2/+2
* | | Convert the typing handler to async/await. (#7679)Patrick Cloke2020-06-171-18/+11
* | | Require parameterized package version to be at least 0.7.0. (#7680)Oleg Girko2020-06-171-1/+2
|/ /
* | Add support for using rust-python-jaeger-reporter (#7697)Erik Johnston2020-06-171-3/+36
* | Support running multiple media repos. (#7706)Erik Johnston2020-06-172-3/+21
* | Fetch from the r0 media path instead of the unspecced v1. (#7714)Patrick Cloke2020-06-171-4/+4
* | Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-176-32/+141
|\ \
| * \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1551-271/+218
| |\ \
| * \ \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1513-103/+295
| |\ \ \
| * | | | Incorporate reviewBrendan Abolivier2020-06-151-15/+11
| * | | | LintBrendan Abolivier2020-06-121-3/+8
| * | | | Incorporate review bitsBrendan Abolivier2020-06-122-21/+19
| * | | | 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
| * | | | 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
| * | | | 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-10616-26200/+42607
| |\ \ \ \
| * | | | | 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-161-1/+1
* | | | | | Refactor getting replication updates from database. (#7636)Erik Johnston2020-06-168-72/+250
* | | | | | Fix "argument of type 'ObservableDeferred' is not iterable" error (#7708)Patrick Cloke2020-06-162-5/+6
* | | | | | Include a user agent in federation requests. (#7677)Patrick Cloke2020-06-163-4/+32
* | | | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-1657-201/+90
* | | | | | Convert the device message and pagination handlers to async/await. (#7678)Patrick Cloke2020-06-162-31/+18
* | | | | | Create a ListenerConfig object (#7681)Richard van der Hoff2020-06-167-148/+216
* | | | | | Merge branch 'master' into developBrendan Abolivier2020-06-163-9/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 1.15.1Brendan Abolivier2020-06-161-1/+1
| * | | | | Wrap register_device coroutine in an ensureDeferred (#7684)Andrew Morgan2020-06-161-5/+7
| * | | | | Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-151-3/+3
* | | | | | Ensure the body is a string before comparing push rules. (#7701)Patrick Cloke2020-06-151-2/+2
* | | | | | Ensure etag is a string for GET room_keys/version response (#7691)Hubert Chathi2020-06-151-0/+1
* | | | | | Update m.id.phone to use 'phone' instead of 'number' (#7687)Andrew Morgan2020-06-151-2/+10
* | | | | | Fix "There was no active span when trying to log." error (#7698)Erik Johnston2020-06-151-0/+1
| |_|_|_|/ |/| | | |
* | | | | Discard RDATA from already seen positions. (#7648)Patrick Cloke2020-06-153-6/+33