| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | Merge pull request #3355 from matrix-org/rav/fix_federation_backfill | Richard van der Hoff | 2018-06-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix sql error in _get_state_groups_from_groups | Richard van der Hoff | 2018-06-06 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge pull request #3356 from matrix-org/rav/add_missing_attr_dep | Amber Brown | 2018-06-07 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Add missing dependency on attr | Richard van der Hoff | 2018-06-06 | 1 | -0/+1 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-06-06 | 2 | -1/+59 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | | Merge tag 'v0.31.0' | Neil Johnson | 2018-06-06 | 113 | -1642/+1426 | |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | | * | | | | | | 7 char sha in changelog v0.31.0 github/release-v0.31.0 release-v0.31.0 | Neil Johnson | 2018-06-06 | 1 | -3/+3 | |
| | | * | | | | | | Update CHANGES.rst | Neil Johnson | 2018-06-06 | 1 | -4/+4 | |
| | | * | | | | | | bump version and changelog | Neil Johnson | 2018-06-06 | 2 | -3/+12 | |
| | | * | | | | | | Fix metric documentation tables (#3341) | Amber Brown | 2018-06-06 | 1 | -20/+30 | |
| | | * | | | | | | Add note to changelog on prometheus metrics | Richard van der Hoff | 2018-06-06 | 1 | -1/+4 | |
| | | * | | | | | | Merge commit 'b7e7fd2' into release-v0.31.0 | Richard van der Hoff | 2018-06-06 | 2 | -5/+8 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | bump version and changelog v0.31.0-rc1 | Neil Johnson | 2018-06-04 | 2 | -1/+47 | |
| * | | | | | | | | | Merge pull request #3349 from t3chguy/redact_as_request_token | Richard van der Hoff | 2018-06-06 | 2 | -3/+7 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| | * | | | | | | | | also redact __str__ of ApplicationService used for logging | Michael Telatynski | 2018-06-06 | 1 | -1/+5 | |
| | * | | | | | | | | redact_uri in two missed log paths | Michael Telatynski | 2018-06-06 | 1 | -2/+2 | |
| * | | | | | | | | | Merge pull request #3347 from krombel/py3_extend_tox_2 | Amber Brown | 2018-06-06 | 1 | -11/+19 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | update tox.ini to cover 292 succeeding tests | Krombel | 2018-06-05 | 1 | -11/+19 | |
| * | | | | | | | | | | Merge pull request #3348 from intelfx/fix-sortedcontainers | Amber Brown | 2018-06-06 | 1 | -27/+22 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | federation/send_queue.py: fix usage of sortedcontainers.SortedDict | Ivan Shapovalov | 2018-06-06 | 1 | -27/+22 | |
| | |/ / / / / / / / / | ||||||
| * / / / / / / / / / | Fix metric documentation tables (#3341) | Amber Brown | 2018-06-06 | 1 | -20/+30 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #3327 from t3chguy/redact_as_request_token | Richard van der Hoff | 2018-06-05 | 3 | -9/+18 | |
| |\| | | | | | | | | ||||||
| | * | | | | | | | | factor out uri redaction into a method on http | Michael Telatynski | 2018-06-05 | 3 | -13/+17 | |
| | * | | | | | | | | Strip `access_token` from outgoing requests using existing regex | Michael Telatynski | 2018-06-02 | 1 | -1/+6 | |
| * | | | | | | | | | Merge pull request #3340 from ArchangeGabriel/patch-1 | Richard van der Hoff | 2018-06-05 | 1 | -9/+9 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | doc/postgres.rest: fix displaying of the last command block | Bruno Pagani | 2018-06-04 | 1 | -9/+9 | |
| | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-06-05 | 1 | -0/+3 | |
| |\| | | | | | | | | ||||||
| | * | | | | | | | | Merge pull request #3290 from rubo77/patch-7 | Richard van der Hoff | 2018-05-30 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | remove trailing whitespace | Richard van der Hoff | 2018-05-30 | 1 | -2/+2 | |
| | | * | | | | | | | | fix english and wrap comment | Richard van der Hoff | 2018-05-30 | 1 | -1/+2 | |
| | | * | | | | | | | | add link to thorough instruction how to configure consent | Ruben Barkow | 2018-05-25 | 1 | -0/+2 | |
| | |/ / / / / / / / | ||||||
| * | | | | / / / / | Port to sortedcontainers (with tests!) (#3332) | Amber Brown | 2018-06-06 | 6 | -35/+241 | |
| | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_method | Richard van der Hoff | 2018-06-04 | 1 | -26/+0 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Remove was_forgotten_at | Richard van der Hoff | 2018-06-01 | 1 | -26/+0 | |
| | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #3334 from matrix-org/rav/cache_factor_override | Richard van der Hoff | 2018-06-04 | 4 | -4/+18 | |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| | * | | | | | | | Add hacky cache factor override system | Erik Johnston | 2018-06-04 | 4 | -4/+18 | |
| | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | | Fix replication metrics | Richard van der Hoff | 2018-06-04 | 1 | -2/+2 | |
| * | | | | | | | Hopefully, fix LaterGuage error handling | Richard van der Hoff | 2018-06-04 | 1 | -3/+6 | |
| |/ / / / / / | ||||||
| * | | | | | | Put python's logs into Trial when running unit tests (#3319) | Amber Brown | 2018-06-04 | 1 | -13/+27 | |
| * | | | | | | Merge pull request #3328 from intelfx/fix-metrics-LaterGauge-usage | Amber Brown | 2018-06-04 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| | * | | | | | federation/send_queue.py: fix usage of LaterGauge | Ivan Shapovalov | 2018-06-03 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_exam... | Richard van der Hoff | 2018-06-01 | 1 | -0/+3 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Add private IPv6 addresses to preview blacklist #3312 | Felix Schäfer | 2018-06-01 | 1 | -0/+3 | |
| * | | | | | | Merge pull request #3264 from matrix-org/neil/sign-up-stats | Neil Johnson | 2018-06-01 | 4 | -1/+60 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | remove unnecessary INSERT | Neil Johnson | 2018-06-01 | 1 | -1/+0 | |
| | * | | | | | | create users index on creation_ts | Neil Johnson | 2018-05-29 | 1 | -0/+20 | |
| | * | | | | | | create index in background | Neil Johnson | 2018-05-29 | 1 | -0/+7 | |
| | * | | | | | | bump version | Neil Johnson | 2018-05-29 | 1 | -1/+1 | |
| | * | | | | | | daily user type phone home stats | Neil Johnson | 2018-05-22 | 2 | -0/+33 | |
| * | | | | | | | Merge pull request #3318 from matrix-org/rav/ignore_depth_on_rrs | Richard van der Hoff | 2018-06-01 | 1 | -29/+30 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| | * | | | | | | Handle RRs which arrive before their events | Richard van der Hoff | 2018-06-01 | 1 | -25/+19 | |
| | * | | | | | | Ignore depth when updating read-receipts | Richard van der Hoff | 2018-06-01 | 1 | -30/+37 | |
| |/ / / / / / | ||||||
| * | | | | | | code_style.rst: formatting | Richard van der Hoff | 2018-05-31 | 1 | -1/+1 | |
| * | | | | | | Run Prometheus on a different port, optionally. (#3274) | Amber Brown | 2018-05-31 | 16 | -26/+192 | |
| * | | | | | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'... | Amber Brown | 2018-05-31 | 29 | -101/+116 | |
| * | | | | | | Merge pull request #3303 from NotAFile/py3-memoryview | Amber Brown | 2018-05-30 | 3 | -6/+30 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | add remaining memoryview changes | Adrian Tschira | 2018-05-29 | 2 | -4/+12 | |
| | * | | | | | | use memoryview in py3 | Adrian Tschira | 2018-05-29 | 2 | -2/+18 | |
| * | | | | | | | Merge pull request #3281 from NotAFile/py3-six-isinstance | Amber Brown | 2018-05-30 | 3 | -13/+18 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | pep8 | Adrian Tschira | 2018-05-29 | 1 | -0/+1 | |
| | * | | | | | | | fix recursion error | Adrian Tschira | 2018-05-24 | 1 | -7/+5 | |
| | * | | | | | | | remaining isintance fixes | Adrian Tschira | 2018-05-24 | 3 | -8/+14 | |
| | | | | | | | * | Enforce the specified API for report_event | Richard van der Hoff | 2018-05-31 | 1 | -2/+23 | |
| | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | | Update some comments and docstrings in SyncHandler | Richard van der Hoff | 2018-05-29 | 1 | -1/+11 | |
| * | | | | | | | Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdpr | Richard van der Hoff | 2018-05-29 | 3 | -0/+5 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | fix tests | Richard van der Hoff | 2018-05-29 | 1 | -0/+1 | |
| | * | | | | | | | Exempt AS-registered users from doing gdpr | Richard van der Hoff | 2018-05-29 | 2 | -0/+4 | |
| | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #3302 from krombel/py3_extend_tox_testing | Richard van der Hoff | 2018-05-29 | 1 | -1/+28 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| | * | | | | | | extend tox testing for py3 to avoid regressions | Krombel | 2018-05-29 | 1 | -1/+28 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #3299 from matrix-org/matthew/macos-fixes | Amber Brown | 2018-05-29 | 1 | -0/+4 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | pep8 | Matthew Hodgson | 2018-05-29 | 1 | -0/+1 | |
| | * | | | | | | disable CPUMetrics if no /proc/self/stat | Matthew Hodgson | 2018-05-29 | 1 | -0/+3 | |
| * | | | | | | | fix another dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
| * | | | | | | fix dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -4/+4 | |
| * | | | | | | Merge pull request #3256 from matrix-org/3218-official-prom | Amber Brown | 2018-05-28 | 40 | -1311/+575 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | fix up tests | Amber Brown | 2018-05-28 | 1 | -3/+3 | |
| | * | | | | | | update to more consistently use seconds in any metrics or logging | Amber Brown | 2018-05-28 | 4 | -38/+38 | |
| | * | | | | | | invalid syntax :( | Amber Brown | 2018-05-28 | 1 | -2/+1 | |
| | * | | | | | | add comment about why unreg | Amber Brown | 2018-05-28 | 1 | -0/+2 | |
| | * | | | | | | update metrics to be in seconds | Amber Brown | 2018-05-28 | 4 | -37/+38 | |
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 47 | -197/+686 | |
| | |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #3288 from matrix-org/rav/no_spam_guests | Richard van der Hoff | 2018-05-25 | 2 | -1/+12 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Fix default for send_server_notice_to_guests | Richard van der Hoff | 2018-05-25 | 1 | -1/+1 | |
| | * | | | | | | | Avoid sending consent notice to guest users | Richard van der Hoff | 2018-05-25 | 2 | -1/+12 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room | Richard van der Hoff | 2018-05-25 | 2 | -12/+19 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Let users leave the server notice room after joining | Richard van der Hoff | 2018-05-25 | 2 | -12/+19 | |
| * | | | | | | | | Merge pull request #3283 from NotAFile/py3-state | Amber Brown | 2018-05-24 | 1 | -23/+25 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | py3-ize state.py | Adrian Tschira | 2018-05-24 | 1 | -23/+25 | |
| | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #3279 from NotAFile/py3-more-iteritems | Amber Brown | 2018-05-24 | 1 | -4/+6 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | more iteritems | Adrian Tschira | 2018-05-24 | 1 | -4/+6 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge pull request #3280 from NotAFile/py3-more-misc | Amber Brown | 2018-05-24 | 5 | -11/+13 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| | * | | | | | | | Misc. py3 fixes | Adrian Tschira | 2018-05-24 | 5 | -11/+13 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #3278 from NotAFile/py3-storage-base | Amber Brown | 2018-05-24 | 1 | -17/+22 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Py3 storage/_base.py | Adrian Tschira | 2018-05-24 | 1 | -17/+22 | |
| | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 15 | -49/+69 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 15 | -49/+69 | |
| * | | | | | | | | Merge pull request #3246 from NotAFile/py3-repr-string | Amber Brown | 2018-05-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | use repr, not str | Adrian Tschira | 2018-05-19 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge pull request #3247 from NotAFile/py3-misc | Amber Brown | 2018-05-24 | 3 | -5/+18 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | use stand-in value if maxint is not available | Adrian Tschira | 2018-05-19 | 1 | -1/+7 | |
| | * | | | | | | | | fix py3 intern and remove unnecessary py3 encode | Adrian Tschira | 2018-05-19 | 1 | -1/+6 | |
| | * | | | | | | | | py3-ize url preview | Adrian Tschira | 2018-05-19 | 1 | -3/+5 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge pull request #3245 from NotAFile/batch-iter | Amber Brown | 2018-05-24 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| | * | | | | | | | Add batch_iter to utils | Adrian Tschira | 2018-05-19 | 1 | -0/+18 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir | David Baker | 2018-05-24 | 2 | -0/+11 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Remove users from user directory on deactivate | David Baker | 2018-05-24 | 2 | -0/+11 | |
| * | | | | | | | | Merge pull request #3243 from NotAFile/py3-six-3 | Erik Johnston | 2018-05-24 | 6 | -11/+23 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Replace some more comparisons with six | Adrian Tschira | 2018-05-19 | 6 | -11/+23 | |
| | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-05-24 | 2 | -5/+24 | |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | ||||||
| | * | | | | | | Update CHANGES.rst v0.30.0 github/release-v0.30.0 release-v0.30.0 | Neil Johnson | 2018-05-24 | 1 | -5/+5 | |
| | * | | | | | | Update CHANGES.rst | Neil Johnson | 2018-05-24 | 1 | -1/+1 | |
| | * | | | | | | update for v0.30.0 | Neil Johnson | 2018-05-24 | 1 | -4/+23 | |
| | * | | | | | | bump version | Neil Johnson | 2018-05-24 | 1 | -1/+1 | |
| * | | | | | | | Merge pull request #3261 from matrix-org/erikj/pagination_fixes | Erik Johnston | 2018-05-24 | 1 | -9/+22 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Use iter* methods | Erik Johnston | 2018-05-22 | 1 | -7/+7 | |
| | * | | | | | | | Fix that states is a dict of dicts | Erik Johnston | 2018-05-22 | 1 | -1/+4 | |
| | * | | | | | | | get_domains_from_state returns list of tuples | Erik Johnston | 2018-05-22 | 1 | -2/+12 | |
| * | | | | | | | | Merge pull request #3267 from matrix-org/erikj/iter_filter | Erik Johnston | 2018-05-24 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| | * | | | | | | | s/values/itervalues/ | Erik Johnston | 2018-05-23 | 1 | -1/+1 | |
| | * | | | | | | | Use iter* methods for _filter_events_for_server | Erik Johnston | 2018-05-23 | 1 | -4/+4 | |
| * | | | | | | | | Merge branch 'release-v0.30.0' into develop | Richard van der Hoff | 2018-05-24 | 8 | -19/+128 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url | Richard van der Hoff | 2018-05-24 | 3 | -9/+32 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Allow overriding the server_notices user's avatar | Richard van der Hoff | 2018-05-23 | 3 | -9/+32 | |
| | * | | | | | | | | Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | | * | | | | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 4 | -8/+55 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Use the localpart in the consent uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 | |
| | * | | | | | | | | | Merge docs on consent bits from PR #3268 into release branch | Richard van der Hoff | 2018-05-23 | 4 | -23/+271 | |
| | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages | Richard van der Hoff | 2018-05-23 | 3 | -7/+50 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Support for putting %(consent_uri)s in messages | Richard van der Hoff | 2018-05-23 | 3 | -7/+50 | |
| | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | | fix typo | Richard van der Hoff | 2018-05-23 | 1 | -1/+1 | |
| | * | | | | | | | | | Merge pull request #3270 from matrix-org/rav/block_remote_server_notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | | * | | | | | | | | Block attempts to send server notices to remote users | Richard van der Hoff | 2018-05-23 | 1 | -0/+4 | |
| | |/ / / / / / / / | ||||||
| | * | | | | | | | | style v0.30.0-rc1 | Neil Johnson | 2018-05-23 | 1 | -3/+4 | |
| | * | | | | | | | | bump version and changelog | Neil Johnson | 2018-05-23 | 2 | -1/+37 | |
| | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #3268 from matrix-org/rav/privacy_policy_docs | Richard van der Hoff | 2018-05-23 | 4 | -23/+271 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | ||||||
| | * | | | | | | consent_tracking.md: clarify link | Richard van der Hoff | 2018-05-23 | 1 | -1/+1 | |
| | * | | | | | | minor post-review tweaks | Richard van der Hoff | 2018-05-23 | 2 | -5/+5 | |
| | * | | | | | | mention public_baseurl | Richard van der Hoff | 2018-05-23 | 1 | -0/+9 | |
| | * | | | | | | fix wrapping | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 | |
| | * | | | | | | Using the manhole to send server notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+13 | |
| | * | | | | | | Notes on the manhole | Richard van der Hoff | 2018-05-23 | 1 | -0/+43 | |
| | * | | | | | | consent_tracking: formatting etc | Richard van der Hoff | 2018-05-23 | 1 | -8/+7 | |
| | * | | | | | | server_notices.md: fix link | Richard van der Hoff | 2018-05-23 | 1 | -2/+2 | |
| | * | | | | | | consent tracking docs | Richard van der Hoff | 2018-05-23 | 3 | -25/+154 | |
| | * | | | | | | Some docs about server notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+53 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #3265 from matrix-org/erikj/limit_pagination | Erik Johnston | 2018-05-22 | 1 | -9/+6 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Remove unused string formatting param | Erik Johnston | 2018-05-22 | 1 | -1/+0 | |
| | * | | | | | | Don't support limitless pagination | Erik Johnston | 2018-05-22 | 1 | -8/+6 | |
| |/ / / / / / | ||||||
| * | | | | | | fix synchrotron | hera | 2018-05-22 | 1 | -1/+1 | |
| * | | | | | | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 2 | -0/+2 | |
| | |_|_|_|/ |/| | | | | ||||||
| * | | | | | comment typo | David Baker | 2018-05-22 | 1 | -1/+1 | |
| | |_|_|/ |/| | | | ||||||
| | | | * | pepeightttt | Amber Brown | 2018-05-23 | 1 | -0/+1 | |
| | | | * | add back CPU metrics | Amber Brown | 2018-05-23 | 1 | -1/+35 | |
| | | | * | fixes | Amber Brown | 2018-05-23 | 3 | -13/+13 | |
| | | | * | more cleanup | Amber Brown | 2018-05-22 | 3 | -9/+11 | |
| | | | * | cleanup | Amber Brown | 2018-05-22 | 9 | -29/+64 | |
| | | | * | cleanup pep8 errors | Amber Brown | 2018-05-22 | 5 | -37/+114 | |
| | | | * | tests/metrics is gone now | Amber Brown | 2018-05-22 | 1 | -1/+1 | |
| | | | * | fixes | Amber Brown | 2018-05-22 | 7 | -24/+52 | |
| | | | * | fix the test failures | Amber Brown | 2018-05-22 | 1 | -1/+1 | |
| | | | * | update gitignore to remove some files that got put on my machine | Amber Brown | 2018-05-22 | 1 | -0/+3 | |
| | | | * | cleanups, self-registration | Amber Brown | 2018-05-22 | 3 | -19/+12 | |
| | | | * | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 55 | -210/+1780 | |
| | | | |\ | |_|_|/ |/| | | | ||||||
| * | | | | Merge pull request #3262 from matrix-org/rav/has_already_consented | Richard van der Hoff | 2018-05-22 | 3 | -5/+25 | |
| |\ \ \ \ | ||||||
| | * | | | | Add a 'has_consented' template var to consent forms | Richard van der Hoff | 2018-05-22 | 3 | -4/+21 | |
| | * | | | | Enable auto-escaping for the consent templates | Richard van der Hoff | 2018-05-22 | 1 | -1/+4 | |
| * | | | | | Merge pull request #3263 from matrix-org/rav/fix_jinja_dep | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| | * | | | | Fix dependency on jinja2 | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #3257 from matrix-org/rav/fonx_on_no_consent | Richard van der Hoff | 2018-05-22 | 6 | -2/+179 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 6 | -2/+179 | |
| |/ / / | ||||||
| * | | | Merge pull request #3236 from matrix-org/rav/consent_notice | Richard van der Hoff | 2018-05-22 | 15 | -21/+331 | |
| |\ \ \ | ||||||
| | * | | | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 6 | -8/+66 | |
| | * | | | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 4 | -15/+21 | |
| | * | | | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 11 | -11/+255 | |
| | * | | | Rename 'version' param on user consent config | Richard van der Hoff | 2018-05-22 | 2 | -5/+7 | |
| * | | | | Merge pull request #3258 from matrix-org/erikj/fixup_logcontext_rusage | Erik Johnston | 2018-05-22 | 1 | -11/+27 | |
| |\ \ \ \ | ||||||
| | * | | | | Comment | Erik Johnston | 2018-05-22 | 1 | -1/+1 | |
| | * | | | | Fix logcontext resource usage tracking | Erik Johnston | 2018-05-22 | 1 | -11/+27 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #3252 from matrix-org/erikj/in_flight_requests | Erik Johnston | 2018-05-22 | 2 | -2/+162 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | Don't store context | Erik Johnston | 2018-05-22 | 1 | -8/+5 | |
| | * | | | Move in_flight_requests_count to be a callback metric | Erik Johnston | 2018-05-22 | 1 | -10/+21 | |
| | * | | | Add in flight request metrics | Erik Johnston | 2018-05-21 | 2 | -2/+154 | |
| | |/ / | ||||||
| * | | | Merge pull request #3255 from matrix-org/rav/fix_transactions | Richard van der Hoff | 2018-05-21 | 2 | -21/+96 | |
| |\ \ \ | ||||||
| | * | | | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 2 | -25/+42 | |
| | * | | | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 2 | -9/+67 | |
| * | | | | Merge pull request #3251 from matrix-org/cohort_analytics | Neil Johnson | 2018-05-21 | 1 | -1/+5 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | Tighter filtering for user_daily_visits | Neil Johnson | 2018-05-18 | 1 | -1/+5 | |
| | |/ / | ||||||
| * | | | Merge pull request #3239 from ptman/develop | Michael Kaye | 2018-05-21 | 1 | -2/+2 | |
| |\ \ \ | |/ / |/| | | ||||||
| | * | | Add lxml to docker image for web previews | Paul Tötterman | 2018-05-18 | 1 | -2/+2 | |
| * | | | Merge pull request #3241 from matrix-org/fix_user_visits_insertion | Neil Johnson | 2018-05-18 | 1 | -1/+1 | |
| |\ \ \ | |/ / |/| | | ||||||
| | * | | fix psql compatability bug | Neil Johnson | 2018-05-18 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge branch 'master' into develop | Neil Johnson | 2018-05-18 | 5 | -19/+45 | |
| |\ \ | ||||||
| * \ \ | Merge pull request #3232 from matrix-org/rav/server_notices_room | Richard van der Hoff | 2018-05-18 | 10 | -7/+309 | |
| |\ \ \ | ||||||
| | * | | | Better docstrings | Richard van der Hoff | 2018-05-18 | 1 | -0/+16 | |
| | * | | | Make sure we reject attempts to invite the notices user | Richard van der Hoff | 2018-05-18 | 3 | -0/+20 | |
| | * | | | Replace inline docstrings with "Attributes" in class docstring | Richard van der Hoff | 2018-05-18 | 1 | -23/+15 | |
| | * | | | fix missing yield for server_notices_room | Richard van der Hoff | 2018-05-17 | 1 | -3/+4 | |
| | * | | | Infrastructure for a server notices room | Richard van der Hoff | 2018-05-17 | 9 | -7/+280 | |
| * | | | | Merge pull request #3235 from matrix-org/rav/fix_receipts_deferred | Richard van der Hoff | 2018-05-18 | 1 | -7/+11 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix error in handling receipts | Richard van der Hoff | 2018-05-18 | 1 | -7/+11 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #3233 from matrix-org/rav/remove_dead_code | Richard van der Hoff | 2018-05-18 | 1 | -55/+0 | |
| |\ \ \ \ | ||||||
| | * | | | | Remove unused `update_external_syncs` | Richard van der Hoff | 2018-05-17 | 1 | -55/+0 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 3 | -37/+69 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | Clarify comment | Erik Johnston | 2018-05-16 | 1 | -1/+2 | |
| | * | | | Comments | Erik Johnston | 2018-05-16 | 1 | -0/+8 | |
| | * | | | Move and rename variable | Erik Johnston | 2018-05-16 | 1 | -3/+3 | |
| | * | | | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 3 | -21/+25 | |
| | * | | | Use events_to_purge table rather than token | Erik Johnston | 2018-05-15 | 1 | -15/+34 | |
| * | | | | Merge pull request #3225 from matrix-org/rav/move_creation_handler | Richard van der Hoff | 2018-05-17 | 6 | -11/+19 | |
| |\ \ \ \ | ||||||
| | * | | | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 6 | -11/+19 | |
| * | | | | | Merge pull request #3212 from matrix-org/erikj/epa_stream | Erik Johnston | 2018-05-17 | 3 | -40/+18 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Use stream rather depth ordering for push actions | Erik Johnston | 2018-05-11 | 3 | -40/+18 | |
| * | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-05-16 | 2 | -3/+71 | |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | | Merge pull request #3163 from matrix-org/cohort_analytics | Neil Johnson | 2018-05-16 | 7 | -5/+122 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | remove empty line | Neil Johnson | 2018-05-16 | 1 | -1/+0 | |
| | * | | | | | | remove unused method recurring_user_daily_visit_stats | Neil Johnson | 2018-05-16 | 1 | -3/+0 | |
| | * | | | | | | style and further contraining query | Neil Johnson | 2018-05-16 | 1 | -8/+12 | |
| | * | | | | | | pep8 | Neil Johnson | 2018-05-15 | 1 | -1/+0 | |
| | * | | | | | | Limit query load of generate_user_daily_visits | Neil Johnson | 2018-05-15 | 2 | -27/+54 | |
| | * | | | | | | instead of inserting user daily visit data at the end of the day, instead ins... | Neil Johnson | 2018-05-14 | 2 | -43/+30 | |
| | * | | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_a... | Neil Johnson | 2018-05-14 | 120 | -1181/+2386 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | remove user agent from data model, will just join on user_ips | Neil Johnson | 2018-05-01 | 1 | -12/+11 | |
| | * | | | | | | | add inidexes based on usage | Neil Johnson | 2018-05-01 | 1 | -6/+2 | |
| | * | | | | | | | 10 mins seems more reasonable that every minute | Neil Johnson | 2018-05-01 | 1 | -1/+1 | |
| | * | | | | | | | pep8 | Neil Johnson | 2018-04-25 | 1 | -3/+4 | |
| | * | | | | | | | Generate user daily stats | Neil Johnson | 2018-04-25 | 6 | -5/+112 | |
| | * | | | | | | | ignore atom editor python ide files | Neil Johnson | 2018-04-25 | 1 | -0/+1 | |
| * | | | | | | | | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 14 | -5/+446 | |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| | * | | | | | | | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 14 | -5/+446 | |
| | | | | | | | * | rest of the changes | Amber Brown | 2018-05-21 | 8 | -337/+68 | |
| | | | | | | | * | replacing portions | Amber Brown | 2018-05-21 | 23 | -414/+268 | |
| | | | | | | | * | don't need the resource portion | Amber Brown | 2018-05-21 | 1 | -23/+0 | |
| | | | | | | | * | look at the Prometheus metrics instead | Amber Brown | 2018-05-21 | 1 | -5/+3 | |
| | | | | | | | * | remove old metrics libs | Amber Brown | 2018-05-21 | 2 | -450/+0 | |
| | | | | | | |/ | ||||||
| | | | | | | * | Merge tag 'v0.29.1' | Neil Johnson | 2018-05-18 | 4 | -10/+22 | |
| | | | | | | |\ | ||||||
| | | | | | | | * | 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.0 | Neil Johnson | 2018-05-18 | 2 | -2/+8 | |
| | | | | | | | |\ | ||||||
| | | | | | | | | * | bump version, change log | Neil Johnson | 2018-05-17 | 2 | -2/+8 | |
| | | | | | |_|_|/ | | | | |/| | | | ||||||
| | | | | | | | * | light grammar changes | Neil Johnson | 2018-05-17 | 1 | -4/+4 | |
| | | | | | | | * | Note that secrets need to be retained. | Michael Kaye | 2018-05-17 | 1 | -2/+7 | |
| | | | | | | | * | Document macaroon env var correctly | Michael Kaye | 2018-05-17 | 1 | -2/+2 | |
| | | | | | | | * | Reference synapse docker image and docker-compose | Michael Kaye | 2018-05-17 | 1 | -2/+3 | |
| | | | | | |_|/ | | | | |/| | | ||||||
| | | | | | | * | Merge pull request #1756 from rubo77/patch-4 | Richard van der Hoff | 2018-05-17 | 1 | -9/+23 | |
| | | | | | |/| | | | | |/| | | ||||||
| | | | | | | * | postgres.rst: Add instructions how to setup the postgres user and clarify the... | rubo77 | 2018-05-17 | 1 | -9/+23 | |
| | | | | | |/ | | | | |/| | ||||||
| | | | | * | | bump version and changelog for 0.29.0 v0.29.0 | Neil Johnson | 2018-05-16 | 2 | -1/+5 | |
| | | | | * | | further musical chairs | Neil Johnson | 2018-05-14 | 1 | -2/+3 | |
| | | | | * | | rearrange and collect related PRs | Neil Johnson | 2018-05-14 | 1 | -26/+27 | |
| | | | | * | | v0.29.0-rc1: bump version and change log v0.29.0-rc1 | Neil Johnson | 2018-05-14 | 2 | -3/+65 | |
| | |_|_|/ / |/| | | | | ||||||
| * | | | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate | David Baker | 2018-05-14 | 3 | -2/+143 | |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| | * | | | | Catch failure to part user from room | David Baker | 2018-05-10 | 1 | -7/+13 | |
| | * | | | | Many docstrings | David Baker | 2018-05-10 | 2 | -0/+36 | |
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |