Neil Johnson b586b8b986 Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus		2018-08-14 17:43:22 +01:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
1491.feature	towncrier changelog	2018-06-26 21:10:45 +02:00
3423.misc	Run tests under PostgreSQL (#3423)	2018-08-13 16:47:46 +10:00
3632.misc	Fixup wording and remove dead code	2018-08-09 09:56:10 +01:00
3633.feature	Add ability to limit number of monthly active users on the server	2018-08-03 14:05:20 +01:00
3647.misc	Test fixes for Python 3 (#3647)	2018-08-09 12:22:01 +10:00
3654.feature	changelog	2018-08-06 16:30:52 +01:00
3655.feature	Ability to disable client/server Synapse via conf toggle	2018-08-08 15:38:54 +01:00
3658.bugfix	changelog	2018-08-07 10:02:01 +01:00
3660.misc	Dockerised sytest (#3660)	2018-08-14 21:30:34 +10:00
3662.feature	Ability to whitelist specific threepids against monthly active user limiting	2018-08-08 12:06:42 +01:00
3664.feature	changelog	2018-08-07 22:14:35 +01:00
3669.misc	update docker base-image to alpine 3.8	2018-08-09 13:31:10 +02:00
3670.feature	Where server is disabled, block ability for locked out users to read new messages	2018-08-09 12:45:58 +01:00
3676.bugfix	changelog	2018-08-10 11:05:23 +01:00
3677.bugfix	Name changelog after PR, not bug	2018-08-13 18:54:01 +01:00
3678.misc	Rename async to async_helpers because async is a keyword on Python 3.7 (#3678)	2018-08-10 23:50:21 +10:00
3679.misc	changelog	2018-08-10 23:54:46 +10:00
3681.bugfix	Fixes test_reap_monthly_active_users so it passes under postgres	2018-08-11 22:50:09 +01:00
3684.misc	Implement a new test baseclass to cut down on boilerplate (#3684)	2018-08-14 20:53:43 +10:00
3687.feature	set admin email via config	2018-08-13 21:26:43 +01:00
3692.bugfix	Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users	2018-08-14 17:06:51 +01:00