11611 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Neil Johnson	d2f3ef98ac	Merge branch 'develop' into neilj/disable_hs	2018-08-08 15:55:47 +00:00
Neil Johnson	54685d294d	Ability to disable client/server Synapse via conf toggle	2018-08-08 15:38:54 +01:00
Neil Johnson	cc187debf3	Merge pull request #3662 from matrix-org/neilj/reserved_users ... Reserved users for MAU limits	2018-08-08 14:33:17 +00:00
Neil Johnson	2b5baebeba	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs	2018-08-08 13:47:07 +01:00
Neil Johnson	be59910b93	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_users	2018-08-08 13:45:21 +01:00
Neil Johnson	990fe9fc23	Merge pull request #3633 from matrix-org/neilj/mau_tracker ... API for monthly_active_users table	2018-08-08 12:44:15 +00:00
Neil Johnson	312ae74746	typos	2018-08-08 13:33:16 +01:00
Neil Johnson	d92675a486	Ability to whitelist specific threepids against monthly active user limiting	2018-08-08 12:06:42 +01:00
Neil Johnson	7f3d897e7a	mock config.max_mau_value	2018-08-08 11:46:23 +01:00
Neil Johnson	ef3589063a	prevent total number of reserved users being too large	2018-08-07 17:59:27 +01:00
Neil Johnson	e8eba2b4e3	implement reserved users for mau limits	2018-08-07 17:49:43 +01:00
Richard van der Hoff	e5d2c67844	Merge pull request #3658 from matrix-org/rav/fix_event_persisted_position_metrics ... Fix occasional glitches in the synapse_event_persisted_position metric	2018-08-07 14:48:08 +01:00
Richard van der Hoff	9b92720d88	fix event lag graph	2018-08-07 12:27:34 +01:00
Richard van der Hoff	865d07cd38	changelog	2018-08-07 10:02:01 +01:00
Richard van der Hoff	ca9bc1f4fe	Fix occasional glitches in the synapse_event_persisted_position metric ... Every so often this metric glitched to a negative number. I'm assuming it was due to backfilled events.	2018-08-07 10:00:03 +01:00
Neil Johnson	a74b25faaa	WIP building out mau reserved users	2018-08-06 23:25:25 +01:00
Neil Johnson	fbe255f9a4	add default mau_limits_reserved_threepids	2018-08-06 23:24:54 +01:00
Neil Johnson	7daa8a78c5	load mau limit threepids	2018-08-06 22:55:05 +01:00
Neil Johnson	89834d9a29	Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/disable_hs	2018-08-06 21:56:56 +01:00
Neil Johnson	e54794f5b6	Fix postgres compatibility bug	2018-08-06 21:55:54 +01:00
Neil Johnson	7bcf126b18	Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/disable_hs	2018-08-06 21:39:44 +01:00
Neil Johnson	1911c037cb	update comments to reflect new sig	2018-08-06 18:01:46 +01:00
Neil Johnson	33bd07d062	Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/disable_hs	2018-08-06 17:52:28 +01:00
Neil Johnson	16d78be315	make use of _simple_select_one_onecol, improved comments	2018-08-06 17:51:15 +01:00
Neil Johnson	42c6823827	disable HS from config	2018-08-04 22:07:04 +01:00
Neil Johnson	e40a510fbf	py3 fix	2018-08-03 23:19:13 +01:00
Neil Johnson	d08296f9f2	remove unused import	2018-08-03 23:00:16 +01:00
Neil Johnson	886be75ad1	bug fixes	2018-08-03 22:29:03 +01:00
Will Hunt	16d9701892	Return M_NOT_FOUND when a profile could not be found. (#3596)	2018-08-03 19:08:05 +01:00
Neil Johnson	e10830e976	wip commit - tests failing	2018-08-03 17:55:50 +01:00
Neil Johnson	5593ff6773	fix (lots of) py3 test failures	2018-08-03 14:59:17 +01:00
Neil Johnson	b2aab04d2c	fix py3 test failure	2018-08-03 14:12:56 +01:00
Neil Johnson	da90337d89	Add ability to limit number of monthly active users on the server	2018-08-03 14:05:20 +01:00
Neil Johnson	950807d93a	fix caching and tests	2018-08-03 13:49:53 +01:00
Michael Kaye	df7f9871c1	Merge pull request #3644 from matrix-org/michaelkaye/refactor_docker_locations_v2 ... Refactor Dockerfile location	2018-08-03 13:44:35 +01:00
Neil Johnson	897c51d274	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker	2018-08-03 13:40:47 +01:00
Michael Kaye	42960aa047	Update README.md ... Link to contrib/docker	2018-08-03 09:16:01 +01:00
Michael Kaye	c3f596180f	Update README.md ... Link to docker/README.md	2018-08-03 09:15:19 +01:00
Michael Kaye	637b11b9ed	Update README.rst ... Link to contrib/docker	2018-08-03 09:13:54 +01:00
Michael Kaye	feacd13932	Update README.rst ... wrap at 80ish	2018-08-03 09:10:41 +01:00
Neil Johnson	c0affa7b4f	update generate_monthly_active_users, and reap_monthly_active_users	2018-08-02 23:03:01 +01:00
Neil Johnson	5e2f7b8084	typo	2018-08-02 22:47:48 +01:00
Neil Johnson	4ecb4bdac9	wip attempt at caching	2018-08-02 22:41:05 +01:00
Amber Brown	8a86d7ea96	Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment ... Mention the word "newsfragment" in CONTRIBUTING.rst	2018-08-03 04:40:18 +10:00
Michael Kaye	70baa61e95	newsfragment	2018-08-02 18:58:43 +01:00
Michael Kaye	4c4a123bd0	Mention the word "newsfragment" in CONTRIBUTING.rst	2018-08-02 18:53:44 +01:00
Michael Kaye	489949879e	Add news entry	2018-08-02 18:49:50 +01:00
Michael Kaye	1758f4e1c7	Address SPAG issues	2018-08-02 18:21:34 +01:00
Michael Kaye	26a37f3d4d	Do not include docker files in python build	2018-08-02 18:21:34 +01:00
Michael Kaye	0d25724419	Refactor docker locations and README. ... This addresses #3224	2018-08-02 18:21:32 +01:00