| Commit message (Expand) | Author | Age | Files | Lines |
* | reraise exceptions more carefully | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
* | Fix media admin APIs | Erik Johnston | 2018-04-26 | 1 | -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 |
* | Bump version and update changelog v0.28.0-rc1 | Neil Johnson | 2018-04-24 | 1 | -1/+1 |
* | 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 #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 #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 | 1 | -4/+4 |
|\ \ |
|
| * | | Use str(e) instead of e.message | Adrian Tschira | 2018-04-15 | 1 | -4/+4 |
| |/ |
|
* | | 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 |
| | |/
| |/| |
|
* / | | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 3 | -54/+94 |
|/ / |
|
* | | Merge branch 'master' of https://github.com/matrix-org/synapse into develop | Neil Johnson | 2018-04-13 | 2 | -2/+2 |
|\ \ |
|
| * | | Bump version and Change log v0.27.4 github/release-v0.27.0 release-v0.27.0 | 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 |
* | | | 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 | 1 | -1/+1 |
|\| | |
|
| * | | bump version/changelog | Neil Johnson | 2018-04-11 | 1 | -1/+1 |
| * | | Merge commit '11d2609da70af797405241cdf7d9df19db5628f2' of https://github.com... | Neil Johnson | 2018-04-11 | 1 | -48/+80 |
| |\ \ |
|
* | | | | 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 |
* | | | | 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 |
* | | | | | | | 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 |
* | | | | | | | 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 | 2 | -7/+7 |
|\ \ \ \ \ \ \ \
| |_|_|/ / / / /
|/| | | | | / /
| | |_|_|_|/ /
| |/| | | | | |
|
| * | | | | | | 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 |
| * | | | | | | 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 | 31 | -151/+613 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | 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 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 | 2 | -34/+34 |
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 48 | -101/+155 |
| |\ \ \ \ \ |
|
| * | | | | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 2 | -34/+34 |
* | | | | | | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 5 | -13/+13 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 5 | -13/+13 |
* | | | | | | | | 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 | 3 | -6/+12 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Replace some type checks with six type checks | Adrian Tschira | 2018-04-07 | 3 | -6/+12 |
| |/ / / / / / / / |
|
* | | | | | | | | | Merge pull request #3016 from silkeh/improve-service-lookups | Richard van der Hoff | 2018-04-09 | 1 | -95/+8 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Remove address resolution of hosts in SRV records | Silke | 2018-04-04 | 1 | -95/+8 |
* | | | | | | | | | | 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 | 2 | -0/+51 |
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | 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 |
* | | | | | | | | | | Add response size metrics | Erik Johnston | 2018-04-06 | 1 | -0/+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 #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 | 1 | -26/+38 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Fix overzealous cache invalidation | Richard van der Hoff | 2018-04-05 | 1 | -26/+38 |
* | | | | | | | | | | Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics | Richard van der Hoff | 2018-04-05 | 2 | -51/+0 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Remove redundant metrics which were deprecated in 0.27.0. | Richard van der Hoff | 2018-04-04 | 2 | -51/+0 |
| |/ / / / / / / / / |
|
* | | | | | | | | | | 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 |
| | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
|
* | | | | | | | | | | | phone home cache size configurations | Jan Christian Grünhage | 2018-04-04 | 1 | -0/+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 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | 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 | 1 | -0/+20 |
| | |_|/ / / / / / /
| |/| | | | | | | | |
|
* | | | | | | | | | | 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 |
| |/ / / / / / / / |
|
* / / / / / / / / | 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 |
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | Fix search_user_dir multiple sqlite versions do different things | Neil Johnson | 2018-03-28 | 1 | -2/+2 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | 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 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | Bum version and changelog | Erik Johnston | 2018-03-26 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'erikj/simplejson_replication' of github.com:matrix-org/synapse ... | Erik Johnston | 2018-03-26 | 1 | -7/+9 |
| |\| | | | | | |
|
| * | | | | | | | Bump version and changelog | Erik Johnston | 2018-03-26 | 1 | -1/+1 |
| * | | | | | | | version bump | Neil Johnson | 2018-03-26 | 1 | -1/+1 |
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | 404 correctly on missing paths via NoResource | Matthew Hodgson | 2018-03-23 | 12 | -24/+24 |
| |_|/ / / /
|/| | | | | |
|
* | | | | | | Merge pull request #3006 from matrix-org/erikj/state_iter | Erik Johnston | 2018-03-22 | 1 | -12/+12 |
|\ \ \ \ \ \ |
|
| * | | | | | | Fix s/iteriterms/itervalues | Erik Johnston | 2018-03-22 | 1 | -1/+1 |
| * | | | | | | Use .iter* to avoid copies in StateHandler | Erik Johnston | 2018-03-15 | 1 | -12/+12 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-22 | 1 | -1/+1 |
|\ \ \ \ \ \
| | |/ / / /
| |/| / / /
| |_|/ / /
|/| | | | |
|
| * | | | | fix merge conflicts | Neil Johnson | 2018-03-20 | 29 | -46/+57 |
| |\ \ \ \ |
|
| * | | | | | Update __init__.py | Neil Johnson | 2018-03-19 | 1 | -1/+1 |
| * | | | | | Bump version number v0.27.0-rc1 | Erik Johnston | 2018-03-15 | 1 | -1/+1 |
| | |/ / /
| |/| | | |
|
* | | | | | Explicitly use simplejson | Erik Johnston | 2018-03-20 | 1 | -7/+7 |
* | | | | | Fix replication after switch to simplejson | Erik Johnston | 2018-03-19 | 1 | -2/+4 |
| |/ / /
|/| | | |
|
* | | | | Merge pull request #3005 from matrix-org/erikj/fix_cache_size | Erik Johnston | 2018-03-19 | 2 | -5/+16 |
|\ \ \ \ |
|
| * | | | | Add comments | Erik Johnston | 2018-03-19 | 1 | -0/+7 |
| * | | | | Fix bug where state cache used lots of memory | Erik Johnston | 2018-03-15 | 2 | -5/+9 |
| |/ / / |
|
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 25 | -37/+34 |
|\ \ \ \ |
|
| * | | | | Remove wrong comment | Erik Johnston | 2018-03-16 | 1 | -1/+0 |
| * | | | | Bump version and changelog | Erik Johnston | 2018-03-15 | 1 | -1/+1 |
| * | | | | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 25 | -38/+37 |
* | | | | | spell out not to massively increase bcrypt rounds | Matthew Hodgson | 2018-03-19 | 1 | -1/+3 |
* | | | | | Replace some ujson with simplejson to make it work | Erik Johnston | 2018-03-16 | 4 | -4/+5 |
| |/ / /
|/| | | |
|
* | | | | Register membership/state servlets in event_creator | Erik Johnston | 2018-03-14 | 1 | -1/+13 |
* | | | | Merge pull request #2992 from matrix-org/erikj/implement_member_workre | Erik Johnston | 2018-03-14 | 4 | -4/+440 |
|\ \ \ \ |
|
| * | | | | Fix imports | Erik Johnston | 2018-03-14 | 2 | -7/+4 |
| * | | | | s/join/joined/ in notify_user_membership_change | Erik Johnston | 2018-03-14 | 2 | -4/+4 |
| * | | | | Split RoomMemberWorkerHandler to separate file | Erik Johnston | 2018-03-14 | 3 | -81/+104 |
| * | | | | Implement RoomMemberWorkerHandler | Erik Johnston | 2018-03-13 | 4 | -2/+418 |
* | | | | | Merge pull request #2989 from matrix-org/erikj/profile_cache_master | Erik Johnston | 2018-03-14 | 1 | -1/+4 |
|\ \ \ \ \ |
|
| * | | | | | Only update remote profile cache on master | Erik Johnston | 2018-03-13 | 1 | -1/+4 |
* | | | | | | Merge pull request #2988 from matrix-org/erikj/split_profile_store | Erik Johnston | 2018-03-14 | 2 | -24/+47 |
|\ \ \ \ \ \ |
|
| * | | | | | | Split up ProfileStore | Erik Johnston | 2018-03-13 | 2 | -24/+47 |
| |/ / / / / |
|
* | | | | | | Merge pull request #2991 from matrix-org/erikj/fixup_rm | Erik Johnston | 2018-03-14 | 1 | -4/+4 |
|\ \ \ \ \ \ |
|
| * | | | | | | _remote_join and co take a requester | Erik Johnston | 2018-03-13 | 1 | -4/+4 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | Merge pull request #2993 from matrix-org/erikj/is_blocked | Erik Johnston | 2018-03-14 | 1 | -13/+17 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add is_blocked to worker store | Erik Johnston | 2018-03-13 | 1 | -13/+17 |
| |/ / / / / |
|
* / / / / / | fix bug #2926 (loading all state for a given type from the DB if the state_ke... | Matthew Hodgson | 2018-03-13 | 1 | -7/+27 |
|/ / / / / |
|
* | | | | | Merge pull request #2987 from matrix-org/erikj/split_room_member_handler | Erik Johnston | 2018-03-13 | 2 | -100/+189 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Raise, don't return, exception | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| * | | | | Add missing param to docstrings | Erik Johnston | 2018-03-13 | 1 | -0/+3 |
| * | | | | Correct import order | Erik Johnston | 2018-03-13 | 1 | -3/+3 |
| * | | | | Move user_*_room distributor stuff to master class | Erik Johnston | 2018-03-13 | 1 | -5/+50 |
| * | | | | Split RoomMemberHandler into base and master class | Erik Johnston | 2018-03-13 | 2 | -98/+139 |
* | | | | | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer | Erik Johnston | 2018-03-13 | 9 | -12/+12 |
|\ \ \ \ \ |
|
| * | | | | | s/replication_client/federation_client/ | Erik Johnston | 2018-03-13 | 8 | -9/+9 |
| * | | | | | s/replication_server/federation_server | Erik Johnston | 2018-03-13 | 2 | -3/+3 |
* | | | | | | Merge pull request #2981 from matrix-org/erikj/factor_remote_leave | Erik Johnston | 2018-03-13 | 1 | -22/+54 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | / /
| |_|_|/ /
|/| | | | |
|
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_rem... | Erik Johnston | 2018-03-13 | 19 | -110/+146 |
| |\ \ \ \ |
|
| * | | | | | Add docstring | Erik Johnston | 2018-03-13 | 1 | -0/+26 |
| * | | | | | Factor out _remote_reject_invite in RoomMember | Erik Johnston | 2018-03-13 | 1 | -22/+28 |
* | | | | | | Merge pull request #2979 from matrix-org/erikj/no_handlers | Erik Johnston | 2018-03-13 | 19 | -91/+19 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Don't build handlers on workers unnecessarily | Erik Johnston | 2018-03-13 | 5 | -5/+0 |
| | |/ / /
| |/| | | |
|
| * | | | | Remove unused ReplicationLayer | Erik Johnston | 2018-03-13 | 2 | -59/+0 |
| * | | | | Split replication layer into two | Erik Johnston | 2018-03-13 | 12 | -27/+19 |
* | | | | | Merge pull request #2980 from matrix-org/erikj/rm_priv | Erik Johnston | 2018-03-13 | 1 | -7/+7 |
|\ \ \ \ \ |
|
| * | | | | | Make functions private that can be | Erik Johnston | 2018-03-13 | 1 | -7/+7 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge pull request #2982 from matrix-org/erikj/fix_extra_users | Erik Johnston | 2018-03-13 | 2 | -5/+5 |
|\ \ \ \ \ |
|
| * | | | | | extra_users is actually a list of UserIDs | Erik Johnston | 2018-03-13 | 2 | -5/+5 |
| |/ / / / |
|
* | | | | | Merge pull request #2983 from matrix-org/erikj/rename_register_3pid | Erik Johnston | 2018-03-13 | 2 | -11/+25 |
|\ \ \ \ \ |
|
| * | | | | | Refactor get_or_register_3pid_guest | Erik Johnston | 2018-03-13 | 2 | -11/+25 |
| |/ / / / |
|
* | | | | | Merge pull request #2984 from matrix-org/erikj/fix_rest_regeix | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | RoomMembershipRestServlet doesn't handle /forget | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| |/ / / / |
|
* | | | | | Merge pull request #2975 from matrix-org/rav/measure_persist_events | Richard van der Hoff | 2018-03-13 | 1 | -4/+5 |
|\ \ \ \ \ |
|