14485 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
PauRE	856ea04eb3	Fix JWT login (#5555) ... * Fix JWT login with register Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Add pyjwt conditional dependency Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Added changelog file Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Improved changelog description Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>	2019-06-27 12:02:41 +01:00
Richard van der Hoff	b4db70e167	Merge pull request #5565 from matrix-org/rav/docker/fix_log_config ... Docker: generate our own log config	2019-06-27 11:19:37 +01:00
Richard van der Hoff	b2d2617c0d	Reduce the amount of stuff we send in the docker context (#5564) ... this makes docker builds a bit faster.	2019-06-27 11:18:51 +01:00
Richard van der Hoff	b1b8a24b63	Merge pull request #5563 from matrix-org/rav/docker/data_dir ... Docker image: add support for SYNAPSE_DATA_DIR parameter	2019-06-27 11:17:44 +01:00
Richard van der Hoff	53faa6a429	Merge pull request #5562 from matrix-org/rav/docker/no-generate-keys ... Docker: only run --generate-keys when generating config on-the-fly.	2019-06-27 11:17:21 +01:00
Richard van der Hoff	02aeb5a98a	Merge pull request #5561 from matrix-org/rav/docker/refactor ... Refactor the docker/start.py script	2019-06-27 11:16:37 +01:00
Richard van der Hoff	42a3619ef4	Merge pull request #5570 from almereyda/patch-2 ... Update purge_api README	2019-06-27 00:58:17 +01:00
Richard van der Hoff	a11475f396	fix changelog	2019-06-27 00:57:59 +01:00
Richard van der Hoff	47fa836abb	Merge pull request #5313 from twrist/patch-1 ... Update HAProxy example rules	2019-06-27 00:53:48 +01:00
jon r	536820e572	Create 5570.misc ... Signed-off-by: Jon Richter <jon@allmende.io>	2019-06-27 00:13:34 +02:00
jon r	db56383b24	Update purge_api README ... This points the reverse links at the intended location.	2019-06-27 00:08:18 +02:00
Richard van der Hoff	befa116b31	changelog	2019-06-26 15:52:00 +01:00
Richard van der Hoff	28e30c6581	Docker: generate our own log config ... When running under docker, we want to use docker's own logging stuff rather than losing the logs somewhere on the container's filesystem, so let's use log configs that spit logs out to stdout instead.	2019-06-26 15:48:38 +01:00
Richard van der Hoff	6347dc1bed	Add support for SYNAPSE_CONFIG_DIR	2019-06-26 15:48:38 +01:00
Richard van der Hoff	a0f2921ccf	changelog	2019-06-26 15:41:10 +01:00
Richard van der Hoff	7e433beb65	Docker image: add support for SYNAPSE_DATA_DIR parameter ... Fixes #4830.	2019-06-26 15:38:08 +01:00
Richard van der Hoff	c58a6e6108	document supported env vars for docker 'generate' option	2019-06-26 15:38:08 +01:00
Richard van der Hoff	7c453472e4	changelog	2019-06-26 15:32:55 +01:00
Richard van der Hoff	a5fba9c27c	Docker: only run --generate-keys when generating config on-the-fly. ... We don't want to generate any missing configs when running from a precanned config. (There's a strong argument that we don't want to do this at all, since generating a new signing key on each invocation sounds disasterous, but I don't fancy unpicking that for now.)	2019-06-26 15:31:19 +01:00
Richard van der Hoff	a1732bbff9	improve logging for generate_config_from_template	2019-06-26 15:31:19 +01:00
Richard van der Hoff	043ab6da13	changelog	2019-06-26 15:28:28 +01:00
Richard van der Hoff	2d91988799	Improve docs on choosing server_name (#5558) ... Fixes #4901	2019-06-26 15:15:04 +01:00
Amber Brown	0e97284dfa	Remove & changelog (#5548)	2019-06-26 04:36:34 +10:00
Andrew Morgan	3eb8c7b0eb	Merge branch 'master' into develop ... * master: Fix broken link in MSC1711 FAQ Update changelog to better expain password reset change (#5545)	2019-06-25 18:08:56 +01:00
Andrew Morgan	52a4a90d05	Merge branch 'release-v1.0.0' ... * release-v1.0.0: Update changelog to better expain password reset change (#5545)	2019-06-25 18:08:41 +01:00
Richard van der Hoff	5375c3a9b8	isort	2019-06-25 15:30:19 +01:00
Richard van der Hoff	3f24e4dce7	Add a main() function	2019-06-25 15:30:19 +01:00
Richard van der Hoff	b1fddb7f69	Factor out a run_generate_config function	2019-06-25 15:30:19 +01:00
Richard van der Hoff	a52e1a3b6c	Factor out "generate_config_from_template" ... ... and inline generate_secrets	2019-06-25 15:30:19 +01:00
Andrew Morgan	ef8c62758c	Prevent multiple upgrades on the same room at once (#5051) ... Closes #4583 Does slightly less than #5045, which prevented a room from being upgraded multiple times, one after another. This PR still allows that, but just prevents two from happening at the same time. Mostly just to mitigate the fact that servers are slow and it can take a moment for the room upgrade to actually complete. We don't want people sending another request to upgrade the room when really they just thought the first didn't go through.	2019-06-25 14:19:21 +01:00
Richard van der Hoff	c8cb186260	Fix broken link in MSC1711 FAQ	2019-06-25 12:27:56 +01:00
Richard van der Hoff	6fa36c22fa	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2019-06-25 12:21:32 +01:00
Richard van der Hoff	a47f012501	Grafana dashboard updates	2019-06-25 11:51:51 +01:00
Richard van der Hoff	abd334d27b	Add extremities graphs to grafana dashboard	2019-06-25 11:51:32 +01:00
Richard van der Hoff	dd1c722a39	format json for grafana dashboard	2019-06-25 08:59:19 +01:00
Richard van der Hoff	fe2d876e2a	Increase default log level for docker image to INFO. (#5547) ... Fixes #3370.	2019-06-25 14:38:38 +10:00
Richard van der Hoff	f817fc9ad5	Update docker image to use Python 3.7. (#5546) ... Python 3.7 is apparently faster than 3.6, and should be mature enough.	2019-06-25 14:20:53 +10:00
Andrew Morgan	78c00ad3ff	Update changelog to better expain password reset change (#5545) ... Updates the v1.0.0 changelog to provide more information to those upgrading to v1.0 on why they may receive errors or find their password reset abilities have now been disabled. Helps address #5444	2019-06-24 17:52:15 +01:00
Andrew Morgan	28604ab03d	Add info about black to code_style.rst (#5537) ... Fixes #5533 Adds information about how to install and run black on the codebase.	2019-06-24 17:48:05 +01:00
Richard van der Hoff	4ac7ef4b67	Merge pull request #5524 from matrix-org/rav/new_cmdline_options ... Add --data-dir and --open-private-ports options.	2019-06-24 17:25:57 +01:00
Richard van der Hoff	af8a962905	Merge pull request #5523 from matrix-org/rav/arg_defaults ... Stop conflating generated config and default config	2019-06-24 17:24:35 +01:00
Richard van der Hoff	e59a8cd2e5	Merge pull request #5499 from matrix-org/rav/cleanup_metrics ... Cleanups and sanity-checking in cpu and db metrics	2019-06-24 17:12:54 +01:00
Brendan Abolivier	deb4fe6ef3	Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms ... Split public rooms directory auth config in two	2019-06-24 16:08:02 +01:00
Brendan Abolivier	bfe84e051e	Split public rooms directory auth config in two	2019-06-24 15:42:31 +01:00
Erik Johnston	25433f212d	Merge pull request #5531 from matrix-org/erikj/workers_pagination_token ... Fix /messages on workers when no from param specified.	2019-06-24 15:30:10 +01:00
Richard van der Hoff	e6b2ccbb51	changelog	2019-06-24 14:15:34 +01:00
Richard van der Hoff	3f8a252dd8	Add "--open-private-ports" cmdline option ... This is helpful when generating a config file for running synapse under docker.	2019-06-24 14:15:34 +01:00
Richard van der Hoff	6a92b06cbb	Add --data-directory commandline argument ... We don't necessarily want to put the data in the cwd.	2019-06-24 14:15:34 +01:00
Richard van der Hoff	c783294549	changelog	2019-06-24 14:14:52 +01:00
Richard van der Hoff	16b52642e2	Don't load the generated config as the default. ... It's too confusing.	2019-06-24 14:14:52 +01:00