Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update __init__.py | Neil Johnson | 2018-05-01 | 1 | -1/+1 |
* | 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 |
|/ | |||||
* | update changelog and bump version to 0.28.0 v0.28.0 release-v0.28.0-rc1 | Neil Johnson | 2018-04-26 | 2 | -1/+10 |
* | Merge branch 'develop' of https://github.com/matrix-org/synapse into release-... | Neil Johnson | 2018-04-26 | 2 | -4/+4 |
|\ | |||||
| * | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api | Erik Johnston | 2018-04-26 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix media admin APIs | Erik Johnston | 2018-04-26 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #3130 from matrix-org/erikj/fix_quarantine_room | Erik Johnston | 2018-04-25 | 2 | -2/+2 |
| |\ | |||||
| | * | Also fix reindexing of search | Erik Johnston | 2018-04-25 | 1 | -1/+1 |
| | * | Fix quarantine media admin API | Erik Johnston | 2018-04-25 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' into develop | Neil Johnson | 2018-04-24 | 2 | -3/+44 |
| |\ | |||||
| * | | Revert "Bump version and update changelog" | Neil Johnson | 2018-04-24 | 2 | -41/+3 |
| * | | Bump version and update changelog | Neil Johnson | 2018-04-24 | 2 | -3/+41 |
* | | | Update CHANGES.rst | Neil Johnson | 2018-04-24 | 1 | -2/+1 |
| |/ |/| | |||||
* | | Bump version and update changelog v0.28.0-rc1 | Neil Johnson | 2018-04-24 | 2 | -3/+44 |
|/ | |||||
* | Merge pull request #3118 from matrix-org/rav/reject_prev_events | Richard van der Hoff | 2018-04-23 | 2 | -9/+94 |
|\ | |||||
| * | Remove spurious param | Richard van der Hoff | 2018-04-23 | 1 | -1/+0 |
| * | accept stupid events over backfill | Richard van der Hoff | 2018-04-20 | 1 | -4/+9 |
| * | Add some comments | Richard van der Hoff | 2018-04-18 | 2 | -5/+35 |
| * | Check events on backfill too | Richard van der Hoff | 2018-04-18 | 1 | -15/+42 |
| * | Reject events which have too many auth_events or prev_events | Richard van der Hoff | 2018-04-18 | 1 | -4/+28 |
* | | Merge pull request #3109 from NotAFile/py3-tests-fix | Richard van der Hoff | 2018-04-23 | 5 | -5/+6 |
|\ \ | |||||
| * | | Make tests py3 compatible | Adrian Tschira | 2018-04-16 | 5 | -5/+6 |
* | | | Merge pull request #3106 from NotAFile/py3-six-itervalues-1 | Richard van der Hoff | 2018-04-20 | 4 | -11/+18 |
|\ \ \ | |||||
| * | | | Use six.itervalues in some places | Adrian Tschira | 2018-04-15 | 4 | -11/+18 |
| |/ / | |||||
* | | | Merge pull request #3107 from NotAFile/py3-bool-nonzero | Richard van der Hoff | 2018-04-20 | 3 | -0/+9 |
|\ \ \ | |||||
| * | | | add __bool__ alias to __nonzero__ methods | Adrian Tschira | 2018-04-15 | 3 | -0/+9 |
| |/ / | |||||
* | | | Merge pull request #3104 from NotAFile/py3-unittest-config | Richard van der Hoff | 2018-04-20 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Add some more variables to the unittest config | Adrian Tschira | 2018-04-15 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #3110 from NotAFile/py3-six-queue | Richard van der Hoff | 2018-04-20 | 2 | -4/+6 |
|\ \ \ | |||||
| * | | | Replace Queue with six.moves.queue | Adrian Tschira | 2018-04-16 | 2 | -4/+6 |
| |/ / | |||||
* | | | Merge pull request #3103 from NotAFile/py3-baseexcepton-message | Richard van der Hoff | 2018-04-20 | 2 | -10/+10 |
|\ \ \ | |||||
| * | | | Use str(e) instead of e.message | Adrian Tschira | 2018-04-15 | 2 | -10/+10 |
| |/ / | |||||
* | | | Merge pull request #3100 from silkeh/readme-srv-cname | Erik Johnston | 2018-04-20 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | Clarify that SRV may not point to a CNAME | Silke | 2018-04-14 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #3125 from matrix-org/erikj/add_contrib_docs | Erik Johnston | 2018-04-20 | 2 | -0/+14 |
|\ \ \ | |||||
| * | | | Document contrib directory | Erik Johnston | 2018-04-20 | 2 | -0/+14 |
|/ / / | |||||
* | | | Merge pull request #3093 from matrix-org/rav/response_cache_wrap | Richard van der Hoff | 2018-04-20 | 6 | -79/+111 |
|\ \ \ | |||||
| * | | | Reinstate linearizer for federation_server.on_context_state_request | Richard van der Hoff | 2018-04-20 | 1 | -5/+11 |
| * | | | ResponseCache: fix handling of completed results | Richard van der Hoff | 2018-04-13 | 1 | -13/+19 |
| * | | | Refactor ResponseCache usage | Richard van der Hoff | 2018-04-12 | 6 | -67/+87 |
* | | | | Merge pull request #3117 from matrix-org/rav/refactor_have_events | Richard van der Hoff | 2018-04-20 | 3 | -27/+55 |
|\ \ \ \ | |||||
| * | | | | Refactor store.have_events | Richard van der Hoff | 2018-04-20 | 3 | -27/+55 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3113 from matrix-org/rav/fix_huge_prev_events | Richard van der Hoff | 2018-04-18 | 4 | -54/+162 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 4 | -54/+162 |
|/ / / | |||||
* | / | fix spurious changelog dup | Matthew Hodgson | 2018-04-15 | 1 | -1/+0 |
| |/ |/| | |||||
* | | Merge branch 'master' of https://github.com/matrix-org/synapse into develop | Neil Johnson | 2018-04-13 | 3 | -2/+10 |
|\ \ | |||||
| * \ | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse | Neil Johnson | 2018-04-13 | 3 | -2/+10 |
| |\ \ | |||||
| | * | | Bump version and Change log v0.27.4 release-v0.27.0 | Neil Johnson | 2018-04-13 | 2 | -1/+9 |
| | * | | Merge pull request #3095 from matrix-org/rav/bump_canonical_json | Neil Johnson | 2018-04-13 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Bump canonicaljson to 1.1.3 | Richard van der Hoff | 2018-04-13 | 1 | -1/+1 |
| | | * | | Update canonicaljson dependency | Richard van der Hoff | 2018-04-12 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | Merge pull request #3099 from matrix-org/matthew/fix-federation-domain-whitelist | Matthew Hodgson | 2018-04-13 | 1 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | fix federation_domain_whitelist | Matthew Hodgson | 2018-04-13 | 1 | -6/+6 |
|/ / / / | |||||
* | | | | revert last to PR properly | Matthew Hodgson | 2018-04-13 | 1 | -6/+6 |
* | | | | correctly auth inbound federation_domain_whitelist reqs | Matthew Hodgson | 2018-04-13 | 1 | -6/+6 |
* | | | | Merge branch 'master' of https://github.com/matrix-org/synapse into develop | Neil Johnson | 2018-04-13 | 3 | -3/+11 |
|\| | | | |||||
| * | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3 | Neil Johnson | 2018-04-11 | 51 | -278/+956 |
| |\| | | |||||
| | * | | bump version/changelog | Neil Johnson | 2018-04-11 | 2 | -1/+9 |
| | * | | Merge commit '11d2609da70af797405241cdf7d9df19db5628f2' of https://github.com... | Neil Johnson | 2018-04-11 | 1 | -48/+80 |
| | |\ \ | |||||
| * | | | | Update README.rst | Neil Johnson | 2018-03-28 | 1 | -2/+2 |
* | | | | | Revert "Use sortedcontainers instead of blist" | Richard van der Hoff | 2018-04-13 | 3 | -10/+10 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #3092 from matrix-org/rav/response_cache_metrics | Richard van der Hoff | 2018-04-12 | 6 | -7/+21 |
|\ \ \ \ | |||||
| * | | | | Add metrics for ResponseCache | Richard van der Hoff | 2018-04-10 | 6 | -7/+21 |
* | | | | | Merge pull request #3090 from matrix-org/erikj/processed_event_lag | Erik Johnston | 2018-04-12 | 7 | -5/+121 |
|\ \ \ \ \ | |||||
| * | | | | | Format docstring | Erik Johnston | 2018-04-12 | 1 | -2/+3 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/processed_... | Erik Johnston | 2018-04-12 | 2 | -2/+51 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3059 from matrix-org/rav/doc_response_cache | Richard van der Hoff | 2018-04-12 | 1 | -0/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Document the behaviour of ResponseCache | Richard van der Hoff | 2018-04-04 | 1 | -0/+32 |
* | | | | | | | Merge pull request #3088 from matrix-org/erikj/as_parallel | Erik Johnston | 2018-04-12 | 1 | -2/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Send events to ASes concurrently | Erik Johnston | 2018-04-11 | 1 | -2/+19 |
| | | * | | | | | Doc we raise on unknown event | Erik Johnston | 2018-04-12 | 1 | -2/+3 |
| | | * | | | | | s/list/tuple | Erik Johnston | 2018-04-12 | 1 | -2/+2 |
| | | * | | | | | Set all metrics at the same time | Erik Johnston | 2018-04-12 | 2 | -10/+10 |
| | | * | | | | | Fix tests | Erik Johnston | 2018-04-11 | 1 | -0/+1 |
| | | * | | | | | Track last processed event received_ts | Erik Johnston | 2018-04-11 | 4 | -0/+52 |
| | | * | | | | | Track where event stream processing have gotten up to | Erik Johnston | 2018-04-11 | 4 | -0/+24 |
| | | * | | | | | Add GaugeMetric | Erik Johnston | 2018-04-11 | 2 | -1/+38 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #2760 from Valodim/pypy | Richard van der Hoff | 2018-04-11 | 7 | -13/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Don't disable GC when running on PyPy | Vincent Breitmoser | 2018-04-10 | 1 | -1/+7 |
| * | | | | | | | In DomainSpecificString, override __repr__ in addition to __str__ | Vincent Breitmoser | 2018-04-10 | 1 | -1/+1 |
| * | | | | | | | Fix pep8 error on psycopg2cffi hack | Richard van der Hoff | 2018-04-10 | 1 | -6/+5 |
| * | | | | | | | Use psycopg2cffi module instead of psycopg2 if running on pypy | Vincent Breitmoser | 2018-04-10 | 2 | -2/+8 |
| * | | | | | | | Use sortedcontainers instead of blist | Vincent Breitmoser | 2018-04-10 | 3 | -10/+10 |
* | | | | | | | | Merge pull request #3086 from matrix-org/r30_stats | Matthew Hodgson | 2018-04-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix typo | Neil Johnson | 2018-04-10 | 1 | -2/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 2 | -55/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Note why we're limiting concurrent event sends | Erik Johnston | 2018-04-10 | 1 | -0/+5 |
| * | | | | | | | | Limit concurrent event sends for a room | Erik Johnston | 2018-04-09 | 1 | -49/+50 |
| * | | | | | | | | Use create_and_send_nonmember_event everywhere | Erik Johnston | 2018-04-09 | 1 | -6/+1 |
* | | | | | | | | | Merge pull request #3078 from matrix-org/erikj/federation_sender | Erik Johnston | 2018-04-10 | 1 | -15/+41 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use run_in_background instead | Erik Johnston | 2018-04-10 | 1 | -1/+1 |
| * | | | | | | | | | Preserve log contexts correctly | Erik Johnston | 2018-04-10 | 1 | -1/+4 |
| * | | | | | | | | | Log event ID on exception | Erik Johnston | 2018-04-10 | 1 | -1/+4 |
| * | | | | | | | | | Handle all events in a room correctly | Erik Johnston | 2018-04-09 | 1 | -1/+2 |
| * | | | | | | | | | Send federation events concurrently | Erik Johnston | 2018-04-09 | 1 | -4/+18 |
| * | | | | | | | | | Handle exceptions in get_hosts_for_room when sending events over federation | Erik Johnston | 2018-04-09 | 1 | -11/+16 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ... | Neil Johnson | 2018-04-10 | 3 | -7/+62 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | remove errant print v0.27.3-rc2 | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| * | | | | | | | Fix msec to sec, again | Neil Johnson | 2018-04-09 | 1 | -3/+3 |
| * | | | | | | | Fix msec to sec | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| * | | | | | | | v0.27.3-rc2 | Neil Johnson | 2018-04-09 | 1 | -0/+5 |
| * | | | | | | | Fix psycopg2 interpolation | Neil Johnson | 2018-04-09 | 1 | -5/+5 |
| * | | | | | | | version bump v0.27.3-rc2 | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into release-... | Neil Johnson | 2018-04-09 | 35 | -186/+728 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ... | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ... | Neil Johnson | 2018-04-09 | 1 | -4/+8 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-09 | 1 | -1/+2 |
| | * | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-09 | 1 | -3/+6 |
| * | | | | | | | | | bump version to release candidate | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | bump version v0.27.3-rc1 | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'develop' into release-v0.27.0 | Neil Johnson | 2018-04-09 | 20 | -47/+88 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 0.27.3 | Neil Johnson | 2018-04-09 | 1 | -0/+46 |
* | | | | | | | | | | Merge pull request #3082 from matrix-org/erikj/urlencode_paths | Erik Johnston | 2018-04-10 | 1 | -48/+80 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Ensure slashes are escaped | Erik Johnston | 2018-04-10 | 1 | -1/+1 |
| * | | | | | | | | URL quote path segments over federation | Erik Johnston | 2018-04-10 | 1 | -48/+80 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 3 | -34/+35 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 53 | -111/+264 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 3 | -34/+35 |
* | | | | | | | | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 6 | -14/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 6 | -14/+14 |
* | | | | | | | | | | Merge pull request #3073 from NotAFile/use-six-reraise | Richard van der Hoff | 2018-04-09 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Replace old-style raise with six.reraise | Adrian Tschira | 2018-04-06 | 1 | -1/+3 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #2938 from dklug/develop | Richard van der Hoff | 2018-04-09 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Return 401 for invalid access_token on logout | dklug | 2018-03-02 | 1 | -1/+4 |
* | | | | | | | | | | | Merge pull request #3074 from NotAFile/fix-py3-prints | Richard van der Hoff | 2018-04-09 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | use python3-compatible prints | Adrian Tschira | 2018-04-06 | 1 | -5/+5 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3075 from NotAFile/six-type-checks | Richard van der Hoff | 2018-04-09 | 5 | -8/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Replace some type checks with six type checks | Adrian Tschira | 2018-04-07 | 5 | -8/+18 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3016 from silkeh/improve-service-lookups | Richard van der Hoff | 2018-04-09 | 2 | -122/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove address resolution of hosts in SRV records | Silke | 2018-04-04 | 2 | -122/+10 |
* | | | | | | | | | | | | Merge pull request #3069 from krombel/update_prometheus_config | Richard van der Hoff | 2018-04-09 | 3 | -19/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | make prometheus config compliant to v0.28 | Krombel | 2018-04-05 | 3 | -19/+19 |
* | | | | | | | | | | | | | Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoin | Richard van der Hoff | 2018-04-09 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Return a 404 rather than a 500 on rejoining empty rooms | Richard van der Hoff | 2018-04-09 | 1 | -0/+8 |
* | | | | | | | | | | | | | Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics" | Richard van der Hoff | 2018-04-09 | 5 | -28/+52 |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3046 from matrix-org/dbkr/join_group | Luke Barnard | 2018-04-06 | 5 | -25/+133 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | de-lint, quote consistency | Luke Barnard | 2018-04-06 | 1 | -2/+2 |
| * | | | | | | | | | | | | Explicitly grab individual columns from group object | Luke Barnard | 2018-04-06 | 1 | -6/+8 |
| * | | | | | | | | | | | | When exposing group state, return is_openly_joinable | Luke Barnard | 2018-04-06 | 1 | -0/+5 |
| * | | | | | | | | | | | | By default, join policy is "invite" | Luke Barnard | 2018-04-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | add_user -> _add_user | Luke Barnard | 2018-04-06 | 1 | -3/+3 |
| * | | | | | | | | | | | | pep8 | Luke Barnard | 2018-04-06 | 2 | -2/+4 |
| * | | | | | | | | | | | | Get group_info from existing call to check_group_is_ours | Luke Barnard | 2018-04-06 | 1 | -5/+1 |
| * | | | | | | | | | | | | Don't use redundant inlineCallbacks | Luke Barnard | 2018-04-06 | 1 | -4/+1 |
| * | | | | | | | | | | | | join_rule -> join_policy | Luke Barnard | 2018-04-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | is_joinable -> join_rule | Luke Barnard | 2018-04-06 | 2 | -5/+2 |
| * | | | | | | | | | | | | Fix federation client `set_group_joinable` typo | Luke Barnard | 2018-04-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | Factor out add_user from accept_invite and join_group | Luke Barnard | 2018-04-06 | 1 | -41/+29 |
| * | | | | | | | | | | | | pep8 | David Baker | 2018-04-06 | 1 | -1/+2 |
| * | | | | | | | | | | | | Implement group join API | David Baker | 2018-04-06 | 5 | -4/+124 |
* | | | | | | | | | | | | | Merge pull request #3071 from matrix-org/erikj/resp_size_metrics | Erik Johnston | 2018-04-06 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add response size metrics | Erik Johnston | 2018-04-06 | 1 | -0/+7 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #3072 from matrix-org/rav/fix_port_script | Richard van der Hoff | 2018-04-06 | 1 | -33/+48 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Port script: Set up state_group_id_seq | Richard van der Hoff | 2018-04-06 | 1 | -0/+13 |
| * | | | | | | | | | | | | Port script: clean up a bit | Richard van der Hoff | 2018-04-06 | 1 | -25/+29 |
| * | | | | | | | | | | | | Port script: avoid nasty errors when setting up | Richard van der Hoff | 2018-04-06 | 1 | -8/+6 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3070 from krombel/group_join_put_instead_post | Erik Johnston | 2018-04-06 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | use PUT instead of POST for federating groups/m.join_policy | Krombel | 2018-04-06 | 3 | -3/+7 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | more verbosity in synctl | Richard van der Hoff | 2018-04-06 | 1 | -0/+1 |
* | | | | | | | | | | | Merge pull request #2886 from turt2live/travis/new-worker-docs | Richard van der Hoff | 2018-04-05 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docs | Travis Ralston | 2018-04-04 | 126 | -2530/+3869 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Document the additional routes for the event_creator worker | Travis Ralston | 2018-04-04 | 1 | -1/+3 |
| * | | | | | | | | | | | | Move the mention of the main synapse worker higher up | Travis Ralston | 2018-04-04 | 1 | -13/+6 |
| * | | | | | | | | | | | | Add a blurb explaining the main synapse worker | Travis Ralston | 2018-02-17 | 1 | -0/+12 |
* | | | | | | | | | | | | | Merge pull request #2986 from jplatte/join_reponse_room_id | Richard van der Hoff | 2018-04-05 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add room_id to the response of `rooms/{roomId}/join` | Jonas Platte | 2018-03-13 | 1 | -1/+6 |
* | | | | | | | | | | | | | | Merge pull request #3068 from matrix-org/rav/fix_cache_invalidation | Richard van der Hoff | 2018-04-05 | 2 | -26/+84 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix overzealous cache invalidation | Richard van der Hoff | 2018-04-05 | 2 | -26/+84 |
* | | | | | | | | | | | | | | | Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics | Richard van der Hoff | 2018-04-05 | 5 | -52/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Remove redundant metrics which were deprecated in 0.27.0. | Richard van der Hoff | 2018-04-04 | 5 | -52/+28 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge pull request #3045 from matrix-org/dbkr/group_joinable | Luke Barnard | 2018-04-05 | 8 | -0/+157 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | NON NULL -> NOT NULL | Luke Barnard | 2018-04-05 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Use "/settings/" (plural) | Luke Barnard | 2018-04-05 | 3 | -3/+3 |
| * | | | | | | | | | | | | | | Use DEFAULT join_policy of "invite" in db | Luke Barnard | 2018-04-05 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Document set_group_join_policy | Luke Barnard | 2018-04-05 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | Use join_policy API instead of joinable | Luke Barnard | 2018-04-03 | 7 | -23/+58 |
| * | | | | | | | | | | | | | | This should probably be a PUT | David Baker | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | OK, smallint it is then | David Baker | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Grr. Copy the definition from is_admin | David Baker | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | pep8 | David Baker | 2018-03-28 | 1 | -2/+1 |
| * | | | | | | | | | | | | | | Make column definition that works on both dbs | David Baker | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Add schema delta file | David Baker | 2018-03-28 | 1 | -0/+16 |
| * | | | | | | | | | | | | | | Add joinability for groups | David Baker | 2018-03-28 | 7 | -1/+102 |
* | | | | | | | | | | | | | | | Merge pull request #3041 from matrix-org/r30_stats | Neil Johnson | 2018-04-05 | 5 | -7/+115 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Review comments | Neil Johnson | 2018-04-05 | 2 | -5/+6 |
| * | | | | | | | | | | | | | | | pep8 | Neil Johnson | 2018-03-29 | 1 | -2/+4 |
| * | | | | | | | | | | | | | | | Remove need for sqlite specific query | Neil Johnson | 2018-03-29 | 1 | -30/+57 |
| * | | | | | | | | | | | | | | | fix pep8 errors | Neil Johnson | 2018-03-28 | 1 | -3/+0 |
| * | | | | | | | | | | | | | | | remove twisted deferral cruft | Neil Johnson | 2018-03-28 | 1 | -6/+3 |
| * | | | | | | | | | | | | | | | bump schema version | Neil Johnson | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | Support multi client R30 for psql | Neil Johnson | 2018-03-28 | 2 | -9/+31 |
| * | | | | | | | | | | | | | | | rename stat to future proof | Neil Johnson | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | Add user_ips last seen index | Neil Johnson | 2018-03-28 | 2 | -0/+24 |
| * | | | | | | | | | | | | | | | No need to cast in count_daily_users | Neil Johnson | 2018-03-28 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | query and call for r30 stats | Neil Johnson | 2018-03-28 | 2 | -0/+38 |
| * | | | | | | | | | | | | | | | count_daily_users failed if db was sqlite due to type failure - presumably th... | Neil Johnson | 2018-03-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge pull request #3060 from matrix-org/rav/kill_event_content | Richard van der Hoff | 2018-04-05 | 3 | -7/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Remove uses of events.content | Richard van der Hoff | 2018-03-29 | 3 | -7/+12 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3063 from matrix-org/jcgruenhage/cache_settings_stats | Jan Christian Grünhage | 2018-04-04 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | phone home cache size configurations | Jan Christian Grünhage | 2018-04-04 | 1 | -0/+3 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge pull request #3062 from matrix-org/revert-3053-speedup-mxid-check | Richard van der Hoff | 2018-04-04 | 1 | -4/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Revert "improve mxid check performance" | Richard van der Hoff | 2018-04-04 | 1 | -4/+3 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #3000 from NotAFile/change-except-style | Richard van der Hoff | 2018-04-04 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | replace old style error catching with 'as' keyword | NotAFile | 2018-03-15 | 2 | -5/+5 |
* | | | | | | | | | | | | | | Merge pull request #3044 from matrix-org/michaelk/performance_stats | Richard van der Hoff | 2018-04-04 | 2 | -0/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Handle review comments | Michael Kaye | 2018-03-28 | 1 | -6/+9 |
| * | | | | | | | | | | | | | | As daemonizing will make a new process, defer call to init. | Michael Kaye | 2018-03-28 | 1 | -13/+23 |
| * | | | | | | | | | | | | | | Include coarse CPU and Memory use in stats callbacks. | Michael Kaye | 2018-03-27 | 2 | -0/+32 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #3053 from NotAFile/speedup-mxid-check | Richard van der Hoff | 2018-04-04 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | improve mxid check performance ~4x | Adrian Tschira | 2018-03-31 | 1 | -3/+4 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3049 from matrix-org/rav/use_staticjson | Richard van der Hoff | 2018-04-03 | 4 | -20/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix json encoding bug in replication | Richard van der Hoff | 2018-04-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Use static JSONEncoders | Richard van der Hoff | 2018-03-29 | 4 | -20/+34 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #3048 from matrix-org/rav/use_simplejson | Richard van der Hoff | 2018-04-03 | 3 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Use simplejson throughout | Richard van der Hoff | 2018-03-29 | 3 | -5/+9 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3043 from matrix-org/erikj/measure_state_group_creation | Erik Johnston | 2018-03-28 | 1 | -27/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Measure time it takes to calculate state group ID | Erik Johnston | 2018-03-28 | 1 | -27/+28 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3034 from matrix-org/rav/fix_key_claim_errors | Richard van der Hoff | 2018-03-28 | 1 | -28/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Stringify exceptions for keys/{query,claim} | Richard van der Hoff | 2018-03-27 | 1 | -1/+4 |
| * | | | | | | | | | | | factor out exception handling for keys/claim and keys/query | Richard van der Hoff | 2018-03-27 | 1 | -28/+25 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3042 from matrix-org/fix_locally_failing_tests | Erik Johnston | 2018-03-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix search_user_dir multiple sqlite versions do different things | Neil Johnson | 2018-03-28 | 2 | -3/+3 |
| * | | | | | | | | | | fix tests/storage/test_user_directory.py | Neil Johnson | 2018-03-28 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_id | Erik Johnston | 2018-03-28 | 2 | -7/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Also do check inside linearizer | Erik Johnston | 2018-03-27 | 1 | -3/+4 |
| * | | | | | | | | | | PEP8 | Erik Johnston | 2018-03-26 | 1 | -1/+3 |
| * | | | | | | | | | | Don't use _cursor_to_dict in find_next_generated_user_id_localpart | Erik Johnston | 2018-03-26 | 1 | -3/+1 |
| * | | | | | | | | | | Linearize calls to _generate_user_id | Erik Johnston | 2018-03-26 | 1 | -4/+7 |
* | | | | | | | | | | | Merge pull request #3030 from matrix-org/erikj/no_ujson | Erik Johnston | 2018-03-28 | 2 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove last usage of ujson | Erik Johnston | 2018-03-26 | 2 | -2/+1 |
* | | | | | | | | | | | | Merge pull request #3033 from matrix-org/erikj/calculate_state_metrics | Erik Johnston | 2018-03-28 | 1 | -1/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Comment | Erik Johnston | 2018-03-27 | 1 | -4/+5 |
| * | | | | | | | | | | | Fix indent | Erik Johnston | 2018-03-27 | 1 | -1/+1 |
| * | | | | | | | | | | | Comment | Erik Johnston | 2018-03-27 | 1 | -0/+7 |
| * | | | | | | | | | | | Add counter metrics for calculating state delta | Erik Johnston | 2018-03-27 | 1 | -1/+30 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3017 from matrix-org/erikj/add_cache_control_headers | Erik Johnston | 2018-03-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add Cache-Control headers to all JSON APIs | Erik Johnston | 2018-03-21 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-26 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse v0.27.2 | Erik Johnston | 2018-03-26 | 3 | -8/+18 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Bum version and changelog | Erik Johnston | 2018-03-26 | 2 | -1/+9 |
| | * | | | | | | | | | Merge branch 'erikj/simplejson_replication' of github.com:matrix-org/synapse ... | Erik Johnston | 2018-03-26 | 1 | -7/+9 |
| |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fix date v0.27.1 | Erik Johnston | 2018-03-26 | 1 | -1/+1 |
| * | | | | | | | | | | Bump version and changelog | Erik Johnston | 2018-03-26 | 2 | -1/+7 |
| * | | | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.0 | Neil Johnson | 2018-03-26 | 177 | -4347/+8671 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | version bump | Neil Johnson | 2018-03-26 | 2 | -1/+7 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | fix typo | Matthew Hodgson | 2018-03-23 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #3022 from matrix-org/matthew/noresource | Matthew Hodgson | 2018-03-23 | 12 | -24/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | |