Commit Graph

10954 Commits (c936a52a9eb18e302fbd5158da7188f674912530)
 

Author SHA1 Message Date
Amber Brown c936a52a9e
Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307) 7 years ago
Amber Brown 872cf43516
Merge pull request #3303 from NotAFile/py3-memoryview 7 years ago
Amber Brown debff7ae09
Merge pull request #3281 from NotAFile/py3-six-isinstance 7 years ago
Richard van der Hoff 34b85df7f5 Update some comments and docstrings in SyncHandler 7 years ago
Richard van der Hoff 711f61a31d
Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdpr 7 years ago
Richard van der Hoff a995fdae39 fix tests 7 years ago
Richard van der Hoff 4a9cbdbc15 Exempt AS-registered users from doing gdpr 7 years ago
Richard van der Hoff db2e4608ab
Merge pull request #3302 from krombel/py3_extend_tox_testing 7 years ago
Adrian Tschira 4b9d0cde97 add remaining memoryview changes 7 years ago
Adrian Tschira 7873cde526 pep8 7 years ago
Adrian Tschira 1afafb3497 use memoryview in py3 7 years ago
Krombel d6cd55532b extend tox testing for py3 to avoid regressions 7 years ago
Amber Brown 235b53263a
Merge pull request #3299 from matrix-org/matthew/macos-fixes 7 years ago
Matthew Hodgson ff1bc0a279 pep8 7 years ago
Matthew Hodgson adb6bac4d5 fix another dumb typo 7 years ago
Matthew Hodgson 0a240ad36e disable CPUMetrics if no /proc/self/stat 7 years ago
Matthew Hodgson 284e36ad04 fix dumb typo 7 years ago
Amber Brown 81717e8515
Merge pull request #3256 from matrix-org/3218-official-prom 7 years ago
Amber Brown 57ad76fa4a fix up tests 7 years ago
Amber Brown 3ef5cd74a6 update to more consistently use seconds in any metrics or logging 7 years ago
Amber Brown 5c40ce3777 invalid syntax :( 7 years ago
Amber Brown 357c74a50f add comment about why unreg 7 years ago
Amber Brown a2eb5db4a0 update metrics to be in seconds 7 years ago
Amber Brown 754826a830 Merge remote-tracking branch 'origin/develop' into 3218-official-prom 7 years ago
Richard van der Hoff 60f09b1e11
Merge pull request #3288 from matrix-org/rav/no_spam_guests 7 years ago
Richard van der Hoff 66bdae986f Fix default for send_server_notice_to_guests 7 years ago
Richard van der Hoff ba1b163590 Avoid sending consent notice to guest users 7 years ago
Richard van der Hoff 41921ac01b
Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room 7 years ago
Richard van der Hoff 757ed27258 Let users leave the server notice room after joining 7 years ago
Adrian Tschira 4ee4450d66 fix recursion error 7 years ago
Amber Brown 9c36c150e7
Merge pull request #3283 from NotAFile/py3-state 7 years ago
Amber Brown cc1349c06a
Merge pull request #3279 from NotAFile/py3-more-iteritems 7 years ago
Amber Brown 5b788aba90
Merge pull request #3280 from NotAFile/py3-more-misc 7 years ago
Adrian Tschira 0e61705661 py3-ize state.py 7 years ago
Adrian Tschira dd068ca979 remaining isintance fixes 7 years ago
Adrian Tschira 17a70cf6e9 Misc. py3 fixes 7 years ago
Adrian Tschira 6c16a4ec1b more iteritems 7 years ago
Amber Brown 7ea07c7305
Merge pull request #3278 from NotAFile/py3-storage-base 7 years ago
Amber Brown 1f69693347
Merge pull request #3244 from NotAFile/py3-six-4 7 years ago
Amber Brown c4fb15a06c
Merge pull request #3246 from NotAFile/py3-repr-string 7 years ago
Amber Brown 36501068d8
Merge pull request #3247 from NotAFile/py3-misc 7 years ago
Amber Brown 2aff6eab6d
Merge pull request #3245 from NotAFile/batch-iter 7 years ago
Adrian Tschira 095292304f Py3 storage/_base.py 7 years ago
David Baker ecc4b88bd1
Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir 7 years ago
Erik Johnston 46345187cc
Merge pull request #3243 from NotAFile/py3-six-3 7 years ago
Neil Johnson 037c6db85d Merge branch 'master' into develop 7 years ago
David Baker 7a1af504d7 Remove users from user directory on deactivate 7 years ago
Neil Johnson 14ca678674
Update CHANGES.rst 7 years ago
Neil Johnson 6f67163c63
Update CHANGES.rst 7 years ago
Neil Johnson bdd2ed5acf update for v0.30.0 7 years ago