12785 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Richard van der Hoff	d9aaf26539	Fix circleci config for synapse:latest docker upload ... Give the image the right tag, so that we can push it.	2018-12-21 00:22:31 +00:00
Richard van der Hoff	c8d32caba3	Merge branch 'master' into develop	2018-12-20 23:33:25 +00:00
Richard van der Hoff	ad1c68ad94	Mention updating extensions	2018-12-20 23:32:59 +00:00
Richard van der Hoff	fc9cdbabe7	Merge branch 'master' into develop	2018-12-20 22:08:51 +00:00
Richard van der Hoff	a7aca672df	clarify that installing -py3 removes the old pkg	2018-12-20 22:05:27 +00:00
Richard van der Hoff	5dd9a381c5	Merge branch 'master' into develop	2018-12-20 16:56:48 +00:00
Richard van der Hoff	0b26feb422	Merge branch 'master' into develop	2018-12-20 16:48:47 +00:00
Richard van der Hoff	bdc44b99a2	buster is a thing	2018-12-20 16:11:21 +00:00
Richard van der Hoff	d731b75c7b	Clarify that py2 packages will continue to exist	2018-12-20 14:55:41 +00:00
Richard van der Hoff	dfeb274484	document supported python 3 versions	2018-12-20 13:57:48 +00:00
Richard van der Hoff	0e8acf3b02	more changelog fix	2018-12-20 12:18:03 +00:00
Richard van der Hoff	a92d55d8a7	minor changelog tweaks	2018-12-20 12:16:04 +00:00
Richard van der Hoff	8e4d9122b0	fix UPGRADE formatting	2018-12-20 12:09:16 +00:00
Richard van der Hoff	6dd7271243	Prepare 0.34 release	2018-12-20 12:07:15 +00:00
Richard van der Hoff	8957a11979	Update log config for debian packages ... Better follow our own release notes.	2018-12-20 12:06:31 +00:00
Richard van der Hoff	d3c9c562c6	Debian packaging via dh_virtualenv	2018-12-20 11:35:23 +00:00
Richard van der Hoff	1a6d5bfa08	Debian packaging via dh_virtualenv (#4285)	2018-12-20 11:33:29 +00:00
Amber Brown	fd4070a85d	import from package-debian-synapse	2018-12-20 11:15:52 +00:00
David Baker	1c0051114a	Add 'sandbox' to CSP for media repo (#4284) ... * Add 'sandbox' to the CSP for media repo * Changelog	2018-12-20 11:09:18 +00:00
Richard van der Hoff	3b2ba2fbb8	Merge pull request #4309 from KB1RD/KB1RD-fixes ... Fix the variable names used for account_data	2018-12-19 22:52:59 +01:00
Nathan Pennie	da8628ba2c	Create 4309.bugfix	2018-12-19 14:42:49 -05:00
Nathan Pennie	81b513416e	Fixed line length	2018-12-19 14:12:33 -05:00
Nathan Pennie	668e6625b0	Fix the variable names used for account_data	2018-12-19 06:53:02 -05:00
Neil Johnson	7e22cd90f5	ensure can report mau stats when hs.config.mau_stats_only is set (#4305) ... * ensure can report mau stats when hs.config.mau_stats_only is set	2018-12-18 14:36:11 +00:00
Neil Johnson	d2f7c4e6b1	create support user (#4141) ... Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits.	2018-12-14 18:20:59 +00:00
Nad Chishtie	128294d3e5	Improved welcome page (#4294) ... * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.	2018-12-14 05:13:56 +11:00
Amber Brown	c7144b105c	Settings Fix deleting e2e room keys on xenial (#4295)	2018-12-14 05:13:33 +11:00
Amber Brown	e93a0ebf50	Settings Fix deleting e2e room keys on xenial (#4295)	2018-12-14 05:10:31 +11:00
Nad Chishtie	cef8ae272a	Improved welcome page (#4294) ... * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.	2018-12-14 02:42:51 +11:00
Richard van der Hoff	a83826ae99	Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_link ... Update link to kernel.org DCO usage	2018-12-11 20:55:43 +01:00
Michael Kaye	5986a10f16	Update CONTRIBUTING.rst ... Reduce size of hyperlink	2018-12-11 18:11:48 +00:00
Richard van der Hoff	f208f608cb	Merge branch 'release-v0.34.0' into develop	2018-12-11 15:43:20 +00:00
Richard van der Hoff	eb835bf65b	0.34.0rc2	2018-12-11 15:35:47 +00:00
Richard van der Hoff	03116da984	remove changelog files	2018-12-11 15:35:10 +00:00
Richard van der Hoff	188945713e	Merge pull request #4290 from matrix-org/rav/remove_webclient ... Stop installing Matrix Console by default	2018-12-11 16:24:15 +01:00
Richard van der Hoff	95c1f6500b	Merge pull request #4289 from matrix-org/rav/welcome_page ... Add a welcome page to the static resources	2018-12-11 16:24:06 +01:00
Richard van der Hoff	1e2b065112	Merge pull request #4291 from matrix-org/rav/disable_pager_in_ci ... Disable pager for ci script	2018-12-11 16:23:49 +01:00
Richard van der Hoff	bd52978fd7	Merge branch 'rav/disable_pager_in_ci' into rav/welcome_page	2018-12-11 14:13:02 +00:00
Richard van der Hoff	2755a0d48a	Disable pager for ci script ... ... otherwise it hangs	2018-12-11 14:12:22 +00:00
Richard van der Hoff	f537432ef9	Add a welcome page to the static resources ... This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601.	2018-12-11 13:26:22 +00:00
Richard van der Hoff	df96177ca7	Stop installing Matrix Console by default ... This is based on the work done by @krombel in #2601.	2018-12-11 13:20:33 +00:00
David Baker	89ac2a5bdb	Add 'sandbox' to CSP for media repo (#4284) ... * Add 'sandbox' to the CSP for media repo * Changelog	2018-12-11 04:05:02 +11:00
Will Hunt	989f1167af	Merge pull request #4279 from matrix-org/hs/fix-config-cors ... Make /config more CORS-y	2018-12-10 15:24:03 +00:00
Erik Johnston	9b1c19e0c5	Merge pull request #4283 from matrix-org/erikj/isort_df ... Make isort tox check print diff when it fails	2018-12-10 14:28:05 +00:00
Erik Johnston	74c3606c53	Newsfile	2018-12-10 14:15:43 +00:00
Erik Johnston	25219b7b4e	Make isort tox check print diff when it fails	2018-12-10 13:58:26 +00:00
Will Hunt	fee831c040	Move imports to one line	2018-12-10 13:52:33 +00:00
Will Hunt	466c1f3e01	Use send_cors	2018-12-10 13:11:37 +00:00
Will Hunt	91206e09f2	changelog & isort	2018-12-09 17:39:44 +00:00
Will Hunt	dbf736ba66	Make /config more CORS-y	2018-12-09 13:27:22 +00:00