Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add note that the affinity package is required for the cpu_affinity setting | Vincent Breitmoser | 2018-06-09 | 1 | -0/+2 |
* | Merge tag 'v0.31.1' | Neil Johnson | 2018-06-08 | 2 | -1/+5 |
|\ | |||||
| * | changelog a bump version | Neil Johnson | 2018-06-08 | 1 | -1/+1 |
| * | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
* | | Merge tag 'v0.31.0' | Neil Johnson | 2018-06-06 | 100 | -1416/+1218 |
|\| | |||||
| * | bump version and changelog | Neil Johnson | 2018-06-06 | 1 | -1/+1 |
| * | Merge commit 'b7e7fd2' into release-v0.31.0 | Richard van der Hoff | 2018-06-06 | 2 | -5/+8 |
| |\ | |||||
| | * | 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 |
| * | | bump version and changelog v0.31.0-rc1 | Neil Johnson | 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 |
| * | | | 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 |
| | |/ | |/| | |||||
| * | | Run Prometheus on a different port, optionally. (#3274) | Amber Brown | 2018-05-31 | 15 | -15/+126 |
| * | | 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 |
| * | | | | Update some comments and docstrings in SyncHandler | Richard van der Hoff | 2018-05-29 | 1 | -1/+11 |
| * | | | | Exempt AS-registered users from doing gdpr | Richard van der Hoff | 2018-05-29 | 2 | -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 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 | 42 | -174/+353 |
| |\ \ \ | |||||
| | * | | | 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 | 1 | -10/+14 |
| | |\ \ \ | |||||
| | | * | | | Let users leave the server notice room after joining | Richard van der Hoff | 2018-05-25 | 1 | -10/+14 |
| | * | | | | 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 |
| | | |/ / / | |||||
| | * / / / | 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 | 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 |
| * | | | | | | | 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 |
| * | | | | | | | fixes | Amber Brown | 2018-05-22 | 7 | -24/+52 |
| * | | | | | | | fix the test failures | Amber Brown | 2018-05-22 | 1 | -1/+1 |
| * | | | | | | | 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 | 46 | -203/+1633 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | rest of the changes | Amber Brown | 2018-05-21 | 6 | -145/+68 |
| * | | | | | | | replacing portions | Amber Brown | 2018-05-21 | 22 | -414/+265 |
| * | | | | | | | 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 |
* | | | | | | | | 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 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | bump version | Neil Johnson | 2018-05-24 | 1 | -1/+1 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url | Richard van der Hoff | 2018-05-24 | 2 | -6/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow overriding the server_notices user's avatar | Richard van der Hoff | 2018-05-23 | 2 | -6/+26 |
* | | | | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 4 | -8/+55 |
|\| | | | | | | |||||
| * | | | | | | 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 |
| * | | | | | | | Block attempts to send server notices to remote users | Richard van der Hoff | 2018-05-23 | 1 | -0/+4 |
| |/ / / / / / | |||||
* / / / / / / | Use the localpart in the consent uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
|/ / / / / / | |||||
* | | / / / | bump version and changelog | Neil Johnson | 2018-05-23 | 1 | -1/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | 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 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #3262 from matrix-org/rav/has_already_consented | Richard van der Hoff | 2018-05-22 | 1 | -4/+18 |
|\ \ \ \ | |||||
| * | | | | Add a 'has_consented' template var to consent forms | Richard van der Hoff | 2018-05-22 | 1 | -3/+14 |
| * | | | | Enable auto-escaping for the consent templates | Richard van der Hoff | 2018-05-22 | 1 | -1/+4 |
* | | | | | Fix dependency on jinja2 | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
|/ / / / | |||||
* | / / | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 5 | -2/+178 |
| |/ / |/| | | |||||
* | | | Merge pull request #3236 from matrix-org/rav/consent_notice | Richard van der Hoff | 2018-05-22 | 13 | -18/+322 |
|\ \ \ | |||||
| * | | | 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 | 3 | -14/+20 |
| * | | | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 9 | -8/+246 |
| * | | | Rename 'version' param on user consent config | Richard van der Hoff | 2018-05-22 | 2 | -5/+7 |
* | | | | 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 | 1 | -21/+21 |
|\ \ \ | |||||
| * | | | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 1 | -25/+21 |
| * | | | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 1 | -9/+13 |
| |/ / | |||||
* / / | Tighter filtering for user_daily_visits | Neil Johnson | 2018-05-18 | 1 | -1/+5 |
|/ / | |||||
* | | fix psql compatability bug | Neil Johnson | 2018-05-18 | 1 | -1/+1 |
* | | Merge branch 'master' into develop | Neil Johnson | 2018-05-18 | 1 | -1/+1 |
|\| | |||||
| * | bump version, change log | Neil Johnson | 2018-05-17 | 1 | -1/+1 |
* | | 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 | 2 | -38/+16 |
|\ \ \ \ | |||||
| * | | | | Use stream rather depth ordering for push actions | Erik Johnston | 2018-05-11 | 2 | -38/+16 |
* | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-05-16 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | bump version and changelog for 0.29.0 v0.29.0 | Neil Johnson | 2018-05-16 | 1 | -1/+1 |
| * | | | v0.29.0-rc1: bump version and change log v0.29.0-rc1 | Neil Johnson | 2018-05-14 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #3163 from matrix-org/cohort_analytics | Neil Johnson | 2018-05-16 | 6 | -5/+121 |
|\ \ \ | |||||
| * | | | 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 | 95 | -1117/+1616 |
| |\ \ \ | |||||
| * | | | | 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 |
* | | | | | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 11 | -5/+395 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 11 | -5/+395 |
* | | | | | 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 |
| * | | | | Oops, don't call function passed to run_in_background | David Baker | 2018-05-10 | 1 | -1/+1 |
| * | | | | Prefix internal functions | David Baker | 2018-05-09 | 1 | -7/+7 |
| * | | | | Add the schema file | David Baker | 2018-05-09 | 1 | -0/+25 |
| * | | | | Indent fail | David Baker | 2018-05-09 | 1 | -1/+1 |
| * | | | | Part deactivated users in the background | David Baker | 2018-05-09 | 2 | -1/+61 |
| * | | | | Part user from rooms on account deactivate | David Baker | 2018-05-08 | 1 | -1/+15 |
* | | | | | Merge pull request #3208 from matrix-org/rav/more_refactor_request_handler | Richard van der Hoff | 2018-05-11 | 23 | -27/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 23 | -27/+28 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #3209 from damir-manapov/master | Richard van der Hoff | 2018-05-11 | 1 | -2/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | transaction_id, destination twice | Damir Manapov | 2018-05-10 | 1 | -2/+0 |
* | | | | | Remove redundant request_handler decorator | Richard van der Hoff | 2018-05-10 | 7 | -38/+42 |
* | | | | | Factor wrap_request_handler_with_logging out of wrap_request_handler | Richard van der Hoff | 2018-05-10 | 1 | -54/+66 |
* | | | | | Remove include_metrics param | Richard van der Hoff | 2018-05-10 | 1 | -17/+7 |
* | | | | | Move outgoing_responses_counter handling to RequestMetrics | Richard van der Hoff | 2018-05-10 | 2 | -4/+2 |
* | | | | | Bump requests_counter in wrapped_request_handler | Richard van der Hoff | 2018-05-10 | 1 | -4/+11 |
* | | | | | Move RequestMetrics handling into SynapseRequest.processing() | Richard van der Hoff | 2018-05-10 | 2 | -24/+64 |
* | | | | | Make RequestMetrics take a raw time rather than a clock | Richard van der Hoff | 2018-05-10 | 2 | -6/+6 |
* | | | | | Move request_id management into SynapseRequest | Richard van der Hoff | 2018-05-10 | 2 | -15/+25 |
* | | | | | Move RequestsMetrics to its own file | Richard van der Hoff | 2018-05-09 | 2 | -124/+151 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #3199 from matrix-org/erikj/pagination_sync | Erik Johnston | 2018-05-09 | 2 | -45/+54 |
|\ \ \ \ | |||||
| * | | | | Add comment to sync as to why code path is split | Erik Johnston | 2018-05-09 | 1 | -0/+5 |
| * | | | | Refactor sync APIs to reuse pagination API | Erik Johnston | 2018-05-09 | 2 | -44/+48 |
| * | | | | Don't unnecessarily require token to be stream token | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
* | | | | | Merge pull request #3198 from matrix-org/erikj/fixup_return_pagination | Erik Johnston | 2018-05-09 | 3 | -8/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Fix returned token is no longer a tuple | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| * | | | | | Fix up comment | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_retu... | Erik Johnston | 2018-05-09 | 3 | -8/+10 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Refactor get_recent_events_for_room return type | Erik Johnston | 2018-05-09 | 3 | -7/+21 |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_mem... | Erik Johnston | 2018-05-09 | 3 | -8/+10 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #3196 from matrix-org/erikj/pagination_return | Erik Johnston | 2018-05-09 | 1 | -28/+49 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update comments | Erik Johnston | 2018-05-09 | 1 | -5/+6 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3195 from matrix-org/erikj/pagination_refactor | Erik Johnston | 2018-05-09 | 1 | -51/+27 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #3193 from matrix-org/erikj/pagination_refactor | Erik Johnston | 2018-05-09 | 1 | -110/+99 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3190 from mujx/notif-token-fix | Richard van der Hoff | 2018-05-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | notifications: Convert next_token to string according to the spec | Konstantinos Sideris | 2018-05-05 | 1 | -1/+1 |
| * | | | | | | | Note that label values can be anything | Erik Johnston | 2018-05-03 | 1 | -1/+2 |
| * | | | | | | | Fix metrics that have integer value labels | Erik Johnston | 2018-05-03 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | / / / | Remove unused code path from member change DB func | Erik Johnston | 2018-05-09 | 1 | -24/+10 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Refactor pagination DB API to return concrete type | Erik Johnston | 2018-05-09 | 1 | -28/+48 |
| |_|/ / / |/| | | | | |||||
* | | | | | Remove unused from_token param | Erik Johnston | 2018-05-09 | 1 | -7/+4 |
* | | | | | Refactor recent events func to use pagination func | Erik Johnston | 2018-05-09 | 1 | -48/+27 |
| |/ / / |/| | | | |||||
* | | | | Fix up comments and make function private | Erik Johnston | 2018-05-09 | 1 | -7/+7 |
* | | | | Reuse existing pagination code for context API | Erik Johnston | 2018-05-08 | 1 | -75/+15 |
* | | | | Parse tokens before calling DB function | Erik Johnston | 2018-05-08 | 1 | -14/+18 |
* | | | | Only fetch required fields from database | Erik Johnston | 2018-05-08 | 1 | -1/+2 |
* | | | | Split paginate_room_events storage function | Erik Johnston | 2018-05-08 | 1 | -28/+72 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail | Richard van der Hoff | 2018-05-03 | 137 | -1294/+2609 |
|\ \ \ | |||||
| * \ \ | Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks | Richard van der Hoff | 2018-05-03 | 1 | -3/+14 |
| |\ \ \ | |||||
| | * | | | Fix logcontext leaks in rate limiter | Richard van der Hoff | 2018-05-03 | 1 | -3/+14 |
| * | | | | Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown | Richard van der Hoff | 2018-05-03 | 1 | -3/+8 |
| |\ \ \ \ | |||||
| | * | | | | Don't abortConnection() if the transport connection has already closed. | Will Hunt | 2018-05-03 | 1 | -3/+8 |
| * | | | | | Merge pull request #3178 from matrix-org/rav/fix_request_timeouts | Richard van der Hoff | 2018-05-03 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | add missing param to cancelled_to_request_timed_out_error | Richard van der Hoff | 2018-05-02 | 1 | -1/+1 |
| * | | | | | Merge pull request #3141 from matrix-org/erikj/fixup_state | Erik Johnston | 2018-05-03 | 1 | -37/+67 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix up grammar | Erik Johnston | 2018-05-03 | 1 | -3/+3 |
| | * | | | | | Refactor event storage to not require state | Erik Johnston | 2018-04-27 | 1 | -37/+67 |
| * | | | | | | Merge pull request #3161 from NotAFile/remove-v1auth | Richard van der Hoff | 2018-05-03 | 3 | -12/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Burminate v1auth | Adrian Tschira | 2018-04-30 | 3 | -12/+6 |
| * | | | | | | | Merge pull request #3175 from matrix-org/erikj/escape_metric_values | Erik Johnston | 2018-05-03 | 1 | -2/+28 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | Make _escape_character take MatchObject | Erik Johnston | 2018-05-02 | 1 | -2/+10 |
| | * | | | | | | Escape label values in prometheus metrics | Erik Johnston | 2018-05-02 | 1 | -2/+20 |
| * | | | | | | | Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 1 | -22/+38 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Merge branch 'develop' into rav/more_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 2 | -2/+2 |
| | |\| | | | | | | |||||
| | * | | | | | | | Fix a class of logcontext leaks | Richard van der Hoff | 2018-05-02 | 1 | -22/+38 |
| * | | | | | | | | Fix logcontext leak in media repo | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #3168 from matrix-org/rav/fix_logformatter | Richard van der Hoff | 2018-05-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix incorrect reference to StringIO | Richard van der Hoff | 2018-05-02 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-05-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Update __init__.py | Neil Johnson | 2018-05-01 | 1 | -1/+1 |
| * | | | | | | Merge branch 'release-v0.28.1' into develop | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 |
| |\| | | | | | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge commit '33f469b' into release-v0.28.1 | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 |
| | |\ \ \ \ | |||||
| | | * | | | | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 |
| | | |/ / / | |||||
| | * / / / | Miscellaneous fixes to python_dependencies | Richard van der Hoff | 2018-05-01 | 1 | -1/+19 |
| | |/ / / | |||||
| * | | | | Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157) | Will Hunt | 2018-04-30 | 2 | -8/+8 |
| * | | | | add guard for None on purge_history api | Krombel | 2018-04-30 | 1 | -1/+14 |
| * | | | | Merge pull request #3129 from matrix-org/matthew/fix_group_dups | Matthew Hodgson | 2018-04-30 | 1 | -0/+57 |
| |\ \ \ \ | |||||
| | * | | | | fix missing import | Matthew Hodgson | 2018-04-28 | 1 | -0/+1 |
| | * | | | | pep8 | Matthew Hodgson | 2018-04-28 | 1 | -3/+5 |
| | * | | | | make it work with sqlite | Matthew Hodgson | 2018-04-28 | 2 | -34/+54 |
| | * | | | | remove duplicates from groups tables | Matthew Hodgson | 2018-04-25 | 1 | -0/+34 |
| | | |_|/ | | |/| | |