10941 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Richard van der Hoff	4a9cbdbc15	Exempt AS-registered users from doing gdpr	2018-05-29 19:54:32 +01:00
Amber Brown	235b53263a	Merge pull request #3299 from matrix-org/matthew/macos-fixes ... disable CPUMetrics if no /proc/self/stat	2018-05-29 11:45:45 +10:00
Matthew Hodgson	ff1bc0a279	pep8	2018-05-29 02:32:15 +01:00
Matthew Hodgson	adb6bac4d5	fix another dumb typo	2018-05-29 02:29:22 +01:00
Matthew Hodgson	0a240ad36e	disable CPUMetrics if no /proc/self/stat ... fixes build on macOS again	2018-05-29 02:23:30 +01:00
Matthew Hodgson	284e36ad04	fix dumb typo	2018-05-29 02:23:11 +01:00
Amber Brown	81717e8515	Merge pull request #3256 from matrix-org/3218-official-prom ... Switch to the Python Prometheus library	2018-05-28 23:30:09 +10:00
Amber Brown	57ad76fa4a	fix up tests	2018-05-28 19:51:53 +10:00
Amber Brown	3ef5cd74a6	update to more consistently use seconds in any metrics or logging	2018-05-28 19:39:27 +10:00
Amber Brown	5c40ce3777	invalid syntax :(	2018-05-28 19:16:09 +10:00
Amber Brown	357c74a50f	add comment about why unreg	2018-05-28 19:14:41 +10:00
Amber Brown	a2eb5db4a0	update metrics to be in seconds	2018-05-28 19:10:27 +10:00
Amber Brown	754826a830	Merge remote-tracking branch 'origin/develop' into 3218-official-prom	2018-05-28 18:57:23 +10:00
Richard van der Hoff	60f09b1e11	Merge pull request #3288 from matrix-org/rav/no_spam_guests ... Avoid sending consent notice to guest users	2018-05-25 11:44:45 +01:00
Richard van der Hoff	66bdae986f	Fix default for send_server_notice_to_guests ... bool("False") == True...	2018-05-25 11:42:05 +01:00
Richard van der Hoff	ba1b163590	Avoid sending consent notice to guest users ... we think it makes sense not to send the notices to guest users.	2018-05-25 11:36:43 +01:00
Richard van der Hoff	41921ac01b	Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room ... Let users leave the server notice room after joining	2018-05-25 11:15:45 +01:00
Richard van der Hoff	757ed27258	Let users leave the server notice room after joining ... They still can't reject invites, but we let them leave it.	2018-05-25 11:07:21 +01:00
Amber Brown	9c36c150e7	Merge pull request #3283 from NotAFile/py3-state ... py3-ize state.py	2018-05-24 14:23:33 -05:00
Amber Brown	cc1349c06a	Merge pull request #3279 from NotAFile/py3-more-iteritems ... more six iteritems	2018-05-24 14:23:13 -05:00
Amber Brown	5b788aba90	Merge pull request #3280 from NotAFile/py3-more-misc ... More Misc. py3 fixes	2018-05-24 14:22:59 -05:00
Adrian Tschira	0e61705661	py3-ize state.py	2018-05-24 20:59:00 +02:00
Adrian Tschira	17a70cf6e9	Misc. py3 fixes ... Signed-off-by: Adrian Tschira <nota@notafile.com>	2018-05-24 20:20:33 +02:00
Adrian Tschira	6c16a4ec1b	more iteritems	2018-05-24 20:19:06 +02:00
Amber Brown	7ea07c7305	Merge pull request #3278 from NotAFile/py3-storage-base ... Py3 storage/_base.py	2018-05-24 13:08:09 -05:00
Amber Brown	1f69693347	Merge pull request #3244 from NotAFile/py3-six-4 ... replace some iteritems with six	2018-05-24 13:04:07 -05:00
Amber Brown	c4fb15a06c	Merge pull request #3246 from NotAFile/py3-repr-string ... use repr, not str	2018-05-24 13:00:20 -05:00
Amber Brown	36501068d8	Merge pull request #3247 from NotAFile/py3-misc ... Misc Python3 fixes	2018-05-24 12:58:37 -05:00
Amber Brown	2aff6eab6d	Merge pull request #3245 from NotAFile/batch-iter ... Add batch_iter to utils	2018-05-24 12:54:12 -05:00
Adrian Tschira	095292304f	Py3 storage/_base.py ... Signed-off-by: Adrian Tschira <nota@notafile.com>	2018-05-24 18:24:12 +02:00
David Baker	ecc4b88bd1	Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir ... Remove users from user directory on deactivate	2018-05-24 16:12:12 +01:00
Erik Johnston	46345187cc	Merge pull request #3243 from NotAFile/py3-six-3 ... Replace some more comparisons with six	2018-05-24 16:08:57 +01:00
Neil Johnson	037c6db85d	Merge branch 'master' into develop	2018-05-24 16:03:44 +01:00
David Baker	7a1af504d7	Remove users from user directory on deactivate	2018-05-24 15:59:58 +01:00
Neil Johnson	14ca678674	Update CHANGES.rst	2018-05-24 15:54:02 +01:00
Neil Johnson	6f67163c63	Update CHANGES.rst	2018-05-24 15:04:41 +01:00
Neil Johnson	bdd2ed5acf	update for v0.30.0	2018-05-24 15:02:03 +01:00
Erik Johnston	f72d5a44d5	Merge pull request #3261 from matrix-org/erikj/pagination_fixes ... Fix federation backfill bugs	2018-05-24 14:52:03 +01:00
Erik Johnston	68399fc4de	Merge pull request #3267 from matrix-org/erikj/iter_filter ... Use iter* methods for _filter_events_for_server	2018-05-24 14:44:57 +01:00
Neil Johnson	91d95a1d8e	bump version	2018-05-24 14:05:07 +01:00
Richard van der Hoff	8c98281b8d	Merge branch 'release-v0.30.0' into develop	2018-05-24 10:33:12 +01:00
Richard van der Hoff	6abcb5d22d	Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url ... Allow overriding the server_notices user's avatar	2018-05-24 10:31:43 +01:00
Amber Brown	389dac2c15	pepeightttt	2018-05-23 13:08:59 -05:00
Amber Brown	472a5ec4e2	add back CPU metrics	2018-05-23 13:03:56 -05:00
Amber Brown	e987079037	fixes	2018-05-23 13:03:51 -05:00
Richard van der Hoff	9bf4b2bda3	Allow overriding the server_notices user's avatar ... probably should have done this in the first place, like @turt2live suggested.	2018-05-23 17:43:30 +01:00
Richard van der Hoff	23aa70cea8	Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri ... Use the localpart in the consent uri	2018-05-23 16:29:44 +01:00
Richard van der Hoff	043f05a078	Merge docs on consent bits from PR #3268 into release branch	2018-05-23 16:24:58 +01:00
Richard van der Hoff	96f07cebda	Merge pull request #3268 from matrix-org/rav/privacy_policy_docs ... Docs on consent bits	2018-05-23 16:23:05 +01:00
Richard van der Hoff	a0b3946fe2	Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri	2018-05-23 16:06:03 +01:00