857e6fd8b6
Ignore depth when updating read-receipts
...
Order read receipts by stream ordering instead of depth
2018-06-01 12:18:11 +01:00
4ef76f3ac4
Add private IPv6 addresses to preview blacklist #3312
...
The added addresses are expected to be local or loopback addresses and
shouldn't be spidered for previews.
Signed-off-by: Felix Schäfer <felix@thegcat.net>
2018-06-01 12:18:35 +02:00
4986b084f8
remove unnecessary INSERT
2018-06-01 10:50:40 +01:00
c2c3092cce
code_style.rst: formatting
2018-05-31 16:11:34 +01:00
febe0ec8fd
Run Prometheus on a different port, optionally. ( #3274 )
2018-05-31 19:04:50 +10:00
c936a52a9e
Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy ( #3307 )
2018-05-31 19:03:47 +10:00
e73635191f
Merge pull request #3290 from rubo77/patch-7
...
Add link to thorough instruction how to configure consent
2018-05-30 19:52:01 +01:00
219c2a322b
remove trailing whitespace
2018-05-30 19:42:19 +01:00
2e4be8bfd9
fix english and wrap comment
2018-05-30 19:24:12 +01:00
872cf43516
Merge pull request #3303 from NotAFile/py3-memoryview
...
use memoryview in py3
2018-05-30 12:51:42 +10:00
debff7ae09
Merge pull request #3281 from NotAFile/py3-six-isinstance
...
remaining isintance fixes
2018-05-30 12:44:46 +10:00
34b85df7f5
Update some comments and docstrings in SyncHandler
2018-05-29 22:31:18 +01:00
711f61a31d
Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdpr
...
Exempt AS-registered users from doing gdpr
2018-05-29 20:25:12 +01:00
a995fdae39
fix tests
2018-05-29 20:19:29 +01:00
4a9cbdbc15
Exempt AS-registered users from doing gdpr
2018-05-29 19:54:32 +01:00
ab0ef31dc7
create users index on creation_ts
2018-05-29 17:51:08 +01:00
558f3d376a
create index in background
2018-05-29 17:47:55 +01:00
c379acd4fd
bump version
2018-05-29 17:47:28 +01:00
db2e4608ab
Merge pull request #3302 from krombel/py3_extend_tox_testing
...
extend tox testing for py3 to avoid regressions
2018-05-29 17:37:52 +01:00
4b9d0cde97
add remaining memoryview changes
2018-05-29 17:42:43 +02:00
7873cde526
pep8
2018-05-29 17:35:55 +02:00
1afafb3497
use memoryview in py3
...
Signed-off-by: Adrian Tschira <nota@notafile.com>
2018-05-29 17:14:34 +02:00
d6cd55532b
extend tox testing for py3 to avoid regressions
2018-05-29 16:02:41 +02:00
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
ff1bc0a279
pep8
2018-05-29 02:32:15 +01:00
adb6bac4d5
fix another dumb typo
2018-05-29 02:29:22 +01:00
0a240ad36e
disable CPUMetrics if no /proc/self/stat
...
fixes build on macOS again
2018-05-29 02:23:30 +01:00
284e36ad04
fix dumb typo
2018-05-29 02:23:11 +01:00
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
57ad76fa4a
fix up tests
2018-05-28 19:51:53 +10:00
3ef5cd74a6
update to more consistently use seconds in any metrics or logging
2018-05-28 19:39:27 +10:00
5c40ce3777
invalid syntax :(
2018-05-28 19:16:09 +10:00
357c74a50f
add comment about why unreg
2018-05-28 19:14:41 +10:00
a2eb5db4a0
update metrics to be in seconds
2018-05-28 19:10:27 +10:00
754826a830
Merge remote-tracking branch 'origin/develop' into 3218-official-prom
2018-05-28 18:57:23 +10:00
08ea5fe635
add link to thorough instruction how to configure consent
2018-05-25 23:19:55 +02:00
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
66bdae986f
Fix default for send_server_notice_to_guests
...
bool("False") == True...
2018-05-25 11:42:05 +01:00
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
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
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
4ee4450d66
fix recursion error
2018-05-24 21:44:10 +02:00
9c36c150e7
Merge pull request #3283 from NotAFile/py3-state
...
py3-ize state.py
2018-05-24 14:23:33 -05:00
cc1349c06a
Merge pull request #3279 from NotAFile/py3-more-iteritems
...
more six iteritems
2018-05-24 14:23:13 -05:00
5b788aba90
Merge pull request #3280 from NotAFile/py3-more-misc
...
More Misc. py3 fixes
2018-05-24 14:22:59 -05:00
0e61705661
py3-ize state.py
2018-05-24 20:59:00 +02:00
dd068ca979
remaining isintance fixes
...
Signed-off-by: Adrian Tschira <nota@notafile.com>
2018-05-24 20:55:08 +02:00
17a70cf6e9
Misc. py3 fixes
...
Signed-off-by: Adrian Tschira <nota@notafile.com>
2018-05-24 20:20:33 +02:00
6c16a4ec1b
more iteritems
2018-05-24 20:19:06 +02:00
7ea07c7305
Merge pull request #3278 from NotAFile/py3-storage-base
...
Py3 storage/_base.py
2018-05-24 13:08:09 -05:00
Richard van der Hoff