summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add some fixmesErik Johnston2018-08-171-0/+4
* Call UserDirectoryHandler methods directlyErik Johnston2018-08-171-21/+5
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-1715-84/+409
|\
| * block event creation and room creation on hitting resource limitsNeil Johnson2018-08-162-1/+9
| * lazyload aware /messages (#3589)Matthew Hodgson2018-08-161-1/+34
| * initial cut at a room summary API (#3574)Matthew Hodgson2018-08-161-10/+149
| * Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-151-2/+2
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-154-31/+108
| | |\
| | * | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-141-1/+0
| | * | fix off by 1s on mauNeil Johnson2018-08-141-2/+2
| | * | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-141-10/+0
| | |\ \
| | * \ \ Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-141-13/+14
| | |\ \ \
| | * \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...Neil Johnson2018-08-141-2/+11
| | |\ \ \ \
| * | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-151-12/+76
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-151-17/+57
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-1514-27/+78
| | |\ \ \ \ \
| | * | | | | | Use federation handler function rather than duplicateErik Johnston2018-08-151-7/+7
| | * | | | | | Move clean_room_for_join to masterErik Johnston2018-08-091-2/+14
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-096-55/+112
| | |\ \ \ \ \ \
| | * | | | | | | Add EDU/query handling over replicationErik Johnston2018-08-061-11/+13
| | * | | | | | | Add replication APIs for persisting federation eventsErik Johnston2018-08-061-9/+35
| * | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-151-14/+4
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-141-2/+11
| | |\ \ \ \ \ \ \
| | * | | | | | | | remove blank lineNeil Johnson2018-08-141-1/+0
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Update register.pyNeil Johnson2018-08-141-10/+0
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-131-13/+14
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbindErik Johnston2018-08-153-14/+51
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Log when we 3pid/unbind request failsErik Johnston2018-08-091-0/+2
| | * | | | | Don't fail requests to unbind 3pids for non supporting ID serversErik Johnston2018-08-083-14/+49
| * | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-141-2/+11
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-091-1/+6
| | * | | | block sync if auth checks failNeil Johnson2018-08-091-7/+5
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-095-34/+69
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | sync auth blockingNeil Johnson2018-08-081-5/+11
| * | | | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-131-14/+13
| * | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-131-13/+14
| * | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-131-0/+5
| * | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-1011-11/+11
| | |/ / / | |/| | |
* | | | | Split ProfileHandler into master and workerErik Johnston2018-08-171-7/+14
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-096-55/+112
|\| | | |
| * | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servletErik Johnston2018-08-092-31/+21
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-081-0/+10
| |\ \ \ \
| | * | | | more metrics for the federation and appservice sendersRichard van der Hoff2018-08-071-0/+10
| | | |_|/ | | |/| |
| * | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-082-3/+38
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Don't expose default_room_version as config optRichard van der Hoff2018-08-071-1/+2
| | * | | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-061-2/+11
| | * | | Basic support for room versioningRichard van der Hoff2018-08-031-1/+26
| * | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-082-21/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | py3 fixNeil Johnson2018-08-031-1/+1
| | * | | bug fixesNeil Johnson2018-08-032-17/+6
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-033-114/+140
| | |\| |
| | * | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-022-12/+8
| * | | | Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-031-31/+58
| | |/ / | |/| |
* | | | Allow profile changes to happen on workersErik Johnston2018-08-071-5/+21
| |_|/ |/| |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r...Erik Johnston2018-08-035-141/+210
|\| |
| * | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-021-17/+8
| |\ \
| | * | Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-011-17/+8
| * | | Merge branch 'master' into developRichard van der Hoff2018-08-022-10/+44
| |\ \ \
| | * | | Check room visibility for /event/ requestsRichard van der Hoff2018-08-021-4/+21
| | * | | Avoid extra db lookupsRichard van der Hoff2018-08-021-27/+11
| | * | | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-021-1/+34
| * | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-021-87/+88
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | update docsErik Johnston2018-08-011-3/+5
| | * | | _persist_auth_tree no longer returns anythingErik Johnston2018-08-011-1/+1
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_...Erik Johnston2018-07-306-30/+177
| | |\ \ \
| | * | | | Split out DB writes in federation handlerErik Johnston2018-07-251-83/+82
| * | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-012-3/+35
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-011-14/+14
| | |\ \ \ \
| | * | | | | count_monthly_users() asyncNeil Johnson2018-08-011-4/+7
| | * | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-011-4/+5
| | * | | | | coding styleNeil Johnson2018-07-311-1/+2
| | * | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-302-2/+29
| | | |_|/ / | | |/| | |
| * | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-022-10/+21
| | |/ / / | |/| | |
| * | | | rename replication_layer to federation_clientRichard van der Hoff2018-07-311-14/+14
| |/ / /
* | | | Use new helper base class for membership requestsErik Johnston2018-07-311-24/+17
* | | | Use new helper base class for ReplicationSendEventRestServletErik Johnston2018-07-311-7/+4
|/ / /
* | | make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-272-4/+22
* | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pidRichard van der Hoff2018-07-271-0/+4
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_...Michael Telatynski2018-07-2431-1534/+3975
| |\ \ \
| * | | | if inviter_display_name == ""||None then default to inviter MXIDMichael Telatynski2018-06-131-0/+4
* | | | | Deduplicate redundant lazy-loaded members (#3331)Matthew Hodgson2018-07-261-25/+62
* | | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-261-1/+1
* | | | | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-261-14/+102
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-253-13/+21
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | clarify comment on p_idsMatthew Hodgson2018-07-241-1/+2
| * | | | | rather than adding ll_ids, remove them from p_idsMatthew Hodgson2018-07-241-5/+6
| * | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-246-282/+307
| |\ \ \ \ \
| * | | | | | incorporate more reviewMatthew Hodgson2018-07-241-3/+9
| * | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-234-43/+77
| |\ \ \ \ \ \
| * | | | | | | incorporate reviewMatthew Hodgson2018-07-231-40/+27
| * | | | | | | incorporate reviewMatthew Hodgson2018-07-191-17/+27
| * | | | | | | add a filtered_types param to limit filtering to specific typesMatthew Hodgson2018-07-191-29/+36
| * | | | | | | merge develop pydoc for _get_state_for_groupsMatthew Hodgson2018-07-1930-416/+441
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-101-0/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0411-30/+45
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | more commentsMatthew Hodgson2018-06-041-0/+7
| * | | | | | | | | | add pydocMatthew Hodgson2018-05-291-5/+13
| * | | | | | | | | | merge developMatthew Hodgson2018-05-2920-472/+970
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | make lazy_load_members configurable in filtersMatthew Hodgson2018-03-191-9/+9
| * | | | | | | | | | | reshuffle todo & commentsMatthew Hodgson2018-03-191-2/+10
| * | | | | | | | | | | only get member state IDs for incremental syncs if we're filteringMatthew Hodgson2018-03-181-5/+5
| * | | | | | | | | | | remove debugMatthew Hodgson2018-03-161-4/+0
| * | | | | | | | | | | fix tsm search againMatthew Hodgson2018-03-161-5/+4
| * | | | | | | | | | | add state_ids for timeline entriesMatthew Hodgson2018-03-161-4/+14
| * | | | | | | | | | | simplify timeline_start_membersMatthew Hodgson2018-03-161-14/+13
| * | | | | | | | | | | make incr syncs workMatthew Hodgson2018-03-161-3/+4
| * | | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-03-143-101/+293
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add copyright to nudge CIMatthew Hodgson2018-03-141-1/+2
| * | | | | | | | | | | | oopsMatthew Hodgson2018-03-131-1/+1
| * | | | | | | | | | | | make it workMatthew Hodgson2018-03-131-3/+3
| * | | | | | | | | | | | merge proper fix to bug 2969Matthew Hodgson2018-03-1313-73/+223
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ensure we always include the members for a given timeline blockMatthew Hodgson2018-03-131-4/+32
| * | | | | | | | | | | | | typosMatthew Hodgson2018-03-111-2/+2
| * | | | | | | | | | | | | WIP experiment in lazyloading room membersMatthew Hodgson2018-03-111-12/+31
* | | | | | | | | | | | | | Fix a minor documentation typo in on_make_leaveTravis Ralston2018-07-251-1/+1
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fix updating of cached remote profilesRichard van der Hoff2018-07-251-1/+8
* | | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.STARTErik Johnston2018-07-241-5/+7
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groupsRichard van der Hoff2018-07-241-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_eventsRichard van der Hoff2018-07-231-7/+6
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-244-264/+282
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-244-32/+66
| |\| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api...Erik Johnston2018-07-232-11/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move PaginationHandler to its own fileErik Johnston2018-07-202-240/+267
| * | | | | | | | | | | | Move check_in_room_or_world_readable to AuthErik Johnston2018-07-201-34/+6
| * | | | | | | | | | | | Move RoomContextHandler out of HandlersErik Johnston2018-07-182-3/+5
| * | | | | | | | | | | | Split MessageHandler into read only and writersErik Johnston2018-07-182-133/+150
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | another couple of logcontext leaksRichard van der Hoff2018-07-242-5/+10
* | | | | | | | | | | | Logcontext fixesRichard van der Hoff2018-07-241-13/+15
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Fix missing attributes on workers.Erik Johnston2018-07-231-2/+3
* | | | | | | | | | | Add support for updating stateErik Johnston2018-07-231-9/+23
* | | | | | | | | | | Use new gettersErik Johnston2018-07-234-21/+40
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-211-9/+9
* | | | | | | | | | Combine Limiter and LinearizerRichard van der Hoff2018-07-201-2/+2
* | | | | | | | | | Improvements to the LimiterRichard van der Hoff2018-07-201-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacksRichard van der Hoff2018-07-181-43/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge branch 'develop' into rav/drop_re_signing_hacksRichard van der Hoff2018-07-0412-111/+313
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove event re-signing hacksRichard van der Hoff2018-06-071-43/+0
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-171-138/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-161-138/+6
* | | | | | | | | | typoMatthew Hodgson2018-07-131-3/+3
|/ / / / / / / / /
* | | | | | | | | s/becuase/because/gMatthew Hodgson2018-07-102-2/+2
* | | | | | | | | run isortAmber Brown2018-07-0930-184/+186
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checkingErik Johnston2018-06-291-28/+68
|\ \ \ \ \ \ \ \
| * | | | | | | | try and clean upAmber Brown2018-06-271-3/+6
| * | | | | | | | pep8Amber Brown2018-06-271-6/+4
| * | | | | | | | cleanupsAmber Brown2018-06-271-13/+15
| * | | | | | | | handle federation not telling us about prev_eventsAmber Brown2018-06-271-25/+62
* | | | | | | | | Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-284-9/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-apiMatthew Hodgson2018-06-261-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add GDPR erase param to deactivate APIMatthew Hodgson2018-06-261-0/+1
* | | | | | | | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-partsErik Johnston2018-06-251-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | allow non-consented users to still part rooms (to let us autopart them)Matthew Hodgson2018-06-251-2/+6
| |/ / / / / / / /
* | | | | | | | | Actually fix itErik Johnston2018-06-251-3/+3
* | | | | | | | | CommentErik Johnston2018-06-251-0/+8
* | | | | | | | | Fix bug with assuming wrong typeErik Johnston2018-06-251-2/+2
* | | | | | | | | Add fast path to _filter_events_for_serverErik Johnston2018-06-251-1/+34
|/ / / / / / / /
* | | | | | | | typosMatthew Hodgson2018-06-251-1/+1
* | | | | | | | typoMatthew Hodgson2018-06-251-1/+1
* | | | | | | | Merge pull request #3441 from matrix-org/erikj/redo_erasureErik Johnston2018-06-252-1/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili...Erik Johnston2018-06-252-1/+19
* | | | | | | | | Remove all global reactor imports & pass it around explicitly (#3424)Amber Brown2018-06-253-6/+6
|/ / / / / / / /
* | | | | | | | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"Richard van der Hoff2018-06-222-19/+1
* | | | | | | | Also log number of events for serach contextErik Johnston2018-06-221-0/+5
* | | | | | | | Add some logging to search queriesErik Johnston2018-06-221-0/+9
* | | | | | | | Merge pull request #3431 from matrix-org/rav/erasure_visibilityErik Johnston2018-06-222-1/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Filter out erased messagesRichard van der Hoff2018-06-121-0/+13
| * | | | | | | | mark accounts as erased when requestedRichard van der Hoff2018-06-121-1/+6
* | | | | | | | | Merge pull request #3428 from matrix-org/erikj/persisted_pduErik Johnston2018-06-221-18/+26
|\| | | | | | | |
| * | | | | | | | simplify get_persisted_pduRichard van der Hoff2018-06-121-18/+26
* | | | | | | | | Pass around the reactor explicitly (#3385)Amber Brown2018-06-223-15/+25
* | | | | | | | | Merge pull request #3399 from costacruise/masterRichard van der Hoff2018-06-201-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add error code to room creation errorMichael Wagner2018-06-141-2/+6
| * | | | | | | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Remove run_on_reactor (#3395)Amber Brown2018-06-145-26/+5
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3276 from matrix-org/dbkr/unbindDavid Baker2018-06-113-2/+82
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | doc fixesDavid Baker2018-06-051-1/+1
| * | | | | | | Fix commentDavid Baker2018-06-041-1/+1
| * | | | | | | Missing yieldDavid Baker2018-06-041-1/+1
| * | | | | | | docstringDavid Baker2018-06-041-1/+9
| * | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/unbindDavid Baker2018-05-245-16/+46
| |\ \ \ \ \ \ \
| * | | | | | | | pep8David Baker2018-05-243-7/+12
| * | | | | | | | commentDavid Baker2018-05-241-0/+4
| * | | | | | | | Unbind 3pids when they're deleted tooDavid Baker2018-05-241-0/+8
| * | | | | | | | Hit the 3pid unbind endpoint on deactivationDavid Baker2018-05-232-1/+56
* | | | | | | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'...Amber Brown2018-05-3110-29/+31
* | | | | | | | Update some comments and docstrings in SyncHandlerRichard van der Hoff2018-05-291-1/+11
* | | | | | | | Exempt AS-registered users from doing gdprRichard van der Hoff2018-05-291-0/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2810-61/+105
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_roomRichard van der Hoff2018-05-251-10/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Let users leave the server notice room after joiningRichard van der Hoff2018-05-251-10/+14
| * | | | | | | | Misc. py3 fixesAdrian Tschira2018-05-242-8/+10
| * | | | | | | | Merge pull request #3244 from NotAFile/py3-six-4Amber Brown2018-05-246-27/+35
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | replace some iteritems with sixAdrian Tschira2018-05-196-27/+35
| * | | | | | | | Remove users from user directory on deactivateDavid Baker2018-05-242-0/+11
| * | | | | | | | Merge pull request #3261 from matrix-org/erikj/pagination_fixesErik Johnston2018-05-241-9/+22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use iter* methodsErik Johnston2018-05-221-7/+7
| | * | | | | | | | Fix that states is a dict of dictsErik Johnston2018-05-221-1/+4
| | * | | | | | | | get_domains_from_state returns list of tuplesErik Johnston2018-05-221-2/+12
| * | | | | | | | | Merge pull request #3267 from matrix-org/erikj/iter_filterErik Johnston2018-05-241-5/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | s/values/itervalues/Erik Johnston2018-05-231-1/+1
| | * | | | | | | | Use iter* methods for _filter_events_for_serverErik Johnston2018-05-231-4/+4
| * | | | | | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uriRichard van der Hoff2018-05-231-1/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Support for putting %(consent_uri)s in messagesRichard van der Hoff2018-05-231-1/+4
| | |/ / / / / / / /
| * / / / / / / / / Use the localpart in the consent uriRichard van der Hoff2018-05-231-1/+3
| |/ / / / / / / /
| * | | / / / / / custom error code for not leaving server notices roomRichard van der Hoff2018-05-221-0/+1
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | comment typoDavid Baker2018-05-221-1/+1
* | | | | | | | cleanupAmber Brown2018-05-222-7/+14
* | | | | | | | cleanups, self-registrationAmber Brown2018-05-221-3/+4
* | | | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-228-75/+192
|\| | | | | | |
| * | | | | | | Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-222-1/+89
| |/ / / / / /
| * | | | | | Stub out ServerNoticesSender on the workersRichard van der Hoff2018-05-222-4/+5
| * | | | | | Send users a server notice about consentRichard van der Hoff2018-05-221-1/+9
| |/ / / / /
| * | | | | Merge pull request #3232 from matrix-org/rav/server_notices_roomRichard van der Hoff2018-05-184-6/+80
| |\ \ \ \ \
| | * | | | | Make sure we reject attempts to invite the notices userRichard van der Hoff2018-05-182-0/+15
| | * | | | | fix missing yield for server_notices_roomRichard van der Hoff2018-05-171-3/+4
| | * | | | | Infrastructure for a server notices roomRichard van der Hoff2018-05-173-6/+64
| * | | | | | Merge pull request #3233 from matrix-org/rav/remove_dead_codeRichard van der Hoff2018-05-181-55/+0
| |\ \ \ \ \ \
| | * | | | | | Remove unused `update_external_syncs`Richard van der Hoff2018-05-171-55/+0
| | |/ / / / /
| * | | | | | Merge pull request #3221 from matrix-org/erikj/purge_tokenErik Johnston2018-05-181-6/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Make purge_history operate on tokensErik Johnston2018-05-151-6/+6
| * | | | | | Move RoomCreationHandler out of synapse.handlers.HandlersRichard van der Hoff2018-05-172-6/+7
| |/ / / / /
* / / / / / replacing portionsAmber Brown2018-05-212-42/+35
|/ / / / /
* | | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivateDavid Baker2018-05-141-2/+79
|\ \ \ \ \
| * | | | | Catch failure to part user from roomDavid Baker2018-05-101-7/+13
| * | | | | Many docstringsDavid Baker2018-05-101-0/+24
| * | | | | Oops, don't call function passed to run_in_backgroundDavid Baker2018-05-101-1/+1
| * | | | | Prefix internal functionsDavid Baker2018-05-091-7/+7
| * | | | | Indent failDavid Baker2018-05-091-1/+1
| * | | | | Part deactivated users in the backgroundDavid Baker2018-05-091-1/+34
| * | | | | Part user from rooms on account deactivateDavid Baker2018-05-081-1/+15
* | | | | | Merge pull request #3199 from matrix-org/erikj/pagination_syncErik Johnston2018-05-091-6/+18
|\ \ \ \ \ \
| * | | | | | Add comment to sync as to why code path is splitErik Johnston2018-05-091-0/+5
| * | | | | | Refactor sync APIs to reuse pagination APIErik Johnston2018-05-091-6/+13
* | | | | | | Fix returned token is no longer a tupleErik Johnston2018-05-091-1/+1
|/ / / / / /
* / / / / / Refactor get_recent_events_for_room return typeErik Johnston2018-05-092-6/+6
|/ / / / /
* | | | | Merge branch 'release-v0.28.1' into developRichard van der Hoff2018-05-011-1/+5
|\ \ \ \ \
| * | | | | Apply some limits to depth to counter abuseRichard van der Hoff2018-05-011-1/+5
* | | | | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fnRichard van der Hoff2018-04-301-4/+2
|\ \ \ \ \ \
| * | | | | | Remove redundant call to preserve_fnRichard van der Hoff2018-04-301-4/+2
* | | | | | | Merge pull request #3153 from NotAFile/py3-httplibRichard van der Hoff2018-04-301-3/+3
|\ \ \ \ \ \ \
| * | | | | | | move httplib import to sixAdrian Tschira2018-04-281-3/+3
* | | | | | | | Merge pull request #3151 from NotAFile/py3-xrange-1Richard van der Hoff2018-04-301-1/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into py3-xrange-1Richard van der Hoff2018-04-306-21/+32
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Move more xrange to sixAdrian Tschira2018-04-281-1/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3150 from NotAFile/py3-listcomp-yieldRichard van der Hoff2018-04-301-5/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Don't yield in list comprehensionsAdrian Tschira2018-04-281-5/+9
| |/ / / / / /
* | | | | | | pep8; remove spurious importRichard van der Hoff2018-04-271-1/+1
* | | | | | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_backgroundRichard van der Hoff2018-04-276-74/+112
|\| | | | | |
| * | | | | | Merge pull request #3142 from matrix-org/rav/reraiseRichard van der Hoff2018-04-272-13/+24
| |\ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-26 08:37:57 +0000