Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 4 | -43/+77 |
|\ | |||||
| * | Fix missing attributes on workers. | Erik Johnston | 2018-07-23 | 1 | -2/+3 |
| * | Add support for updating state | Erik Johnston | 2018-07-23 | 1 | -9/+23 |
| * | Use new getters | Erik Johnston | 2018-07-23 | 4 | -21/+40 |
| * | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 1 | -9/+9 |
| * | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 1 | -2/+2 |
| * | Improvements to the Limiter | Richard van der Hoff | 2018-07-20 | 1 | -1/+1 |
* | | incorporate review | Matthew Hodgson | 2018-07-23 | 1 | -40/+27 |
* | | incorporate review | Matthew Hodgson | 2018-07-19 | 1 | -17/+27 |
* | | add a filtered_types param to limit filtering to specific types | Matthew Hodgson | 2018-07-19 | 1 | -29/+36 |
* | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 30 | -416/+441 |
|\| | |||||
| * | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-18 | 1 | -43/+0 |
| |\ | |||||
| | * | Merge branch 'develop' into rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-04 | 12 | -111/+313 |
| | |\ | |||||
| | * | | Remove event re-signing hacks | Richard van der Hoff | 2018-06-07 | 1 | -43/+0 |
| * | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 1 | -138/+6 |
| |\ \ \ | |||||
| | * | | | Move filter_events_for_server out of FederationHandler | Richard van der Hoff | 2018-07-16 | 1 | -138/+6 |
| * | | | | typo | Matthew Hodgson | 2018-07-13 | 1 | -3/+3 |
| |/ / / | |||||
| * | | | s/becuase/because/g | Matthew Hodgson | 2018-07-10 | 2 | -2/+2 |
| * | | | run isort | Amber Brown | 2018-07-09 | 30 | -184/+186 |
| | |/ | |/| | |||||
| * | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 1 | -28/+68 |
| |\ \ | |||||
| | * | | try and clean up | Amber Brown | 2018-06-27 | 1 | -3/+6 |
| | * | | pep8 | Amber Brown | 2018-06-27 | 1 | -6/+4 |
| | * | | cleanups | Amber Brown | 2018-06-27 | 1 | -13/+15 |
| | * | | handle federation not telling us about prev_events | Amber Brown | 2018-06-27 | 1 | -25/+62 |
| * | | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 4 | -9/+8 |
| |/ / | |||||
| * | | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-api | Matthew Hodgson | 2018-06-26 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | add GDPR erase param to deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -0/+1 |
| * | | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-parts | Erik Johnston | 2018-06-25 | 1 | -2/+6 |
| |\ \ \ | |||||
| | * | | | allow non-consented users to still part rooms (to let us autopart them) | Matthew Hodgson | 2018-06-25 | 1 | -2/+6 |
| | |/ / | |||||
| * | | | Actually fix it | Erik Johnston | 2018-06-25 | 1 | -3/+3 |
| * | | | Comment | Erik Johnston | 2018-06-25 | 1 | -0/+8 |
| * | | | Fix bug with assuming wrong type | Erik Johnston | 2018-06-25 | 1 | -2/+2 |
| * | | | Add fast path to _filter_events_for_server | Erik Johnston | 2018-06-25 | 1 | -1/+34 |
| |/ / | |||||
| * | | typos | Matthew Hodgson | 2018-06-25 | 1 | -1/+1 |
| * | | typo | Matthew Hodgson | 2018-06-25 | 1 | -1/+1 |
| * | | Merge pull request #3441 from matrix-org/erikj/redo_erasure | Erik Johnston | 2018-06-25 | 2 | -1/+19 |
| |\ \ | |||||
| | * | | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili... | Erik Johnston | 2018-06-25 | 2 | -1/+19 |
| * | | | Remove all global reactor imports & pass it around explicitly (#3424) | Amber Brown | 2018-06-25 | 3 | -6/+6 |
| |/ / | |||||
| * | | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 2 | -19/+1 |
| * | | Also log number of events for serach context | Erik Johnston | 2018-06-22 | 1 | -0/+5 |
| * | | Add some logging to search queries | Erik Johnston | 2018-06-22 | 1 | -0/+9 |
| * | | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 2 | -1/+19 |
| |\ \ | |||||
| | * | | Filter out erased messages | Richard van der Hoff | 2018-06-12 | 1 | -0/+13 |
| | * | | mark accounts as erased when requested | Richard van der Hoff | 2018-06-12 | 1 | -1/+6 |
| * | | | Merge pull request #3428 from matrix-org/erikj/persisted_pdu | Erik Johnston | 2018-06-22 | 1 | -18/+26 |
| |\| | | |||||
| | * | | simplify get_persisted_pdu | Richard van der Hoff | 2018-06-12 | 1 | -18/+26 |
| * | | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 3 | -15/+25 |
| * | | | Merge pull request #3399 from costacruise/master | Richard van der Hoff | 2018-06-20 | 1 | -2/+6 |
| |\ \ \ | |||||
| | * | | | Add error code to room creation error | Michael Wagner | 2018-06-14 | 1 | -2/+6 |
| | * | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| | | |/ | | |/| | |||||
| * | | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 5 | -26/+5 |
| | |/ | |/| | |||||
| * | | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 3 | -2/+82 |
| |\ \ | |||||
| | * | | doc fixes | David Baker | 2018-06-05 | 1 | -1/+1 |
| | * | | Fix comment | David Baker | 2018-06-04 | 1 | -1/+1 |
| | * | | Missing yield | David Baker | 2018-06-04 | 1 | -1/+1 |
| | * | | docstring | David Baker | 2018-06-04 | 1 | -1/+9 |
| | * | | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 5 | -16/+46 |
| | |\ \ | |||||
| | * | | | pep8 | David Baker | 2018-05-24 | 3 | -7/+12 |
| | * | | | comment | David Baker | 2018-05-24 | 1 | -0/+4 |
| | * | | | Unbind 3pids when they're deleted too | David Baker | 2018-05-24 | 1 | -0/+8 |
| | * | | | Hit the 3pid unbind endpoint on deactivation | David Baker | 2018-05-23 | 2 | -1/+56 |
* | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 1 | -0/+4 |
|\| | | | | |||||
| * | | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 11 | -30/+45 |
|\| | | | |||||
| * | | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'... | Amber Brown | 2018-05-31 | 10 | -29/+31 |
| * | | | 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 | 1 | -0/+3 |
* | | | | more comments | Matthew Hodgson | 2018-06-04 | 1 | -0/+7 |
* | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 1 | -5/+13 |
* | | | | merge develop | Matthew Hodgson | 2018-05-29 | 20 | -472/+970 |
|\| | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 10 | -61/+105 |
| |\ \ \ | |||||
| | * \ \ | 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 |
| | * | | | | Misc. py3 fixes | Adrian Tschira | 2018-05-24 | 2 | -8/+10 |
| | * | | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 6 | -27/+35 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 6 | -27/+35 |
| | * | | | | Remove users from user directory on deactivate | David Baker | 2018-05-24 | 2 | -0/+11 |
| | * | | | | 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 rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Support for putting %(consent_uri)s in messages | Richard van der Hoff | 2018-05-23 | 1 | -1/+4 |
| | | |/ / / / | |||||
| | * / / / / | Use the localpart in the consent uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
| | |/ / / / | |||||
| | * | | / | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| | | |_|/ | | |/| | | |||||
| | * | | | comment typo | David Baker | 2018-05-22 | 1 | -1/+1 |
| * | | | | cleanup | Amber Brown | 2018-05-22 | 2 | -7/+14 |
| * | | | | cleanups, self-registration | Amber Brown | 2018-05-22 | 1 | -3/+4 |
| * | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 8 | -75/+192 |
| |\| | | | |||||
| | * | | | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 2 | -1/+89 |
| | |/ / | |||||
| | * | | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 2 | -4/+5 |
| | * | | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 1 | -1/+9 |
| | |/ | |||||
| | * | Merge pull request #3232 from matrix-org/rav/server_notices_room | Richard van der Hoff | 2018-05-18 | 4 | -6/+80 |
| | |\ | |||||
| | | * | Make sure we reject attempts to invite the notices user | Richard van der Hoff | 2018-05-18 | 2 | -0/+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 | 3 | -6/+64 |
| | * | | 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 | 1 | -6/+6 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -6/+6 |
| | * | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 2 | -6/+7 |
| | |/ | |||||
| * / | replacing portions | Amber Brown | 2018-05-21 | 2 | -42/+35 |
| |/ | |||||
| * | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate | David Baker | 2018-05-14 | 1 | -2/+79 |
| |\ | |||||
| | * | Catch failure to part user from room | David Baker | 2018-05-10 | 1 | -7/+13 |
| | * | Many docstrings | David Baker | 2018-05-10 | 1 | -0/+24 |
| | * | 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 |
| | * | Indent fail | David Baker | 2018-05-09 | 1 | -1/+1 |
| | * | Part deactivated users in the background | David Baker | 2018-05-09 | 1 | -1/+34 |
| | * | Part user from rooms on account deactivate | David Baker | 2018-05-08 | 1 | -1/+15 |
| * | | Merge pull request #3199 from matrix-org/erikj/pagination_sync | Erik Johnston | 2018-05-09 | 1 | -6/+18 |
| |\ \ | |||||
| | * | | 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 | 1 | -6/+13 |
| * | | | Fix returned token is no longer a tuple | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| |/ / | |||||
| * / | Refactor get_recent_events_for_room return type | Erik Johnston | 2018-05-09 | 2 | -6/+6 |
| |/ | |||||
| * | Merge branch 'release-v0.28.1' into develop | Richard van der Hoff | 2018-05-01 | 1 | -1/+5 |
| |\ | |||||
| | * | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 1 | -1/+5 |
| * | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 |
| |\ \ | |||||
| | * | | Remove redundant call to preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 |
| * | | | Merge pull request #3153 from NotAFile/py3-httplib | Richard van der Hoff | 2018-04-30 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | move httplib import to six | Adrian Tschira | 2018-04-28 | 1 | -3/+3 |
| * | | | | Merge pull request #3151 from NotAFile/py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' into py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 6 | -21/+32 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Move more xrange to six | Adrian Tschira | 2018-04-28 | 1 | -1/+3 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #3150 from NotAFile/py3-listcomp-yield | Richard van der Hoff | 2018-04-30 | 1 | -5/+9 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Don't yield in list comprehensions | Adrian Tschira | 2018-04-28 | 1 | -5/+9 |
| | |/ / | |||||
| * | | | pep8; remove spurious import | Richard van der Hoff | 2018-04-27 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 6 | -74/+112 |
| |\| | | |||||
| | * | | Merge pull request #3142 from matrix-org/rav/reraise | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
| | |\ \ | |||||
| | | * | | reraise exceptions more carefully | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
| | | |/ | |||||
| | * | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions | Richard van der Hoff | 2018-04-27 | 4 | -59/+86 |
| | |\ \ | |||||
| | | * | | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 4 | -59/+86 |
| | | |/ | |||||
| | * / | Add missing consumeErrors | Richard van der Hoff | 2018-04-27 | 1 | -2/+2 |
| | |/ | |||||
| * / | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 6 | -20/+31 |
| |/ | |||||
| * | Merge pull request #3118 from matrix-org/rav/reject_prev_events | Richard van der Hoff | 2018-04-23 | 1 | -7/+71 |
| |\ | |||||
| | * | 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 | 1 | -3/+12 |
| | * | 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 #3107 from NotAFile/py3-bool-nonzero | Richard van der Hoff | 2018-04-20 | 1 | -0/+7 |
| |\ \ | |||||
| | * | | add __bool__ alias to __nonzero__ methods | Adrian Tschira | 2018-04-15 | 1 | -0/+7 |
| | |/ | |||||
| * | | Merge pull request #3093 from matrix-org/rav/response_cache_wrap | Richard van der Hoff | 2018-04-20 | 2 | -35/+19 |
| |\ \ | |||||
| | * | | Refactor ResponseCache usage | Richard van der Hoff | 2018-04-12 | 2 | -35/+19 |
| | |/ | |||||
| * | | Merge pull request #3117 from matrix-org/rav/refactor_have_events | Richard van der Hoff | 2018-04-20 | 1 | -19/+12 |
| |\ \ | |||||
| | * | | Refactor store.have_events | Richard van der Hoff | 2018-04-20 | 1 | -19/+12 |
| | |/ | |||||
| * / | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 2 | -38/+53 |
| |/ | |||||
| * | Merge pull request #3092 from matrix-org/rav/response_cache_metrics | Richard van der Hoff | 2018-04-12 | 2 | -3/+4 |
| |\ | |||||
| | * | Add metrics for ResponseCache | Richard van der Hoff | 2018-04-10 | 2 | -3/+4 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/processed_... | Erik Johnston | 2018-04-12 | 1 | -2/+19 |
| |\ \ | |||||
| | * \ | 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 |
| * | | | | Set all metrics at the same time | Erik Johnston | 2018-04-12 | 1 | -4/+4 |
| * | | | | Track last processed event received_ts | Erik Johnston | 2018-04-11 | 1 | -0/+10 |
| * | | | | Track where event stream processing have gotten up to | Erik Johnston | 2018-04-11 | 1 | -0/+4 |
| |/ / / | |||||
| * | | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 1 | -49/+55 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 |
| * | | | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 1 | -2/+34 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 3 | -8/+14 |
| | |\ \ | |||||
| | * | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 1 | -2/+34 |
| * | | | | 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 |
| * | | | | Implement group join API | David Baker | 2018-04-06 | 1 | -1/+39 |
| |/ / / | |||||
| * | | | Merge pull request #3045 from matrix-org/dbkr/group_joinable | Luke Barnard | 2018-04-05 | 1 | -0/+3 |
| |\ \ \ | |||||
| | * | | | Use join_policy API instead of joinable | Luke Barnard | 2018-04-03 | 1 | -1/+1 |
| | * | | | Add joinability for groups | David Baker | 2018-03-28 | 1 | -0/+3 |
| * | | | | Merge pull request #3000 from NotAFile/change-except-style | Richard van der Hoff | 2018-04-04 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | replace old style error catching with 'as' keyword | NotAFile | 2018-03-15 | 1 | -3/+3 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #3049 from matrix-org/rav/use_staticjson | Richard van der Hoff | 2018-04-03 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Use static JSONEncoders | Richard van der Hoff | 2018-03-29 | 1 | -2/+2 |
| * | | | | | Use simplejson throughout | Richard van der Hoff | 2018-03-29 | 1 | -3/+5 |
| |/ / / / | |||||
| * | | | | 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 |
| | | |/ | | |/| | |||||
| * | | | Also do check inside linearizer | Erik Johnston | 2018-03-27 | 1 | -3/+4 |
| * | | | PEP8 | Erik Johnston | 2018-03-26 | 1 | -1/+3 |
| * | | | Linearize calls to _generate_user_id | Erik Johnston | 2018-03-26 | 1 | -4/+7 |
| |/ / | |||||
| * | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 2 | -4/+4 |
| |\ \ | | |/ | |/| | |||||
| | * | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 2 | -4/+4 |
* | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 1 | -9/+9 |
* | | | reshuffle todo & comments | Matthew Hodgson | 2018-03-19 | 1 | -2/+10 |
* | | | only get member state IDs for incremental syncs if we're filtering | Matthew Hodgson | 2018-03-18 | 1 | -5/+5 |
* | | | remove debug | Matthew Hodgson | 2018-03-16 | 1 | -4/+0 |
* | | | fix tsm search again | Matthew Hodgson | 2018-03-16 | 1 | -5/+4 |
* | | | add state_ids for timeline entries | Matthew Hodgson | 2018-03-16 | 1 | -4/+14 |
* | | | simplify timeline_start_members | Matthew Hodgson | 2018-03-16 | 1 | -14/+13 |
* | | | make incr syncs work | Matthew Hodgson | 2018-03-16 | 1 | -3/+4 |
* | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-03-14 | 3 | -101/+293 |
|\| | | |||||
| * | | Merge pull request #2992 from matrix-org/erikj/implement_member_workre | Erik Johnston | 2018-03-14 | 1 | -0/+102 |
| |\ \ | |||||
| | * | | s/join/joined/ in notify_user_membership_change | Erik Johnston | 2018-03-14 | 1 | -1/+1 |
| | * | | Split RoomMemberWorkerHandler to separate file | Erik Johnston | 2018-03-14 | 2 | -78/+102 |
| | * | | Implement RoomMemberWorkerHandler | Erik Johnston | 2018-03-13 | 1 | -0/+78 |
| * | | | 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 |
| * | | | | _remote_join and co take a requester | Erik Johnston | 2018-03-13 | 1 | -4/+4 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #2987 from matrix-org/erikj/split_room_member_handler | Erik Johnston | 2018-03-13 | 1 | -98/+185 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 | 1 | -96/+135 |
* | | | | add copyright to nudge CI | Matthew Hodgson | 2018-03-14 | 1 | -1/+2 |
* | | | | oops | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
* | | | | make it work | Matthew Hodgson | 2018-03-13 | 1 | -3/+3 |
* | | | | merge proper fix to bug 2969 | Matthew Hodgson | 2018-03-13 | 13 | -73/+223 |
|\| | | | |||||
| * | | | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer | Erik Johnston | 2018-03-13 | 6 | -6/+6 |
| |\ \ \ | |||||
| | * | | | s/replication_client/federation_client/ | Erik Johnston | 2018-03-13 | 6 | -6/+6 |
| * | | | | 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 | 11 | -31/+49 |
| | |\ \ \ | |||||
| | * | | | | 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 | 8 | -12/+7 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | Split replication layer into two | Erik Johnston | 2018-03-13 | 8 | -12/+7 |
| * | | | | 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 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | extra_users is actually a list of UserIDs | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | 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 |
| | |/ / | |||||
| * / / | Split out edu/query registration to a separate class | Erik Johnston | 2018-03-13 | 8 | -12/+16 |
| |/ / | |||||
| * | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 1 | -5/+99 |
| * | | Return an error when doing two purges on a room | Richard van der Hoff | 2018-03-12 | 1 | -3/+14 |
* | | | ensure we always include the members for a given timeline block | Matthew Hodgson | 2018-03-13 | 1 | -4/+32 |
* | | | typos | Matthew Hodgson | 2018-03-11 | 1 | -2/+2 |
* | | | WIP experiment in lazyloading room members | Matthew Hodgson | 2018-03-11 | 1 | -12/+31 |
|/ / | |||||
* | | Fix up log message | Erik Johnston | 2018-03-07 | 1 | -1/+1 |
* | | Fix typo | Erik Johnston | 2018-03-07 | 1 | -2/+2 |
* | | Fix race in sync when joining room | Erik Johnston | 2018-03-07 | 1 | -28/+75 |
* | | Merge pull request #2949 from krombel/use_bcrypt_checkpw | Richard van der Hoff | 2018-03-06 | 1 | -2/+4 |
|\ \ | |||||
| * | | use bcrypt.checkpw | Krombel | 2018-03-05 | 1 | -2/+4 |
* | | | Merge pull request #2946 from matrix-org/rav/timestamp_to_purge | Richard van der Hoff | 2018-03-06 | 1 | -9/+5 |
|\ \ \ | |||||
| * | | | Provide a means to pass a timestamp to purge_history | Richard van der Hoff | 2018-03-05 | 1 | -9/+5 |
| |/ / | |||||
* / / | Remove ability for AS users to call /events and /sync | Erik Johnston | 2018-03-05 | 2 | -10/+9 |
|/ / | |||||
* | | Add missing yield during 3pid signature checks | Erik Johnston | 2018-03-02 | 1 | -1/+1 |
* | | Merge pull request #2927 from matrix-org/erikj/read_marker_caches | Erik Johnston | 2018-03-01 | 1 | -3/+3 |
|\ \ | |||||
| * | | Improve caching for read_marker API | Erik Johnston | 2018-03-01 | 1 | -3/+3 |
* | | | Move back to hs.is_mine | Erik Johnston | 2018-03-01 | 1 | -7/+6 |
* | | | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 6 | -31/+37 |
|/ / | |||||
* | | Check event auth on the worker | Erik Johnston | 2018-03-01 | 1 | -16/+16 |
* | | Correctly send ratelimit and extra_users params | Erik Johnston | 2018-03-01 | 1 | -0/+2 |
* | | Fixup comments | Erik Johnston | 2018-03-01 | 1 | -4/+4 |
* | | Calculate push actions on worker | Erik Johnston | 2018-02-28 | 1 | -25/+61 |
* | | Delete from push_actions_staging in federation too | Erik Johnston | 2018-02-20 | 1 | -9/+17 |
* | | Ensure that we delete staging push actions on errors | Erik Johnston | 2018-02-15 | 1 | -3/+9 |
* | | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 1 | -6/+22 |
|\ \ | |||||
| * | | Move presence handling into handle_new_client_event | Erik Johnston | 2018-02-07 | 1 | -6/+6 |
| * | | Add replication http endpoint for event sending | Erik Johnston | 2018-02-07 | 1 | -0/+16 |