summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5638 from matrix-org/babolivier/invite-jsonAndrew Morgan2020-02-171-4/+24
|\
| * Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-091-4/+18
| |\
| | * Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-08105-1513/+1630
| | |\
| | * | LintBrendan Abolivier2019-07-081-1/+2
| | * | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
* | | | remove unused and unnecessary check for FederationDeniedError (#5645)Andrew Morgan2020-02-171-4/+1
|\| | |
| * | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-091-4/+1
* | | | Include the original event in /relations (#5626)Andrew Morgan2020-02-172-4/+6
|\| | |
| * | | Include the original event in /relations (#5626)Andrew Morgan2019-07-092-4/+6
* | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfAndrew Morgan2020-02-171-0/+4
|\| | |
| * | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+4
| |\ \ \
| | * | | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-081-0/+4
| | | |/ | | |/|
* | | | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-176-56/+15
|\| | |
| * | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-086-56/+15
* | | | Better logging for auto-join. (#5643)Andrew Morgan2020-02-171-0/+7
|\| | |
| * | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-081-0/+7
| |/ /
* | | Update ModuleApi to avoid register(generate_token=True) (#5640)Andrew Morgan2020-02-171-8/+56
|\| |
| * | Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-081-8/+56
* | | Factor out some redundant code in the login impl (#5639)Andrew Morgan2020-02-171-39/+10
|\| |
| * | Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
| * | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-51/+0
* | | Add default push rule to ignore reactions (#5623)Andrew Morgan2020-02-171-0/+13
|\| |
| * | Add default push rule to ignore reactions (#5623)J. Ryan Stinnett2019-07-051-0/+13
* | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2020-02-171-1/+5
|\| |
| * | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-1/+5
* | | Remove support for invite_3pid_guest. (#5625)Andrew Morgan2020-02-176-196/+2
|\| |
| * | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-056-196/+2
* | | remove dead transaction persist code (#5622)Andrew Morgan2020-02-173-69/+0
|\| |
| * | remove dead transaction persist code (#5622)Richard van der Hoff2019-07-053-69/+0
* | | Fixes to the federation rate limiter (#5621)Andrew Morgan2020-02-172-10/+10
|\| |
| * | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-052-10/+10
* | | Make errors about email password resets much clearer (#5616)Andrew Morgan2020-02-171-11/+8
|\| |
| * | Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-051-11/+8
* | | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Andrew Morgan2020-02-173-5/+61
|\| |
| * | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Amber Brown2019-07-053-5/+61
| * | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-07-041-1/+1
| |\ \
* | | | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-148-15/+11
* | | | Delete duplicate user deactivationAndrew Morgan2020-02-141-7/+0
* | | | Fix account_validity incorrect email response contentAndrew Morgan2020-02-141-2/+5
* | | | Fix incorrect run_in_background import statementAndrew Morgan2020-02-141-1/+1
* | | | 1.1.0Andrew Morgan2020-02-141-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | 1.1.0Erik Johnston2019-07-041-1/+1
* | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-1471-141/+153
|\ \ \ \ | | |/ / | |/| |
| * | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0471-141/+153
* | | | Fix 'utime went backwards' errors on daemonization. (#5609)Andrew Morgan2020-02-142-31/+43
|\| | |
| * | | Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-032-31/+43
| |/ /
* | | 1.1.0rc2Andrew Morgan2020-02-141-1/+1
|\| |
| * | 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-031-1/+1
* | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Andrew Morgan2020-02-144-6/+34
|\| |
| * | Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-034-6/+34
* | | Fix media repo breaking (#5593)Andrew Morgan2020-02-143-12/+24
|\| |
| * | Fix media repo breaking (#5593)Amber Brown2019-07-023-12/+24
* | | prepare v1.1.0rc1Andrew Morgan2020-02-141-1/+1
|\| |
| * | prepare v1.1.0rc1Richard van der Hoff2019-07-021-1/+1
* | | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-145-44/+209
|\| |
| * | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-025-44/+209
| |\ \
| | * \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0122-205/+303
| | |\ \
| | * | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| | * | | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | * | | cleanupsRichard van der Hoff2019-06-273-11/+18
| | * | | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-262-3/+56
| | * | | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-264-50/+96
| | * | | Revert redundant changes to static jsRichard van der Hoff2019-06-261-4/+2
| | * | | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-26304-9516/+9216
| | |\ \ \
| | * \ \ \ Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-114-2/+7
| | |\ \ \ \
| | * | | | | Code cleanups and simplifications.Richard van der Hoff2019-06-116-50/+53
| | * | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1085-861/+4648
| | |\ \ \ \ \
| | * | | | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-025-2/+55
* | | | | | | | Fix JWT login with new users (#5586)Andrew Morgan2020-02-141-6/+3
|\| | | | | | |
| * | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
* | | | | | | | fix async/await consentresource (#5585)Andrew Morgan2020-02-141-1/+3
|\| | | | | | |
| * | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-011-1/+3
* | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopAndrew Morgan2020-02-141-2/+19
|\| | | | | | |
| * | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-011-2/+19
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fixup commentErik Johnston2019-07-011-6/+13
| | * | | | | | Fix sync tightloop bug.Erik Johnston2019-06-211-2/+12
* | | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-149-156/+114
|\| | | | | | |
| * | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-299-156/+114
| * | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-281-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| | * | | | | | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Don't log GC 0s at INFO (#5557)Andrew Morgan2020-02-141-1/+4
|\| | | | | | |
| * | | | | | | Don't log GC 0s at INFO (#5557)Amber Brown2019-06-281-1/+4
* | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Andrew Morgan2020-02-142-7/+64
|\| | | | | | |
| * | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-282-7/+64
* | | | | | | | Added possibilty to disable local password authentication (#5092)Andrew Morgan2020-02-143-1/+11
|\| | | | | | |
| * | | | | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-273-1/+11
* | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2020-02-141-1/+9
|\| | | | | | |
| * | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-271-1/+9
* | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesAndrew Morgan2020-02-143-37/+97
|\| | | | | | |
| * | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesErik Johnston2019-06-273-37/+97
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Review commentsErik Johnston2019-06-272-7/+5
| | * | | | | | Refactor and comment sync device list codeErik Johnston2019-06-261-17/+53
| | * | | | | | Use batch_iter and correct docstringErik Johnston2019-06-261-15/+12
| | * | | | | | Rename get_users_whose_devices_changedErik Johnston2019-06-263-5/+5
| | * | | | | | Refactor get_user_ids_changed to pull less from DBErik Johnston2019-06-263-28/+57
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Fix JWT login (#5555)Andrew Morgan2020-02-142-1/+2
|\| | | | | |
| * | | | | | Fix JWT login (#5555)PauRE2019-06-272-1/+2
| |/ / / / /
* | | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2020-02-142-52/+90
|\| | | | |
| * | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-252-52/+90
* | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsAndrew Morgan2020-02-142-5/+41
|\| | | | |
| * | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-242-5/+41
| |\ \ \ \ \
| | * | | | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-242-5/+26
| | * | | | | Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
* | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsAndrew Morgan2020-02-1429-107/+87
|\| | | | | |
| * | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2429-107/+87
| |\| | | | |
| | * | | | | Don't load the generated config as the default.Richard van der Hoff2019-06-2429-94/+60
| | * | | | | Ensure that all config options have sensible defaultsRichard van der Hoff2019-06-244-13/+27
* | | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsAndrew Morgan2020-02-142-29/+52
|\| | | | | |
| * | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsRichard van der Hoff2019-06-242-29/+52
| |\ \ \ \ \ \
| | * | | | | | blackRichard van der Hoff2019-06-241-6/+2
| | * | | | | | Avoid raising exceptions in metricsRichard van der Hoff2019-06-241-8/+14
| | * | | | | | Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-24291-9106/+8018
| | |\ \ \ \ \ \
| | * | | | | | | Sanity-checking for metrics updatesRichard van der Hoff2019-06-191-7/+33
| | * | | | | | | Simplify PerformanceCounters.update interfaceRichard van der Hoff2019-06-191-11/+12
| | * | | | | | | Remove unused _get_event_countersRichard van der Hoff2019-06-191-7/+1
| * | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-243-15/+39
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-243-15/+39
* | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenAndrew Morgan2020-02-132-17/+19
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-242-17/+19
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Fix /messages on workers when no from param specified.Erik Johnston2019-06-242-17/+19
* | | | | | | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathAndrew Morgan2020-02-134-10/+52
|\| | | | | | | | |
| * | | | | | | | | Remove unused Config.config_dir_path attributeRichard van der Hoff2019-06-241-3/+0
| * | | | | | | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-243-7/+52
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Andrew Morgan2020-02-1330-63/+99
|\| | | | | | | |
| * | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2430-63/+99
* | | | | | | | | Factor acme bits out to a separate file (#5521)Andrew Morgan2020-02-132-53/+93
|\| | | | | | | |
| * | | | | | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-242-53/+93
| |/ / / / / / /
* | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalAndrew Morgan2020-02-131-6/+14
|\| | | | | | |
| * | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-241-6/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-191-6/+14
* | | | | | | | | Drop support for cpu_affinity (#5525)Andrew Morgan2020-02-134-51/+1
|\| | | | | | | |
| * | | | | | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-224-51/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Andrew Morgan2020-02-131-22/+28
|\| | | | | | |
| * | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-211-22/+28
* | | | | | | | Refactor Config parser and add some comments. (#5511)Andrew Morgan2020-02-131-14/+35
|\| | | | | | |
| * | | | | | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-211-14/+35
* | | | | | | | Improve logging when generating config files (#5510)Andrew Morgan2020-02-133-1/+7
|\| | | | | | |
| * | | | | | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-213-1/+7
* | | | | | | | Only import jinja2 when needed (#5514)Andrew Morgan2020-02-131-1/+2
|\| | | | | | |
| * | | | | | | Only import jinja2 when needed (#5514)Andrew Morgan2019-06-211-1/+2
* | | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Andrew Morgan2020-02-131-1/+1
|\| | | | | | |
| * | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Richard van der Hoff2019-06-211-1/+1
* | | | | | | | Fix logging error when a tampered event is detected. (#5500)Andrew Morgan2020-02-131-1/+0
|\| | | | | | |
| * | | | | | | Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-211-1/+0
* | | | | | | | Merge pull request #5513 from matrix-org/erikj/fix_messages_tokenAndrew Morgan2020-02-131-0/+2
|\| | | | | | |
| * | | | | | | Fix /messages on worker when no token suppliedErik Johnston2019-06-211-0/+2
* | | | | | | | Support pagination API in client_reader workerAndrew Morgan2020-02-131-0/+2
|\| | | | | | |
| * | | | | | | Support pagination API in client_reader workerErik Johnston2019-06-211-0/+2
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesErik Johnston2019-06-212-1/+36
| |\ \ \ \ \ \
* | | | | | | | Improve email notification logging (#5502)Andrew Morgan2020-02-131-1/+1
|\| | | | | | |
| * | | | | | | Improve email notification logging (#5502)Neil Johnson2019-06-201-1/+1
* | | | | | | | BlackAndrew Morgan2020-02-132-5/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | BlackErik Johnston2019-06-201-2/+2
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_...Erik Johnston2019-06-20292-9079/+7986
| |\| | | | | |
| * | | | | | | Add descriptions and remove redundant set(..)Erik Johnston2019-06-192-4/+7
* | | | | | | | Run Black. (#5482)Andrew Morgan2020-02-1317-62/+64
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Run Black. (#5482)Amber Brown2019-06-20291-9076/+7753
| * | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-191-9/+19
| |\ \ \ \ \ \ \
* | | | | | | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-11295-9336/+8020
* | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsAndrew Morgan2020-02-102-3/+6
|\| | | | | | | |
| * | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsErik Johnston2019-06-195-1/+124
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Run as background process and fix commentsErik Johnston2019-06-192-3/+6
| * | | | | | | | | Fix typo in deactivation background jobBrendan Abolivier2019-06-191-1/+1
* | | | | | | | | | Add some logging to 3pid invite sig verification (#5015)Andrew Morgan2020-02-101-8/+38
|\| | | | | | | | |
| * | | | | | | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-181-8/+38
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Fix loglineAndrew Morgan2020-02-101-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Fix loglineErik Johnston2019-06-181-1/+1
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi...Andrew Morgan2020-02-101-9/+19
|\| | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi...Erik Johnston2019-06-18171-2326/+11195
| |\| | | | | | |
| * | | | | | | | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
* | | | | | | | | Add experimental option to reduce extremities.Andrew Morgan2020-02-105-1/+121
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Add experimental option to reduce extremities.Erik Johnston2019-06-185-1/+121
* | | | | | | | | Only count non-cache state resolutionAndrew Morgan2020-02-101-3/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Only count non-cache state resolutionErik Johnston2019-06-181-3/+3
* | | | | | | | | Use consistent bucketsAndrew Morgan2020-02-102-1/+33
|\| | | | | | | |
| * | | | | | | | Use consistent bucketsErik Johnston2019-06-181-1/+1
| * | | | | | | | Add metric fo number of state groups in resolutionErik Johnston2019-06-171-0/+10
| * | | | | | | | Add metrics for len of new extremities persisted.Erik Johnston2019-06-171-1/+23
| |/ / / / / / /
* | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidAndrew Morgan2020-02-101-0/+9
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-172-1/+42
| |\ \ \ \ \ \ \
| | * | | | | | | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| | * | | | | | | Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-172-1/+41
| * | | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_developErik Johnston2019-06-172-4/+48
| |\| | | | | | |
| | * | | | | | | Add third party rules hook into create roomErik Johnston2019-06-172-4/+48
| | |/ / / / / /
* | | | | | | | Remove Postgres 9.4 support (#5448)Andrew Morgan2020-02-102-24/+6
|\| | | | | | |
| * | | | | | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-182-24/+6
| |/ / / / / /
* | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsAndrew Morgan2020-02-104-19/+28
|\| | | | | |
| * | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-174-19/+28
| |\ \ \ \ \ \
| | * | | | | | Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| | * | | | | | Handle HttpResponseException when using federation client.Erik Johnston2019-06-073-18/+19
* | | | | | | | Merge commit 'dd927b29e' into dinsic-release-v1.1.0Andrew Morgan2020-02-103-7/+53
|\| | | | | | |
| * | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-173-7/+53
| |\ \ \ \ \ \ \
| | * | | | | | | Add testErik Johnston2019-06-072-7/+42
| | * | | | | | | Fix email notifications for large unnamed rooms.Erik Johnston2019-06-071-0/+11
| | |/ / / / / /
* | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterAndrew Morgan2020-02-101-3/+4
|\| | | | | | |
| * | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterErik Johnston2019-06-171-3/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
| * | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-171-6/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-146-4/+191
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveAndrew Morgan2020-02-102-2/+2
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-142-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Prometheus histograms are cumalativeErik Johnston2019-06-142-2/+2
| * | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-141-2/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix background job for deactivated flagBrendan Abolivier2019-06-141-2/+4
| * | | | | | | | | | | | Merge pull request #5462 from matrix-org/babolivier/account_validity_deactiva...Brendan Abolivier2019-06-144-2/+25
| |\| | | | | | | | | | |
* | | | | | | | | | | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-1033-130/+989
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-241-1/+1
| * | | | | | | | | | | | | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-223-1/+33
| * | | | | | | | | | | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-123-2/+79
| * | | | | | | | | | | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-052-2/+15
| * | | | | | | | | | | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-16/+58
| * | | | | | | | | | | | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-292-7/+15
| * | | | | | | | | | | | | Hide expired users from user directory, optionally show on renewal (#13)Andrew Morgan2019-11-142-0/+55
| * | | | | | | | | | | | | Add a /user/:user_id/info servlet to give user deactivated/expired informatio...Andrew Morgan2019-11-142-6/+92
| * | | | | | | | | | | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-122-8/+17
| * | | | | | | | | | | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-061-6/+9
| * | | | | | | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0110-9/+430
| * | | | | | | | | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| * | | | | | | | | | | | | LintBrendan Abolivier2019-10-041-3/+1
| * | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| * | | | | | | | | | | | | Add test caseBrendan Abolivier2019-10-041-1/+1
| * | | | | | | | | | | | | LintBrendan Abolivier2019-10-041-1/+3
| * | | | | | | | | | | | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-041-2/+13
| * | | | | | | | | | | | | Merge pull request #7 from matrix-org/babolivier/deactivation-inviteBrendan Abolivier2019-09-271-0/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | s/return/defer.returnValue/Brendan Abolivier2019-09-271-1/+1
| | * | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| | * | | | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| | * | | | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-0/+4
| | * | | | | | | | | | | | | LintBrendan Abolivier2019-09-271-1/+34
| * | | | | | | | | | | | | | Allow membership events which membership isn't join or invite in restricted r...Brendan Abolivier2019-09-261-1/+9
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Consider every room as having no retention policy if the feature is disabledBrendan Abolivier2019-09-241-0/+8
| * | | | | | | | | | | | | Move get_retention_policy_for_room to RoomWorkerStoreBrendan Abolivier2019-09-241-55/+55
| * | | | | | | | | | | | | Remove unnecessary cast to listBrendan Abolivier2019-09-201-1/+1
| * | | | | | | | | | | | | LintBrendan Abolivier2019-09-191-1/+2
| * | | | | | | | | | | | | Use six.moves.filter when filtering out from MXIDBrendan Abolivier2019-09-191-1/+3
| * | | | | | | | | | | | | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-101-9/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Process revocations in _on_membership_or_invite_directBrendan Abolivier2019-09-091-18/+11
| | * | | | | | | | | | | | | TypoBrendan Abolivier2019-09-061-1/+1
| | * | | | | | | | | | | | | Only filter on 3PID invite tokensBrendan Abolivier2019-09-061-6/+6
| | * | | | | | | | | | | | | Merge branch 'dinsic' into babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-061-0/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Don't process revoked/redacted events as part of the room's membership infoBrendan Abolivier2019-09-061-2/+2
| | * | | | | | | | | | | | | | Don't treat 3PID revokation as a new 3PID inviteBrendan Abolivier2019-09-061-7/+19
| * | | | | | | | | | | | | | | Rename io.open import to limite side-effectsBrendan Abolivier2019-09-091-2/+2
| * | | | | | | | | | | | | | | LintBrendan Abolivier2019-09-091-1/+1
| * | | | | | | | | | | | | | | Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_...Brendan Abolivier2019-09-092-4/+2
| * | | | | | | | | | | | | | | Read all files as UTF-8Brendan Abolivier2019-09-091-1/+2
| * | | | | | | | | | | | | | | Revert "Ensure the password reset template is correctly converted to binary"Brendan Abolivier2019-09-091-2/+1
| * | | | | | | | | | | | | | | Ensure the password reset template is correctly converted to binaryBrendan Abolivier2019-09-091-1/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | LintBrendan Abolivier2019-09-051-2/+0
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-02-10 17:46:45 +0000