Commit Graph

10954 Commits (c936a52a9eb18e302fbd5158da7188f674912530)
 

Author SHA1 Message Date
Erik Johnston f72d5a44d5
Merge pull request #3261 from matrix-org/erikj/pagination_fixes 7 years ago
Erik Johnston 68399fc4de
Merge pull request #3267 from matrix-org/erikj/iter_filter 7 years ago
Neil Johnson 91d95a1d8e bump version 7 years ago
Richard van der Hoff 8c98281b8d Merge branch 'release-v0.30.0' into develop 7 years ago
Richard van der Hoff 6abcb5d22d
Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url 7 years ago
Amber Brown 389dac2c15 pepeightttt 7 years ago
Amber Brown 472a5ec4e2 add back CPU metrics 7 years ago
Amber Brown e987079037 fixes 7 years ago
Richard van der Hoff 9bf4b2bda3 Allow overriding the server_notices user's avatar 7 years ago
Richard van der Hoff 23aa70cea8
Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri 7 years ago
Richard van der Hoff 043f05a078 Merge docs on consent bits from PR #3268 into release branch 7 years ago
Richard van der Hoff 96f07cebda
Merge pull request #3268 from matrix-org/rav/privacy_policy_docs 7 years ago
Richard van der Hoff a0b3946fe2
Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri 7 years ago
Richard van der Hoff 2f7008d4eb
Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages 7 years ago
Richard van der Hoff e206b2c9ac
consent_tracking.md: clarify link 7 years ago
Richard van der Hoff 2df8c3139a minor post-review tweaks 7 years ago
Richard van der Hoff dda40fb55d fix typo 7 years ago
Richard van der Hoff 3ff6f50eac Use the localpart in the consent uri 7 years ago
Richard van der Hoff 82191b08f6 Support for putting %(consent_uri)s in messages 7 years ago
Richard van der Hoff 2c62ea2515
Merge pull request #3270 from matrix-org/rav/block_remote_server_notices 7 years ago
Richard van der Hoff cd8ab9a0d8 mention public_baseurl 7 years ago
Richard van der Hoff 321f02d263 Block attempts to send server notices to remote users 7 years ago
Richard van der Hoff 1cbb8e5a33 fix wrapping 7 years ago
Richard van der Hoff 052d08a6a5 Using the manhole to send server notices 7 years ago
Richard van der Hoff 5ad1149f38 Notes on the manhole 7 years ago
Richard van der Hoff 563606b8f2
consent_tracking: formatting etc 7 years ago
Richard van der Hoff 2574ea3dc8
server_notices.md: fix link 7 years ago
Richard van der Hoff 833db2d922 consent tracking docs 7 years ago
Neil Johnson 9e8ab0a4f4 style 7 years ago
Neil Johnson 3601a240aa bump version and changelog 7 years ago
Richard van der Hoff e7598b666b Some docs about server notices 7 years ago
Erik Johnston 5aaa3189d5 s/values/itervalues/ 7 years ago
Erik Johnston 0a4bca4134 Use iter* methods for _filter_events_for_server 7 years ago
Amber Brown b6063631c3 more cleanup 7 years ago
Amber Brown 53cc2cde1f cleanup 7 years ago
Amber Brown 071206304d cleanup pep8 errors 7 years ago
Amber Brown 4abeaedcf3 tests/metrics is gone now 7 years ago
Amber Brown 85ba83eb51 fixes 7 years ago
Amber Brown 228f1f584e fix the test failures 7 years ago
Erik Johnston e85b5a0ff7 Use iter* methods 7 years ago
Erik Johnston 586b66b197 Fix that states is a dict of dicts 7 years ago
Erik Johnston 35ca3e7b65
Merge pull request #3265 from matrix-org/erikj/limit_pagination 7 years ago
Erik Johnston a17e901f4d Remove unused string formatting param 7 years ago
Erik Johnston 5494c1d71e Don't support limitless pagination 7 years ago
hera ad2823ee27 fix synchrotron 7 years ago
Richard van der Hoff 08bfc48abf custom error code for not leaving server notices room 7 years ago
David Baker 0a078026ea comment typo 7 years ago
Amber Brown 07bb9bdae8 update gitignore to remove some files that got put on my machine 7 years ago
Amber Brown 8f5a688d42 cleanups, self-registration 7 years ago
Amber Brown a8990fa2ec Merge remote-tracking branch 'origin/develop' into 3218-official-prom 7 years ago