14472 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Richard van der Hoff	3bcb13edd0	Address review comments	2019-07-01 12:13:22 +01:00
Richard van der Hoff	79b9d9076d	rename BaseSSORedirectServlet for consistency	2019-06-27 00:46:57 +01:00
Richard van der Hoff	dde4118341	update sample config	2019-06-27 00:41:04 +01:00
Richard van der Hoff	28db0ae537	cleanups	2019-06-27 00:37:41 +01:00
Richard van der Hoff	a0acfcc73e	update sample config	2019-06-26 23:56:28 +01:00
Richard van der Hoff	36f4953dec	Add support for tracking SAML2 sessions. ... This allows us to correctly handle `allow_unsolicited: False`.	2019-06-26 23:50:55 +01:00
Richard van der Hoff	3705322103	Move all the saml stuff out to a centralised handler	2019-06-26 22:52:02 +01:00
Richard van der Hoff	0ade403f55	Revert redundant changes to static js	2019-06-26 22:46:23 +01:00
Richard van der Hoff	a4daa899ec	Merge branch 'develop' into rav/saml2_client	2019-06-26 22:34:41 +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
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
Richard van der Hoff	7c2f8881a9	Ensure that all config options have sensible defaults ... This will enable us to skip the unintuitive behaviour where the generated config and default config are the same thing.	2019-06-24 14:14:52 +01:00
Richard van der Hoff	cf7aef1114	Merge pull request #5516 from matrix-org/rav/acme_key_path ... Allow configuration of the path used for ACME account keys.	2019-06-24 14:14:20 +01:00
Richard van der Hoff	5d9c101551	changelog	2019-06-24 13:51:22 +01:00
Richard van der Hoff	367a8263b3	Remove unused Config.config_dir_path attribute ... This is no longer used and only serves to confuse.	2019-06-24 13:51:22 +01:00
Richard van der Hoff	edea4bb5be	Allow configuration of the path used for ACME account keys. ... Because sticking it in the same place as the config isn't necessarily the right thing to do.	2019-06-24 13:51:22 +01:00
Richard van der Hoff	c3c6b00d95	Pass config_dir_path and data_dir_path into Config.read_config. (#5522) ... * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config	2019-06-24 11:34:45 +01:00
Richard van der Hoff	21bf4318b5	Factor acme bits out to a separate file (#5521) ... This makes some of the conditional-import hoop-jumping easier.	2019-06-24 11:33:56 +01:00
Richard van der Hoff	1793de6c6d	black	2019-06-24 11:16:13 +01:00
Erik Johnston	14aff5cc0d	Newsfile	2019-06-24 10:22:34 +01:00
Erik Johnston	dddf20e8e1	Fix /messages on workers when no from param specified. ... If no `from` param is specified we calculate and use the "current token" that inlcuded typing, presence, etc. These are unused during pagination and are not available on workers, so we simply don't calculate them.	2019-06-24 10:06:51 +01:00
Richard van der Hoff	dc94773e60	Avoid raising exceptions in metrics ... Sentry will catch the errors if they happen, so that should be good enough, and woun't make things explode if we hit the error condition.	2019-06-24 10:01:16 +01:00
Richard van der Hoff	5097aee740	Merge branch 'develop' into rav/cleanup_metrics	2019-06-24 10:00:13 +01:00
Richard van der Hoff	c753c098dd	Merge pull request #5498 from matrix-org/rav/fix_clock_reversal ... Use monotonic clock where possible for metrics	2019-06-24 09:55:12 +01:00
Richard van der Hoff	6cda36777b	Drop support for cpu_affinity (#5525) ... This has no useful purpose on python3, and is generally a source of confusion.	2019-06-22 11:01:55 +10:00
Richard van der Hoff	e1a795758c	Improve help and cmdline option names for --generate-config options (#5512) ... * group the arguments together into a group * add new names "--generate-missing-config" and "--config-directory" for existing cmdline options "--generate-keys" and "--keys-dir", which better reflect their purposes.	2019-06-21 18:50:43 +01:00
Richard van der Hoff	03cea2b0fe	Refactor Config parser and add some comments. (#5511) ... Add some comments, and simplify `read_config_files`.	2019-06-21 17:43:38 +01:00