Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | experimental delegate_register github/matthew/delegate_register matthew/delegate_register | Matthew Hodgson | 2018-10-29 | 1 | -0/+38 |
* | merge in master | Matthew Hodgson | 2018-10-22 | 23 | -670/+1293 |
|\ | |||||
| * | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| |\ | |||||
| | * | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| * | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 3 | -8/+25 |
| * | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 |
| |/ | |||||
| * | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -1/+34 |
| * | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -10/+149 |
| * | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... | Neil Johnson | 2018-08-15 | 4 | -31/+108 |
| | |\ | |||||
| | * | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | * | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 1 | -2/+2 |
| | * | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 1 | -13/+14 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei... | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | |\ \ \ \ | |||||
| * | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -12/+76 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 1 | -17/+57 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-15 | 14 | -27/+78 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 1 | -7/+7 |
| | * | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 1 | -2/+14 |
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 1 | -11/+13 |
| | * | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 1 | -9/+35 |
| * | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 1 | -14/+4 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 1 | -13/+14 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 3 | -14/+51 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 |
| | * | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 3 | -14/+49 |
| * | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -1/+6 |
| | * | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -7/+5 |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 5 | -34/+69 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 1 | -5/+11 |
| * | | | | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 1 | -14/+13 |
| * | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 1 | -13/+14 |
| * | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 1 | -0/+5 |
| * | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 11 | -11/+11 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 2 | -31/+21 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r... | Erik Johnston | 2018-08-03 | 5 | -141/+210 |
| | |\ \ \ | |||||
| | * | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 1 | -24/+17 |
| | * | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 1 | -7/+4 |
| * | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 1 | -0/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 1 | -0/+10 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 2 | -3/+38 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 1 | -1/+2 |
| | * | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 1 | -2/+11 |
| | * | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 1 | -1/+26 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 2 | -21/+6 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | * | | | bug fixes | Neil Johnson | 2018-08-03 | 2 | -17/+6 |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 3 | -114/+140 |
| | |\| | | |||||
| | * | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 2 | -12/+8 |
| * | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 1 | -31/+58 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -17/+8 |
| |\ \ \ | |||||
| | * | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 1 | -17/+8 |
| * | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 2 | -10/+44 |
| |\ \ \ \ | |||||
| | * | | | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 1 | -4/+21 |
| | * | | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 1 | -27/+11 |
| | * | | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 1 | -1/+34 |
| * | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 1 | -87/+88 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | update docs | Erik Johnston | 2018-08-01 | 1 | -3/+5 |
| | * | | | | _persist_auth_tree no longer returns anything | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_... | Erik Johnston | 2018-07-30 | 6 | -30/+177 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 1 | -83/+82 |
| * | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 2 | -3/+35 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i... | Neil Johnson | 2018-08-01 | 1 | -14/+14 |
| | |\ \ \ \ | |||||
| | * | | | | | count_monthly_users() async | Neil Johnson | 2018-08-01 | 1 | -4/+7 |
| | * | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 1 | -4/+5 |
| | * | | | | | coding style | Neil Johnson | 2018-07-31 | 1 | -1/+2 |
| | * | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 2 | -2/+29 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -10/+21 |
| | |/ / / | |/| | | | |||||
| * | | | | rename replication_layer to federation_client | Richard van der Hoff | 2018-07-31 | 1 | -14/+14 |
| |/ / / | |||||
| * | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 2 | -4/+22 |
| * | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_... | Michael Telatynski | 2018-07-24 | 31 | -1534/+3975 |
| | |\ \ \ | |||||
| | * | | | | if inviter_display_name == ""||None then default to inviter MXID | Michael Telatynski | 2018-06-13 | 1 | -0/+4 |
| * | | | | | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 1 | -25/+62 |
| * | | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 1 | -1/+1 |
| * | | | | | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 1 | -14/+102 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 3 | -13/+21 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | clarify comment on p_ids | Matthew Hodgson | 2018-07-24 | 1 | -1/+2 |
| | * | | | | | rather than adding ll_ids, remove them from p_ids | Matthew Hodgson | 2018-07-24 | 1 | -5/+6 |
| | * | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 6 | -282/+307 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 1 | -3/+9 |
| | * | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 4 | -43/+77 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | 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 branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 11 | -30/+45 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | 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 a minor documentation typo in on_make_leave | Travis Ralston | 2018-07-25 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix updating of cached remote profiles | Richard van der Hoff | 2018-07-25 | 1 | -1/+8 |
| * | | | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.START | Erik Johnston | 2018-07-24 | 1 | -5/+7 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groups | Richard van der Hoff | 2018-07-24 | 1 | -7/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_events | Richard van der Hoff | 2018-07-23 | 1 | -7/+6 |
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 4 | -264/+282 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 4 | -32/+66 |
| | |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api... | Erik Johnston | 2018-07-23 | 2 | -11/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Move PaginationHandler to its own file | Erik Johnston | 2018-07-20 | 2 | -240/+267 |
| | * | | | | | | | | | | | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 1 | -34/+6 |
| | * | | | | | | | | | | | | Move RoomContextHandler out of Handlers | Erik Johnston | 2018-07-18 | 2 | -3/+5 |
| | * | | | | | | | | | | | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 2 | -133/+150 |
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | another couple of logcontext leaks | Richard van der Hoff | 2018-07-24 | 2 | -5/+10 |
| * | | | | | | | | | | | | Logcontext fixes | Richard van der Hoff | 2018-07-24 | 1 | -13/+15 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | 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 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
* | | | | | | | | | | fix missing import and run isort dinsic_2018-07-20 | Matthew Hodgson | 2018-07-20 | 1 | -3/+3 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into dinsic | David Baker | 2018-07-19 | 30 | -325/+195 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | 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 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Add hopefully enlightening comment | David Baker | 2018-07-18 | 1 | -1/+2 |
* | | | | | | | | | Oops, didn't mean to commit that | David Baker | 2018-07-18 | 1 | -1/+1 |
* | | | | | | | | | Remove deactivated users from profile search | David Baker | 2018-07-18 | 2 | -3/+28 |
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into dinsic | David Baker | 2018-07-17 | 11 | -109/+307 |
|\| | | | | | | | | |||||
| * | | | | | | | | 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 |
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Query the device lists of users when they are invited to a room. | Matthew Hodgson | 2018-07-06 | 1 | -19/+25 |
* | | | | | | | | | | typos | Matthew Hodgson | 2018-06-25 | 2 | -2/+2 |
* | | | | | | | | | | Merge tag 'v0.31.2' into dinsic | Michael Kaye | 2018-06-22 | 22 | -314/+637 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| |/ / / / / / / / | |||||
| * | | | | | | | | 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 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | 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 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ |