summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Port to sortedcontainers (with tests!) (#3332)Amber Brown2018-06-066-35/+241
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_methodRichard van der Hoff2018-06-041-26/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove was_forgotten_at
| * | | | | | | | | | | | | Remove was_forgotten_atRichard van der Hoff2018-06-011-26/+0
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is unused. IT MUST DIE!!!1 ̧̪͈̱̹̳͖͙H̵̰̤̰͕̖e̛ ͚͉̗̼̞w̶̩̥͉̮h̩̺̪̩͘ͅọ͎͉̟ ̜̩͔̦̘ͅW̪̫̩̣̲͔̳a͏͔̳͖i͖͜t͓̤̠͓͙s̘̰̩̥̙̝ͅ ̲̠̬̥Be̡̙̫̦h̰̩i̛̫͙͔̭̤̗̲n̳͞d̸ ͎̻͘T̛͇̝̲̹̠̗ͅh̫̦̝ͅe̩̫͟ ͓͖̼W͕̳͎͚̙̥ą̙l̘͚̺͔͞ͅl̳͍̙̤̤̮̳.̢ ̟̺̜̙͉Z̤̲̙̙͎̥̝A͎̣͔̙͘L̥̻̗̳̻̳̳͢G͉̖̯͓̞̩̦O̹̹̺!̙͈͎̞̬ *
* | | | | | | | | | | | | Merge pull request #3334 from matrix-org/rav/cache_factor_overrideRichard van der Hoff2018-06-044-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | Cache factor override system for specific caches
| * | | | | | | | | | | | Add hacky cache factor override systemErik Johnston2018-06-044-4/+18
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Fix replication metricsRichard van der Hoff2018-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix bug introduced in #3256
* | | | | | | | | | | | Hopefully, fix LaterGuage error handlingRichard van der Hoff2018-06-041-3/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Put python's logs into Trial when running unit tests (#3319)Amber Brown2018-06-041-13/+27
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3328 from intelfx/fix-metrics-LaterGauge-usageAmber Brown2018-06-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | federation: fix LaterGauge usage
| * | | | | | | | | | federation/send_queue.py: fix usage of LaterGaugeIvan Shapovalov2018-06-031-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a startup crash due to commit df9f72d9e5fe264b86005208e0f096156eb03e4b "replacing portions".
* | | | | | | | | | Merge pull request #3317 from ↵Richard van der Hoff2018-06-011-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thegcat/feature/3312-add_ipv6_to_blacklist_example_config Add private IPv6 addresses to example config for url preview blacklist
| * | | | | | | | | | Add private IPv6 addresses to preview blacklist #3312Felix Schäfer2018-06-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | Merge pull request #3264 from matrix-org/neil/sign-up-statsNeil Johnson2018-06-014-1/+60
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | daily user type phone home stats
| * | | | | | | | | | | remove unnecessary INSERTNeil Johnson2018-06-011-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | create users index on creation_tsNeil Johnson2018-05-291-0/+20
| | | | | | | | | | | |
| * | | | | | | | | | | create index in backgroundNeil Johnson2018-05-291-0/+7
| | | | | | | | | | | |
| * | | | | | | | | | | bump versionNeil Johnson2018-05-291-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | daily user type phone home statsNeil Johnson2018-05-222-0/+33
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3318 from matrix-org/rav/ignore_depth_on_rrsRichard van der Hoff2018-06-011-29/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Ignore depth when updating read-receipts
| * | | | | | | | | | | Handle RRs which arrive before their eventsRichard van der Hoff2018-06-011-25/+19
| | | | | | | | | | | |
| * | | | | | | | | | | Ignore depth when updating read-receiptsRichard van der Hoff2018-06-011-30/+37
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Order read receipts by stream ordering instead of depth
* | | | | | | | | | | code_style.rst: formattingRichard van der Hoff2018-05-311-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Run Prometheus on a different port, optionally. (#3274)Amber Brown2018-05-3116-26/+192
| | | | | | | | | | |
* | | | | | | | | | | Consistently use six's iteritems and wrap lazy keys/values in list() if ↵Amber Brown2018-05-3129-101/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they're not meant to be lazy (#3307)
* | | | | | | | | | | Merge pull request #3303 from NotAFile/py3-memoryviewAmber Brown2018-05-303-6/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use memoryview in py3
| * | | | | | | | | | | add remaining memoryview changesAdrian Tschira2018-05-292-4/+12
| | | | | | | | | | | |
| * | | | | | | | | | | use memoryview in py3Adrian Tschira2018-05-292-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | Merge pull request #3281 from NotAFile/py3-six-isinstanceAmber Brown2018-05-303-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | remaining isintance fixes
| * | | | | | | | | | | pep8Adrian Tschira2018-05-291-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | fix recursion errorAdrian Tschira2018-05-241-7/+5
| | | | | | | | | | | |
| * | | | | | | | | | | remaining isintance fixesAdrian Tschira2018-05-243-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | Update some comments and docstrings in SyncHandlerRichard van der Hoff2018-05-291-1/+11
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdprRichard van der Hoff2018-05-293-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Exempt AS-registered users from doing gdpr
| * | | | | | | | | | | | fix testsRichard van der Hoff2018-05-291-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Exempt AS-registered users from doing gdprRichard van der Hoff2018-05-292-0/+4
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3302 from krombel/py3_extend_tox_testingRichard van der Hoff2018-05-291-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | extend tox testing for py3 to avoid regressions
| * | | | | | | | | | | extend tox testing for py3 to avoid regressionsKrombel2018-05-291-1/+28
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3299 from matrix-org/matthew/macos-fixesAmber Brown2018-05-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | disable CPUMetrics if no /proc/self/stat
| * | | | | | | | | | | pep8Matthew Hodgson2018-05-291-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | disable CPUMetrics if no /proc/self/statMatthew Hodgson2018-05-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes build on macOS again
* | | | | | | | | | | | fix another dumb typoMatthew Hodgson2018-05-291-2/+2
|/ / / / / / / / / / /
* | | | | | | | | / / fix dumb typoMatthew Hodgson2018-05-291-4/+4
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3256 from matrix-org/3218-official-promAmber Brown2018-05-2840-1311/+575
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Switch to the Python Prometheus library
| * | | | | | | | | | fix up testsAmber Brown2018-05-281-3/+3
| | | | | | | | | | |
| * | | | | | | | | | update to more consistently use seconds in any metrics or loggingAmber Brown2018-05-284-38/+38
| | | | | | | | | | |
| * | | | | | | | | | invalid syntax :(Amber Brown2018-05-281-2/+1
| | | | | | | | | | |
| * | | | | | | | | | add comment about why unregAmber Brown2018-05-281-0/+2
| | | | | | | | | | |
| * | | | | | | | | | update metrics to be in secondsAmber Brown2018-05-284-37/+38
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2847-197/+686
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #3288 from matrix-org/rav/no_spam_guestsRichard van der Hoff2018-05-252-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Avoid sending consent notice to guest users
| * | | | | | | | | | | Fix default for send_server_notice_to_guestsRichard van der Hoff2018-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bool("False") == True...
| * | | | | | | | | | | Avoid sending consent notice to guest usersRichard van der Hoff2018-05-252-1/+12
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we think it makes sense not to send the notices to guest users.
* | | | | | | | | | | Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_roomRichard van der Hoff2018-05-252-12/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Let users leave the server notice room after joining
| * | | | | | | | | | | Let users leave the server notice room after joiningRichard van der Hoff2018-05-252-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They still can't reject invites, but we let them leave it.
* | | | | | | | | | | | Merge pull request #3283 from NotAFile/py3-stateAmber Brown2018-05-241-23/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | py3-ize state.py
| * | | | | | | | | | | | py3-ize state.pyAdrian Tschira2018-05-241-23/+25
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3279 from NotAFile/py3-more-iteritemsAmber Brown2018-05-241-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | more six iteritems
| * | | | | | | | | | | | more iteritemsAdrian Tschira2018-05-241-4/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3280 from NotAFile/py3-more-miscAmber Brown2018-05-245-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | More Misc. py3 fixes
| * | | | | | | | | | | Misc. py3 fixesAdrian Tschira2018-05-245-11/+13
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | Merge pull request #3278 from NotAFile/py3-storage-baseAmber Brown2018-05-241-17/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Py3 storage/_base.py
| * | | | | | | | | | | Py3 storage/_base.pyAdrian Tschira2018-05-241-17/+22
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | Merge pull request #3244 from NotAFile/py3-six-4Amber Brown2018-05-2415-49/+69
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | replace some iteritems with six
| * | | | | | | | | | | replace some iteritems with sixAdrian Tschira2018-05-1915-49/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | Merge pull request #3246 from NotAFile/py3-repr-stringAmber Brown2018-05-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | use repr, not str
| * | | | | | | | | | | | use repr, not strAdrian Tschira2018-05-191-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | Merge pull request #3247 from NotAFile/py3-miscAmber Brown2018-05-243-5/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Misc Python3 fixes
| * | | | | | | | | | | | use stand-in value if maxint is not availableAdrian Tschira2018-05-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
| * | | | | | | | | | | | fix py3 intern and remove unnecessary py3 encodeAdrian Tschira2018-05-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
| * | | | | | | | | | | | py3-ize url previewAdrian Tschira2018-05-191-3/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3245 from NotAFile/batch-iterAmber Brown2018-05-241-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Add batch_iter to utils
| * | | | | | | | | | | Add batch_iter to utilsAdrian Tschira2018-05-191-0/+18
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a frequent idiom I noticed where an iterable is split up into a number of chunks/batches. Unfortunately that method does not work with iterators like dict.keys() in python3. This implementation works with iterators. Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dirDavid Baker2018-05-242-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove users from user directory on deactivate
| * | | | | | | | | | | Remove users from user directory on deactivateDavid Baker2018-05-242-0/+11
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3243 from NotAFile/py3-six-3Erik Johnston2018-05-246-11/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Replace some more comparisons with six
| * | | | | | | | | | | | Replace some more comparisons with sixAdrian Tschira2018-05-196-11/+23
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus a bonus b"" string I missed last time Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | Merge branch 'master' into developNeil Johnson2018-05-242-5/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Update CHANGES.rst v0.30.0 github/release-v0.30.0 release-v0.30.0Neil Johnson2018-05-241-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Update CHANGES.rstNeil Johnson2018-05-241-1/+1
| | | | | | | | | | |
| * | | | | | | | | | update for v0.30.0Neil Johnson2018-05-241-4/+23
| | | | | | | | | | |
| * | | | | | | | | | bump versionNeil Johnson2018-05-241-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3261 from matrix-org/erikj/pagination_fixesErik Johnston2018-05-241-9/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix federation backfill bugs
| * | | | | | | | | | | Use iter* methodsErik Johnston2018-05-221-7/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Fix that states is a dict of dictsErik Johnston2018-05-221-1/+4
| | | | | | | | | | | |
| * | | | | | | | | | | get_domains_from_state returns list of tuplesErik Johnston2018-05-221-2/+12
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3267 from matrix-org/erikj/iter_filterErik Johnston2018-05-241-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | Use iter* methods for _filter_events_for_server
| * | | | | | | | | | | s/values/itervalues/Erik Johnston2018-05-231-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Use iter* methods for _filter_events_for_serverErik Johnston2018-05-231-4/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'release-v0.30.0' into developRichard van der Hoff2018-05-248-19/+128
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_urlRichard van der Hoff2018-05-243-9/+32
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Allow overriding the server_notices user's avatar
| | * | | | | | | | | | | Allow overriding the server_notices user's avatarRichard van der Hoff2018-05-233-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | probably should have done this in the first place, like @turt2live suggested.
| * | | | | | | | | | | | Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uriRichard van der Hoff2018-05-231-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | Use the localpart in the consent uri
| | * | | | | | | | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uriRichard van der Hoff2018-05-234-8/+55
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Use the localpart in the consent uriRichard van der Hoff2018-05-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because it's shorter.
| * | | | | | | | | | | | | Merge docs on consent bits from PR #3268 into release branchRichard van der Hoff2018-05-234-23/+271
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #3271 from matrix-org/rav/consent_uri_in_messagesRichard van der Hoff2018-05-233-7/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for putting %(consent_uri)s in messages
| | * | | | | | | | | | | | | Support for putting %(consent_uri)s in messagesRichard van der Hoff2018-05-233-7/+50
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to put the URI in the error message and the server notice that get sent by the server
| * | | | | | | | | | | | | fix typoRichard van der Hoff2018-05-231-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #3270 from matrix-org/rav/block_remote_server_noticesRichard van der Hoff2018-05-231-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Block attempts to send server notices to remote users
| | * | | | | | | | | | | | Block attempts to send server notices to remote usersRichard van der Hoff2018-05-231-0/+4
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | style v0.30.0-rc1Neil Johnson2018-05-231-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | bump version and changelogNeil Johnson2018-05-232-1/+37
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3268 from matrix-org/rav/privacy_policy_docsRichard van der Hoff2018-05-234-23/+271
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / Docs on consent bits
| * | | | | | | | | | consent_tracking.md: clarify linkRichard van der Hoff2018-05-231-1/+1
| | | | | | | | | | |
| * | | | | | | | | | minor post-review tweaksRichard van der Hoff2018-05-232-5/+5
| | | | | | | | | | |
| * | | | | | | | | | mention public_baseurlRichard van der Hoff2018-05-231-0/+9
| | | | | | | | | | |
| * | | | | | | | | | fix wrappingRichard van der Hoff2018-05-231-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Using the manhole to send server noticesRichard van der Hoff2018-05-231-0/+13
| | | | | | | | | | |
| * | | | | | | | | | Notes on the manholeRichard van der Hoff2018-05-231-0/+43
| | | | | | | | | | |
| * | | | | | | | | | consent_tracking: formatting etcRichard van der Hoff2018-05-231-8/+7
| | | | | | | | | | |
| * | | | | | | | | | server_notices.md: fix linkRichard van der Hoff2018-05-231-2/+2
| | | | | | | | | | |
| * | | | | | | | | | consent tracking docsRichard van der Hoff2018-05-233-25/+154
| | | | | | | | | | |
| * | | | | | | | | | Some docs about server noticesRichard van der Hoff2018-05-231-0/+53
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3265 from matrix-org/erikj/limit_paginationErik Johnston2018-05-221-9/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Don't support limitless pagination
| * | | | | | | | | | Remove unused string formatting paramErik Johnston2018-05-221-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Don't support limitless paginationErik Johnston2018-05-221-8/+6
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pagination storage function supported not specifiying a limit on the number of events returned. This was triggered when using the search or context API with a limit of zero, which the storage function took to mean not being limited.
* | | | | | | | | | fix synchrotronhera2018-05-221-1/+1
| | | | | | | | | |
* | | | | | | | | | custom error code for not leaving server notices roomRichard van der Hoff2018-05-222-0/+2
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | comment typoDavid Baker2018-05-221-1/+1
| |_|_|/ / / / / |/| | | | | | |
| | | * | | | | pepeighttttAmber Brown2018-05-231-0/+1
| | | | | | | |
| | | * | | | | add back CPU metricsAmber Brown2018-05-231-1/+35
| | | | | | | |
| | | * | | | | fixesAmber Brown2018-05-233-13/+13
| | | | | | | |
| | | * | | | | more cleanupAmber Brown2018-05-223-9/+11
| | | | | | | |
| | | * | | | | cleanupAmber Brown2018-05-229-29/+64
| | | | | | | |
| | | * | | | | cleanup pep8 errorsAmber Brown2018-05-225-37/+114
| | | | | | | |
| | | * | | | | tests/metrics is gone nowAmber Brown2018-05-221-1/+1
| | | | | | | |
| | | * | | | | fixesAmber Brown2018-05-227-24/+52
| | | | | | | |
| | | * | | | | fix the test failuresAmber Brown2018-05-221-1/+1
| | | | | | | |
| | | * | | | | update gitignore to remove some files that got put on my machineAmber Brown2018-05-221-0/+3
| | | | | | | |
| | | * | | | | cleanups, self-registrationAmber Brown2018-05-223-19/+12
| | | | | | | |
| | | * | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2255-210/+1780
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3262 from matrix-org/rav/has_already_consentedRichard van der Hoff2018-05-223-5/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add a 'has_consented' template var to consent forms
| * | | | | | | | Add a 'has_consented' template var to consent formsRichard van der Hoff2018-05-223-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #3260
| * | | | | | | | Enable auto-escaping for the consent templatesRichard van der Hoff2018-05-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to reduce the risk of somebody introducing an html injection attack...
* | | | | | | | | Merge pull request #3263 from matrix-org/rav/fix_jinja_depRichard van der Hoff2018-05-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix dependency on jinja2
| * | | | | | | | Fix dependency on jinja2Richard van der Hoff2018-05-221-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay the import of ConsentResource, so that we can get away without jinja2 if people don't have the consent resource enabled. Fixes #3259
* | | | | | | | Merge pull request #3257 from matrix-org/rav/fonx_on_no_consentRichard van der Hoff2018-05-226-2/+179
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Reject attempts to send event before privacy consent is given
| * | | | | | | Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-226-2/+179
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given.
* | | | | | | Merge pull request #3236 from matrix-org/rav/consent_noticeRichard van der Hoff2018-05-2215-21/+331
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Send users a server notice about consent
| * | | | | | | Stub out ServerNoticesSender on the workersRichard van der Hoff2018-05-226-8/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and have the sync endpoints call it directly rather than obsure indirection via PresenceHandler
| * | | | | | | Move consent config parsing into ConsentConfigRichard van der Hoff2018-05-224-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out we need to reuse this, so it's better in the config class.
| * | | | | | | Send users a server notice about consentRichard van der Hoff2018-05-2211-11/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user first syncs, we will send them a server notice asking them to consent to the privacy policy if they have not already done so.
| * | | | | | | Rename 'version' param on user consent configRichard van der Hoff2018-05-222-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we're going to use it for the version we require too.
* | | | | | | | Merge pull request #3258 from matrix-org/erikj/fixup_logcontext_rusageErik Johnston2018-05-221-11/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix logcontext resource usage tracking
| * | | | | | | | CommentErik Johnston2018-05-221-1/+1
| | | | | | | | |
| * | | | | | | | Fix logcontext resource usage trackingErik Johnston2018-05-221-11/+27
|/ / / / / / / /
* | | | | | | | Merge pull request #3252 from matrix-org/erikj/in_flight_requestsErik Johnston2018-05-222-2/+162
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add in flight request metrics
| * | | | | | | Don't store contextErik Johnston2018-05-221-8/+5
| | | | | | | |
| * | | | | | | Move in_flight_requests_count to be a callback metricErik Johnston2018-05-221-10/+21
| | | | | | | |
| * | | | | | | Add in flight request metricsErik Johnston2018-05-212-2/+154
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks CPU and DB usage while requests are in flight, rather than when we write the response.
* | | | | | | Merge pull request #3255 from matrix-org/rav/fix_transactionsRichard van der Hoff2018-05-212-21/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Stop the transaction cache caching failures
| * | | | | | | Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-212-25/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ONE DAY I WILL PURGE THE WORLD OF THIS EVIL
| * | | | | | | Stop the transaction cache caching failuresRichard van der Hoff2018-05-212-9/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transaction cache has some code which tries to stop it caching failures, but if the callback function failed straight away, then things would happen backwards and we'd end up with the failure stuck in the cache.
* | | | | | | | Merge pull request #3251 from matrix-org/cohort_analyticsNeil Johnson2018-05-211-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Tighter filtering for user_daily_visits
| * | | | | | | Tighter filtering for user_daily_visitsNeil Johnson2018-05-181-1/+5
| |/ / / / / /
* | | | | | | Merge pull request #3239 from ptman/developMichael Kaye2018-05-211-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add lxml to docker image for web previews
| * | | | | | Add lxml to docker image for web previewsPaul Tötterman2018-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
* | | | | | | Merge pull request #3241 from matrix-org/fix_user_visits_insertionNeil Johnson2018-05-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | fix psql compatability bug
| * | | | | | fix psql compatability bugNeil Johnson2018-05-181-1/+1
|/ / / / / /
* | | | | | Merge branch 'master' into developNeil Johnson2018-05-185-19/+45
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #3232 from matrix-org/rav/server_notices_roomRichard van der Hoff2018-05-1810-7/+309
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Infrastructure for a server notices room
| * | | | | | | Better docstringsRichard van der Hoff2018-05-181-0/+16
| | | | | | | |
| * | | | | | | Make sure we reject attempts to invite the notices userRichard van der Hoff2018-05-183-0/+20
| | | | | | | |
| * | | | | | | Replace inline docstrings with "Attributes" in class docstringRichard van der Hoff2018-05-181-23/+15
| | | | | | | |
| * | | | | | | fix missing yield for server_notices_roomRichard van der Hoff2018-05-171-3/+4
| | | | | | | |
| * | | | | | | Infrastructure for a server notices roomRichard van der Hoff2018-05-179-7/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Server Notices use a special room which the user can't dismiss. They are created on demand when some other bit of the code calls send_notice. (This doesn't actually do much yet becuse we don't call send_notice anywhere)
* | | | | | | | Merge pull request #3235 from matrix-org/rav/fix_receipts_deferredRichard van der Hoff2018-05-181-7/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix error in handling receipts
| * | | | | | | | Fix error in handling receiptsRichard van der Hoff2018-05-181-7/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an error which has been happening ever since #2158 (v0.21.0-rc1): > TypeError: argument of type 'ObservableDeferred' is not iterable fixes #3234
* | | | | | | | Merge pull request #3233 from matrix-org/rav/remove_dead_codeRichard van der Hoff2018-05-181-55/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unused `update_external_syncs`
| * | | | | | | | Remove unused `update_external_syncs`Richard van der Hoff2018-05-171-55/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This method isn't used anywhere. Burninate it.
* | | | | | | | Merge pull request #3221 from matrix-org/erikj/purge_tokenErik Johnston2018-05-183-37/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Make purge_history operate on tokens
| * | | | | | | Clarify commentErik Johnston2018-05-161-1/+2
| | | | | | | |
| * | | | | | | CommentsErik Johnston2018-05-161-0/+8
| | | | | | | |
| * | | | | | | Move and rename variableErik Johnston2018-05-161-3/+3
| | | | | | | |
| * | | | | | | Make purge_history operate on tokensErik Johnston2018-05-153-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we're soon going to change how topological_ordering works
| * | | | | | | Use events_to_purge table rather than tokenErik Johnston2018-05-151-15/+34
| | | | | | | |
* | | | | | | | Merge pull request #3225 from matrix-org/rav/move_creation_handlerRichard van der Hoff2018-05-176-11/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move RoomCreationHandler out of synapse.handlers.Handlers
| * | | | | | | | Move RoomCreationHandler out of synapse.handlers.HandlersRichard van der Hoff2018-05-176-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handlers is deprecated nowadays, so let's move this out before I add a new dependency on it. Also fix the docstrings on create_room.
* | | | | | | | | Merge pull request #3212 from matrix-org/erikj/epa_streamErik Johnston2018-05-173-40/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use stream rather depth ordering for push actions
| * | | | | | | | | Use stream rather depth ordering for push actionsErik Johnston2018-05-113-40/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies things as it is, but will also allow us to change the way we traverse topologically without having to update the way push actions work.
* | | | | | | | | | Merge branch 'master' into developNeil Johnson2018-05-162-3/+71
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3163 from matrix-org/cohort_analyticsNeil Johnson2018-05-167-5/+122
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | user visit data
| * | | | | | | | | | remove empty lineNeil Johnson2018-05-161-1/+0
| | | | | | | | | | |
| * | | | | | | | | | remove unused method recurring_user_daily_visit_statsNeil Johnson2018-05-161-3/+0
| | | | | | | | | | |
| * | | | | | | | | | style and further contraining queryNeil Johnson2018-05-161-8/+12
| | | | | | | | | | |
| * | | | | | | | | | pep8Neil Johnson2018-05-151-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Limit query load of generate_user_daily_visitsNeil Johnson2018-05-152-27/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The aim is to keep track of when it was last called and only query from that point in time
| * | | | | | | | | | instead of inserting user daily visit data at the end of the day, instead ↵Neil Johnson2018-05-142-43/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insert incrementally through the day
| * | | | | | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵Neil Johnson2018-05-14120-1181/+2386
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cohort_analytics
| * | | | | | | | | | | remove user agent from data model, will just join on user_ipsNeil Johnson2018-05-011-12/+11
| | | | | | | | | | | |
| * | | | | | | | | | | add inidexes based on usageNeil Johnson2018-05-011-6/+2
| | | | | | | | | | | |
| * | | | | | | | | | | 10 mins seems more reasonable that every minuteNeil Johnson2018-05-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | pep8Neil Johnson2018-04-251-3/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Generate user daily statsNeil Johnson2018-04-256-5/+112
| | | | | | | | | | | |
| * | | | | | | | | | | ignore atom editor python ide filesNeil Johnson2018-04-251-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3213 from matrix-org/rav/consent_handlerRichard van der Hoff2018-05-1614-5/+446
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | ConsentResource to gather policy consent from users
| * | | | | | | | | | | ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-1514-5/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully there are enough comments and docs in this that it makes sense on its own.
| | | | | | | * | | | | rest of the changesAmber Brown2018-05-218-337/+68
| | | | | | | | | | | |
| | | | | | | * | | | | replacing portionsAmber Brown2018-05-2123-414/+268
| | | | | | | | | | | |
| | | | | | | * | | | | don't need the resource portionAmber Brown2018-05-211-23/+0
| | | | | | | | | | | |
| | | | | | | * | | | | look at the Prometheus metrics insteadAmber Brown2018-05-211-5/+3
| | | | | | | | | | | |
| | | | | | | * | | | | remove old metrics libsAmber Brown2018-05-212-450/+0
| | | | | | |/ / / / /
| | | | | | * | | | | Merge tag 'v0.29.1'Neil Johnson2018-05-184-10/+22
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in synapse v0.29.1 (2018-05-17) ========================================== Changes: * Update docker documentation (PR #3222) Changes in synapse v0.29.0 (2018-05-16) =========================================== Not changes since v0.29.0-rc1 Changes in synapse v0.29.0-rc1 (2018-05-14) =========================================== Notable changes, a docker file for running Synapse (Thanks to @kaiyou!) and a closed spec bug in the Client Server API. Additionally further prep for Python 3 migration. Potentially breaking change: * Make Client-Server API return 401 for invalid token (PR #3161). This changes the Client-server spec to return a 401 error code instead of 403 when the access token is unrecognised. This is the behaviour required by the specification, but some clients may be relying on the old, incorrect behaviour. Thanks to @NotAFile for fixing this. Features: * Add a Dockerfile for synapse (PR #2846) Thanks to @kaiyou! Changes - General: * nuke-room-from-db.sh: added postgresql option and help (PR #2337) Thanks to @rubo77! * Part user from rooms on account deactivate (PR #3201) * Make 'unexpected logging context' into warnings (PR #3007) * Set Server header in SynapseRequest (PR #3208) * remove duplicates from groups tables (PR #3129) * Improve exception handling for background processes (PR #3138) * Add missing consumeErrors to improve exception handling (PR #3139) * reraise exceptions more carefully (PR #3142) * Remove redundant call to preserve_fn (PR #3143) * Trap exceptions thrown within run_in_background (PR #3144) Changes - Refactors: * Refactor /context to reuse pagination storage functions (PR #3193) * Refactor recent events func to use pagination func (PR #3195) * Refactor pagination DB API to return concrete type (PR #3196) * Refactor get_recent_events_for_room return type (PR #3198) * Refactor sync APIs to reuse pagination API (PR #3199) * Remove unused code path from member change DB func (PR #3200) * Refactor request handling wrappers (PR #3203) * transaction_id, destination defined twice (PR #3209) Thanks to @damir-manapov! * Refactor event storage to prepare for changes in state calculations (PR #3141) * Set Server header in SynapseRequest (PR #3208) * Use deferred.addTimeout instead of time_bound_deferred (PR #3127, #3178) * Use run_in_background in preference to preserve_fn (PR #3140) Changes - Python 3 migration: * Construct HMAC as bytes on py3 (PR #3156) Thanks to @NotAFile! * run config tests on py3 (PR #3159) Thanks to @NotAFile! * Open certificate files as bytes (PR #3084) Thanks to @NotAFile! * Open config file in non-bytes mode (PR #3085) Thanks to @NotAFile! * Make event properties raise AttributeError instead (PR #3102) Thanks to @NotAFile! * Use six.moves.urlparse (PR #3108) Thanks to @NotAFile! * Add py3 tests to tox with folders that work (PR #3145) Thanks to @NotAFile! * Don't yield in list comprehensions (PR #3150) Thanks to @NotAFile! * Move more xrange to six (PR #3151) Thanks to @NotAFile! * make imports local (PR #3152) Thanks to @NotAFile! * move httplib import to six (PR #3153) Thanks to @NotAFile! * Replace stringIO imports with six (PR #3154, #3168) Thanks to @NotAFile! * more bytes strings (PR #3155) Thanks to @NotAFile! Bug Fixes: * synapse fails to start under Twisted >= 18.4 (PR #3157) * Fix a class of logcontext leaks (PR #3170) * Fix a couple of logcontext leaks in unit tests (PR #3172) * Fix logcontext leak in media repo (PR #3174) * Escape label values in prometheus metrics (PR #3175, #3186) * Fix 'Unhandled Error' logs with Twisted 18.4 (PR #3182) Thanks to @Half-Shot! * Fix logcontext leaks in rate limiter (PR #3183) * notifications: Convert next_token to string according to the spec (PR #3190) Thanks to @mujx! * nuke-room-from-db.sh: fix deletion from search table (PR #3194) Thanks to @rubo77! * add guard for None on purge_history api (PR #3160) Thanks to @krombel!
| | | | | | | * \ \ \ \ Merge branch 'release-v0.29.0' of https://github.com/matrix-org/synapse into ↵ v0.29.1 github/release-v0.29.0 release-v0.29.0Neil Johnson2018-05-182-2/+8
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-v0.29.0
| | | | | | | | * | | | | bump version, change logNeil Johnson2018-05-172-2/+8
| | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | | | | * | | | | light grammar changesNeil Johnson2018-05-171-4/+4
| | | | | | | | | | | |
| | | | | | | * | | | | Note that secrets need to be retained.Michael Kaye2018-05-171-2/+7
| | | | | | | | | | | |
| | | | | | | * | | | | Document macaroon env var correctlyMichael Kaye2018-05-171-2/+2
| | | | | | | | | | | |
| | | | | | | * | | | | Reference synapse docker image and docker-composeMichael Kaye2018-05-171-2/+3
| | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | | | * | | | | Merge pull request #1756 from rubo77/patch-4Richard van der Hoff2018-05-171-9/+23
| | | | | |/| | | | | | | | | |/| | | | | | | | | | | | | | | | | Add instructions how to setup the postgres user and clarify the final step
| | | | | | * | | | | postgres.rst: Add instructions how to setup the postgres user and clarify ↵rubo772018-05-171-9/+23
| | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | the final step
| | | | * | | | | | bump version and changelog for 0.29.0 v0.29.0Neil Johnson2018-05-162-1/+5
| | | | | | | | | |
| | | | * | | | | | further musical chairsNeil Johnson2018-05-141-2/+3
| | | | | | | | | |
| | | | * | | | | | rearrange and collect related PRsNeil Johnson2018-05-141-26/+27
| | | | | | | | | |
| | | | * | | | | | v0.29.0-rc1: bump version and change log v0.29.0-rc1Neil Johnson2018-05-142-3/+65
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivateDavid Baker2018-05-143-2/+143
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Part user from rooms on account deactivate
| * | | | | | | | Catch failure to part user from roomDavid Baker2018-05-101-7/+13
| | | | | | | | |
| * | | | | | | | Many docstringsDavid Baker2018-05-102-0/+36
| | | | | | | | |
| * | | | | | | | Oops, don't call function passed to run_in_backgroundDavid Baker2018-05-101-1/+1
| | | | | | | | |
| * | | | | | | | Prefix internal functionsDavid Baker2018-05-091-7/+7
| | | | | | | | |
| * | | | | | | | Add the schema fileDavid Baker2018-05-091-0/+25
| | | | | | | | |
| * | | | | | | | Indent failDavid Baker2018-05-091-1/+1
| | | | | | | | |
| * | | | | | | | Part deactivated users in the backgroundDavid Baker2018-05-092-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One room at a time so we don't take out the whole server with leave events, and restart at server restart.
| * | | | | | | | Part user from rooms on account deactivateDavid Baker2018-05-081-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements this very crudely: this probably isn't viable because parting a user from all their rooms could take a long time, and if the HS gets restarted in that time the process will be aborted.
* | | | | | | | | Merge pull request #2846 from kaiyou/feat-dockerfileMichael Kaye2018-05-1110-0/+541
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a Dockerfile for synapse
| * | | | | | | | | Add Docker packaging in the author listkaiyou2018-05-041-0/+3
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-05-0269-496/+1028
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make the logging level configurablekaiyou2018-05-012-3/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix the documentation about 'POSTGRES_DB'kaiyou2018-05-011-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-04-1451-279/+965
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-04-08179-4356/+8696
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-03-1727-39/+46
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Disable logging to file and rely on the console when using Dockerkaiyou2018-02-101-8/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Explicitely provide the postgres password to synapse in the Compose examplekaiyou2018-02-101-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove an accidentally committed test configurationkaiyou2018-02-101-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Generate macaroon and registration secrets, then store the results to the ↵kaiyou2018-02-102-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data dir
| * | | | | | | | | | | | | Fix the path to the log config filekaiyou2018-02-092-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Make SYNAPSE_MACAROON_SECRET_KEY a mandatory optionkaiyou2018-02-092-3/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Specify the Docker registry for the postgres imagekaiyou2018-02-081-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Specify the Docker registry in the build tagkaiyou2018-02-081-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Make it clear that the image has two modes of operationkaiyou2018-02-081-5/+24
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update to Alpine 3.7 and switch to libresslkaiyou2018-02-081-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Enable email server configuration from environment variableskaiyou2018-02-082-16/+24
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Honor the SYNAPSE_REPORT_STATS parameter in the Docker imagekaiyou2018-02-081-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Disable the Web client in the Docker imagekaiyou2018-02-082-4/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use 'synapse' as a default postgres user in Docker exampleskaiyou2018-02-082-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Refactor the start script to better handle mandatory parameterskaiyou2018-02-083-24/+35
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rename the permissions variable to avoid confusionkaiyou2018-02-081-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add some documentation about high performance storagekaiyou2018-02-081-2/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Make it clear that two modes are avaiable in the documentation, improve the ↵kaiyou2018-02-082-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compose file
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-07-23 04:25:58 +0000