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 |
|
Adrian Tschira
|
4ee4450d66
|
fix recursion error
|
2018-05-24 21:44:10 +02: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
|
dd068ca979
|
remaining isintance fixes
Signed-off-by: Adrian Tschira <nota@notafile.com>
|
2018-05-24 20:55:08 +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 |
|
Richard van der Hoff
|
2f7008d4eb
|
Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages
Support for putting %(consent_uri)s in messages
|
2018-05-23 16:04:30 +01:00 |
|
Richard van der Hoff
|
e206b2c9ac
|
consent_tracking.md: clarify link
|
2018-05-23 15:57:10 +01:00 |
|
Richard van der Hoff
|
2df8c3139a
|
minor post-review tweaks
|
2018-05-23 15:39:52 +01:00 |
|
Richard van der Hoff
|
dda40fb55d
|
fix typo
|
2018-05-23 15:30:26 +01:00 |
|
Richard van der Hoff
|
3ff6f50eac
|
Use the localpart in the consent uri
... because it's shorter.
|
2018-05-23 15:28:23 +01:00 |
|
Richard van der Hoff
|
82191b08f6
|
Support for putting %(consent_uri)s in messages
Make it possible to put the URI in the error message and the server notice that
get sent by the server
|
2018-05-23 15:24:31 +01:00 |
|
Richard van der Hoff
|
2c62ea2515
|
Merge pull request #3270 from matrix-org/rav/block_remote_server_notices
Block attempts to send server notices to remote users
|
2018-05-23 15:06:35 +01:00 |
|
Richard van der Hoff
|
cd8ab9a0d8
|
mention public_baseurl
|
2018-05-23 14:43:09 +01:00 |
|
Richard van der Hoff
|
321f02d263
|
Block attempts to send server notices to remote users
|
2018-05-23 14:30:47 +01:00 |
|
Richard van der Hoff
|
1cbb8e5a33
|
fix wrapping
|
2018-05-23 13:58:28 +01:00 |
|
Richard van der Hoff
|
052d08a6a5
|
Using the manhole to send server notices
|
2018-05-23 13:55:39 +01:00 |
|
Richard van der Hoff
|
5ad1149f38
|
Notes on the manhole
|
2018-05-23 13:47:34 +01:00 |
|
Richard van der Hoff
|
563606b8f2
|
consent_tracking: formatting etc
|
2018-05-23 12:37:39 +01:00 |
|
Richard van der Hoff
|
2574ea3dc8
|
server_notices.md: fix link
|
2018-05-23 12:34:34 +01:00 |
|
Richard van der Hoff
|
833db2d922
|
consent tracking docs
|
2018-05-23 12:32:38 +01:00 |
|