summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Fix errors github/travis/fake-soft-logout travis/fake-soft-logoutTravis Ralston2019-07-032-5/+6
* Don't cache access tokensTravis Ralston2019-07-031-1/+0
* TrueTravis Ralston2019-07-031-1/+1
* Cheap way of soft logout (untested)Travis Ralston2019-07-034-5/+30
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0498-233/+249
* Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-033-31/+44
* 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-036-5/+18
* Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-035-6/+35
* Remove SMTP_* env var functionality from docker conf (#5596)Andrew Morgan2019-07-032-19/+1
* Fix media repo breaking (#5593)Amber Brown2019-07-026-24/+58
* tweak changelog v1.1.0rc1Richard van der Hoff2019-07-021-10/+13
* Merge remote-tracking branch 'origin/master' into release-v1.1.0Richard van der Hoff2019-07-023-5/+7
|\
| * Merge pull request #5552 from matrix-org/rav/github_templatesRichard van der Hoff2019-06-263-5/+7
| |\
| | * changelogRichard van der Hoff2019-06-251-0/+1
| | * Update github templatesRichard van der Hoff2019-06-251-2/+3
| | * Update SUPPORT.mdRichard van der Hoff2019-06-251-3/+3
* | | prepare v1.1.0rc1Richard van der Hoff2019-07-0291-94/+106
* | | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-027-45/+231
|\ \ \
| * \ \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0155-450/+832
| |\ \ \
| * | | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| * | | | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| * | | | update sample configRichard van der Hoff2019-06-271-6/+13
| * | | | cleanupsRichard van der Hoff2019-06-273-11/+18
| * | | | update sample configRichard van der Hoff2019-06-261-0/+13
| * | | | 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-26478-11486/+18913
| |\ \ \ \
| * | | | | changelogRichard van der Hoff2019-06-111-0/+1
| * | | | | Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-116-2/+14
| |\ \ \ \ \
| * | | | | | 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-10157-1096/+5758
| |\ \ \ \ \ \
| * | | | | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-025-2/+55
* | | | | | | | Merge pull request #5587 from matrix-org/erikj/fix_synctlErik Johnston2019-07-022-6/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2019-07-021-0/+1
| * | | | | | | | Fix --no-daemonize flag for synctlErik Johnston2019-07-021-6/+6
* | | | | | | | | Add ability to set timezone for Docker container (#5383)Amir Zarrinkafsh2019-07-023-1/+3
* | | | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-022-6/+4
|/ / / / / / / /
* | | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-012-1/+4
* | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-012-2/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fixup commentErik Johnston2019-07-011-6/+13
| * | | | | | | NewsfileErik Johnston2019-06-211-0/+1
| * | | | | | | Fix sync tightloop bug.Erik Johnston2019-06-211-2/+12
* | | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-2912-174/+162
* | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-282-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| * | | | | | | | ChangelogBrendan Abolivier2019-06-281-0/+1
| * | | | | | | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
* | | | | | | | | Don't log GC 0s at INFO (#5557)Amber Brown2019-06-282-1/+5
* | | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-287-9/+190
* | | | | | | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-275-1/+18
* | | | | | | | | Include systemd-python in Debian package to allow logging to journal (#5261)Silke Hofstra2019-06-272-1/+8
* | | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-273-2/+19
* | | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesErik Johnston2019-06-274-37/+98
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Review commentsErik Johnston2019-06-272-7/+5
| * | | | | | | | Move changelogErik Johnston2019-06-261-0/+0
| * | | | | | | | 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
| * | | | | | | | NewsfileErik Johnston2019-06-261-0/+1
| * | | | | | | | Refactor get_user_ids_changed to pull less from DBErik Johnston2019-06-263-28/+57
* | | | | | | | | Docker image: Add a migrate_config mode (#5567)Richard van der Hoff2019-06-274-17/+58
* | | | | | | | | Docker image: open the non-TLS port by default. (#5568)Richard van der Hoff2019-06-272-0/+2
* | | | | | | | | Deprecate the env var way of running the docker image (#5566)Richard van der Hoff2019-06-274-154/+99
* | | | | | | | | Fix JWT login (#5555)PauRE2019-06-273-1/+3
* | | | | | | | | Merge pull request #5565 from matrix-org/rav/docker/fix_log_configRichard van der Hoff2019-06-273-1/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| * | | | | | | | | Docker: generate our own log configRichard van der Hoff2019-06-261-1/+8
| * | | | | | | | | Add support for SYNAPSE_CONFIG_DIRRichard van der Hoff2019-06-262-0/+5
* | | | | | | | | | Reduce the amount of stuff we send in the docker context (#5564)Richard van der Hoff2019-06-272-9/+14
* | | | | | | | | | Merge pull request #5563 from matrix-org/rav/docker/data_dirRichard van der Hoff2019-06-273-4/+25
|\| | | | | | | | |
| * | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| * | | | | | | | | Docker image: add support for SYNAPSE_DATA_DIR parameterRichard van der Hoff2019-06-262-4/+17
| * | | | | | | | | document supported env vars for docker 'generate' optionRichard van der Hoff2019-06-261-0/+7
* | | | | | | | | | Merge pull request #5562 from matrix-org/rav/docker/no-generate-keysRichard van der Hoff2019-06-272-8/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| * | | | | | | | | | Docker: only run --generate-keys when generating config on-the-fly.Richard van der Hoff2019-06-261-7/+21
| * | | | | | | | | | improve logging for generate_config_from_templateRichard van der Hoff2019-06-261-1/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5561 from matrix-org/rav/docker/refactorRichard van der Hoff2019-06-272-62/+118
|\| | | | | | | | |
| * | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| * | | | | | | | | isortRichard van der Hoff2019-06-251-4/+5
| * | | | | | | | | Add a main() functionRichard van der Hoff2019-06-251-8/+11
| * | | | | | | | | Factor out a run_generate_config functionRichard van der Hoff2019-06-251-17/+28
| * | | | | | | | | Factor out "generate_config_from_template"Richard van der Hoff2019-06-251-41/+81
* | | | | | | | | | Merge pull request #5570 from almereyda/patch-2Richard van der Hoff2019-06-272-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix changelogRichard van der Hoff2019-06-271-1/+1
| * | | | | | | | | | Create 5570.miscjon r2019-06-271-0/+1
| * | | | | | | | | | Update purge_api READMEjon r2019-06-271-2/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5313 from twrist/patch-1Richard van der Hoff2019-06-272-2/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Create 5313.miscIke Johnson2019-06-021-0/+1
| * | | | | | | | | Update HAProxy example rulesIke Johnson2019-06-021-2/+4
* | | | | | | | | | Improve docs on choosing server_name (#5558)Richard van der Hoff2019-06-262-13/+19
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Remove & changelog (#5548)Amber Brown2019-06-262-54/+1
* | | | | | | | | Merge branch 'master' into developAndrew Morgan2019-06-253-2/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'release-v1.0.0'Andrew Morgan2019-06-252-1/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Update changelog to better expain password reset change (#5545) github/release-v1.0.0 release-v1.0.0Andrew Morgan2019-06-242-1/+6
| * | | | | | | | Fix broken link in MSC1711 FAQRichard van der Hoff2019-06-251-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-253-52/+91
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developRichard van der Hoff2019-06-255-8/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Increase default log level for docker image to INFO. (#5547)Richard van der Hoff2019-06-252-5/+3
| * | | | | | | | Update docker image to use Python 3.7. (#5546)Richard van der Hoff2019-06-253-3/+4
* | | | | | | | | Grafana dashboard updatesRichard van der Hoff2019-06-251-1/+6814
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add extremities graphs to grafana dashboardRichard van der Hoff2019-06-251-23/+832
| * | | | | | | | format json for grafana dashboardRichard van der Hoff2019-06-251-1/+6005
|/ / / / / / / /
* | | | | | | | Add info about black to code_style.rst (#5537)Andrew Morgan2019-06-242-45/+43
* | | | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-244-6/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | changelogRichard van der Hoff2019-06-241-0/+1
| * | | | | | | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-243-6/+27
| * | | | | | | | Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
* | | | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2430-107/+88
|\| | | | | | | |
| * | | | | | | | changelogRichard van der Hoff2019-06-241-0/+1
| * | | | | | | | 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_metricsRichard van der Hoff2019-06-243-29/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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-24397-10437/+9513
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelogRichard van der Hoff2019-06-191-0/+1
| * | | | | | | | | | 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-246-20/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-246-20/+49
* | | | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-243-17/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | NewsfileErik Johnston2019-06-241-0/+1
| * | | | | | | | | | | 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_pathRichard van der Hoff2019-06-2410-12/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | changelogRichard van der Hoff2019-06-245-2/+3
| * | | | | | | | | | | 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-244-7/+59
|/ / / / / / / / / / /
* | | | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2435-67/+104
* | | | | | | | | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-243-53/+94
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-242-6/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-192-6/+15
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-226-74/+2
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-212-22/+29
* | | | | | | | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-212-14/+36
* | | | | | | | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-214-1/+8
* | | | | | | | | Only import jinja2 when needed (#5514)Andrew Morgan2019-06-212-1/+3
* | | | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Richard van der Hoff2019-06-212-1/+2
* | | | | | | | | Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-212-1/+1
* | | | | | | | | Merge pull request #5513 from matrix-org/erikj/fix_messages_tokenErik Johnston2019-06-212-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-06-211-0/+1
| * | | | | | | | | Fix /messages on worker when no token suppliedErik Johnston2019-06-211-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5505 from matrix-org/erikj/messages_workerErik Johnston2019-06-213-0/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Update docs/workers.rst Erik Johnston2019-06-211-1/+1
| * | | | | | | | NewsfileErik Johnston2019-06-211-0/+1
| * | | | | | | | Support pagination API in client_reader workerErik Johnston2019-06-212-0/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesErik Johnston2019-06-213-1/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | BlackErik Johnston2019-06-201-2/+2
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_...Erik Johnston2019-06-20400-10564/+9688
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add descriptions and remove redundant set(..)Erik Johnston2019-06-192-4/+7
| * | | | | | | | | Only count non-cache state resolutionErik Johnston2019-06-181-3/+3
| * | | | | | | | | Use consistent bucketsErik Johnston2019-06-181-1/+1
| * | | | | | | | | NewsfileErik Johnston2019-06-171-0/+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
* | | | | | | | | | Improve email notification logging (#5502)Neil Johnson2019-06-202-1/+2
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Run Black. (#5482)Amber Brown2019-06-20376-10399/+9153
* | | | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-192-9/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix loglineErik Johnston2019-06-181-1/+1
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi...Erik Johnston2019-06-18387-9715/+17324
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | NewsfileErik Johnston2019-04-101-0/+1
| * | | | | | | | | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
* | | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsErik Johnston2019-06-197-1/+166
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Run as background process and fix commentsErik Johnston2019-06-193-4/+7
| * | | | | | | | | | NewsfileErik Johnston2019-06-181-0/+1
| * | | | | | | | | | Add experimental option to reduce extremities.Erik Johnston2019-06-186-1/+162
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_dockerRichard van der Hoff2019-06-192-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelogRichard van der Hoff2019-06-181-0/+1
| * | | | | | | | | | Include xmlsec in the docker imageRichard van der Hoff2019-06-181-1/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typoBrendan Abolivier2019-06-192-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typo in deactivation background jobBrendan Abolivier2019-06-192-1/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4276 from Ralith/performance-adviceRichard van der Hoff2019-06-183-7/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | README.rst: fix header levelRichard van der Hoff2019-06-181-1/+1
| * | | | | | | | | | Improve advice regarding poor performanceBenjamin Saunders2019-06-093-7/+29
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-182-8/+39
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Fix seven contrib files with Python syntax errors (#5446)cclauss2019-06-187-119/+131
* | | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-173-1/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| * | | | | | | | | ChangelogBrendan 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-173-4/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | NewsfileErik Johnston2019-06-171-0/+1
| |/ / / / / / / / /
| * | / / / / / / / Add third party rules hook into create roomErik Johnston2019-06-172-4/+48
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5478 from matrix-org/joriks/demo_python3Jorik Schellekens2019-06-173-4/+71
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ChangelogJorik Schellekens2019-06-171-0/+1
| * | | | | | | | | One shot demo server startupJorik Schellekens2019-06-172-4/+70
* | | | | | | | | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-1810-79/+50
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-175-19/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| * | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| * | | | | | | | | Handle HttpResponseException when using federation client.Erik Johnston2019-06-073-18/+19
* | | | | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-175-30/+124
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| * | | | | | | | | | Add testErik Johnston2019-06-073-8/+70
| * | | | | | | | | | Refactor email testsErik Johnston2019-06-071-22/+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_masterErik Johnston2019-06-172-3/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| * | | | | | | | | | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
* | | | | | | | | | | Move SyTest to Buildkite (#5459)Amber Brown2019-06-176-76/+247
* | | | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-173-7/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | NewsfileErik Johnston2019-06-141-0/+1
| * | | | | | | | | | | Fix 3PID invite room state over federation.Erik Johnston2019-06-141-6/+0
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Change to absolute path for contrib/dockerNeil Johnson2019-06-131-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-149-4/+284
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-149-4/+284
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-144-12/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | NewsfileErik Johnston2019-06-141-0/+1
| * | | | | | | | | | Prometheus histograms are cumalativeErik Johnston2019-06-143-12/+12
* | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-142-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix changelogBrendan Abolivier2019-06-142-1/+2
| * | | | | | | | | | ChangelogBrendan Abolivier2019-06-141-0/+1
| * | | | | | | | | | 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-146-27/+68
|\| | | | | | | | | |
| * | | | | | | | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-146-27/+68
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5460 from matrix-org/joriks/demo_python3Jorik Schellekens2019-06-142-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ChangelogJorik Schellekens2019-06-141-0/+1
| * | | | | | | | | | Use python3 in the demoJorik Schellekens2019-06-141-2/+2
* | | | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-143-6/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| * | | | | | | | | | Don't log exception when failing to fetch remote content.Erik Johnston2019-06-072-6/+13
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-145-0/+183
* | | | | | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheusErik Johnston2019-06-143-39/+25
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | changelogAmber H. Brown2019-06-141-0/+1
| * | | | | | | | | fix prometheus rendering errorAmber H. Brown2019-06-142-39/+24
|/ / / / / / / / /
* | | | | | | | | Updates to the federation_client script (#5447)Richard van der Hoff2019-06-132-5/+39
* | | | | | | | | Clean up code for sending federation EDUs. (#5381)Richard van der Hoff2019-06-132-14/+27
* | | | | | | | | Expose statistics on extrems to prometheus (#5384)Amber Brown2019-06-137-114/+331
* | | | | | | | | Remove Python 2.7 support. (#5425)Amber Brown2019-06-129-170/+25
* | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-1118-50/+394
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 1.0.0 v1.0.0Erik Johnston2019-06-116-4/+28
| * | | | | | | | Merge pull request #5424 from matrix-org/erikj/change_password_reset_linksErik Johnston2019-06-1112-32/+262
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bump bleach version so that tests can run on old deps.Erik Johnston2019-06-115-25/+1
| | * | | | | | | | NewsfileErik Johnston2019-06-111-0/+1
| | * | | | | | | | Change password reset links to /_matrix.Erik Johnston2019-06-116-7/+260
| | | |/ / / / / / | | |/| | | | | |
| * / | | | | | | Neilj/improve federation docs (#5419)Neil Johnson2019-06-114-16/+106
| |/ / / / / / /
* | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-116-2/+14
|\| | | | | | |
| * | | | | | | 1.0.0rc3 v1.0.0rc3Erik Johnston2019-06-112-1/+7
| * | | | | | | Fix defaults on checking threepidsErik Johnston2019-06-102-1/+2
| * | | | | | | Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zeroErik Johnston2019-06-102-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Update changelog.d/5418.bugfixErik Johnston2019-06-101-1/+1
| | * | | | | | | NewsfileErik Johnston2019-06-101-0/+1
| | * | | | | | | Fix bug sending federation transactions with lots of EDUsErik Johnston2019-06-101-0/+4
* | | | | | | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-113-10/+21
* | | | | | | | | add monthly active users to phonehome stats (#5252)Neil Johnson2019-06-103-15/+31
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-1014-195/+489
|\| | | | | | |
| * | | | | | | 1.0.0rc2 v1.0.0rc2Erik Johnston2019-06-105-4/+12
| * | | | | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_contextErik Johnston2019-06-1010-182/+455
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-21 08:12:37 +0000