summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | reraise exceptions more carefullyRichard van der Hoff2018-04-272-13/+24
| | |/
| * | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptionsRichard van der Hoff2018-04-274-59/+86
| |\ \
| | * | Improve exception handling for background processesRichard van der Hoff2018-04-274-59/+86
| | |/
| * / Add missing consumeErrorsRichard van der Hoff2018-04-271-2/+2
| |/
* / Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-276-20/+31
|/
* Merge pull request #3118 from matrix-org/rav/reject_prev_eventsRichard van der Hoff2018-04-231-7/+71
|\
| * Remove spurious paramRichard van der Hoff2018-04-231-1/+0
| * accept stupid events over backfillRichard van der Hoff2018-04-201-4/+9
| * Add some commentsRichard van der Hoff2018-04-181-3/+12
| * Check events on backfill tooRichard van der Hoff2018-04-181-15/+42
| * Reject events which have too many auth_events or prev_eventsRichard van der Hoff2018-04-181-4/+28
* | Merge pull request #3107 from NotAFile/py3-bool-nonzeroRichard van der Hoff2018-04-201-0/+7
|\ \
| * | add __bool__ alias to __nonzero__ methodsAdrian Tschira2018-04-151-0/+7
| |/
* | Merge pull request #3093 from matrix-org/rav/response_cache_wrapRichard van der Hoff2018-04-202-35/+19
|\ \
| * | Refactor ResponseCache usageRichard van der Hoff2018-04-122-35/+19
| |/
* | Merge pull request #3117 from matrix-org/rav/refactor_have_eventsRichard van der Hoff2018-04-201-19/+12
|\ \
| * | Refactor store.have_eventsRichard van der Hoff2018-04-201-19/+12
| |/
* / Avoid creating events with huge numbers of prev_eventsRichard van der Hoff2018-04-162-38/+53
|/
* Merge pull request #3092 from matrix-org/rav/response_cache_metricsRichard van der Hoff2018-04-122-3/+4
|\
| * Add metrics for ResponseCacheRichard van der Hoff2018-04-102-3/+4
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/processed_...Erik Johnston2018-04-121-2/+19
|\ \
| * \ Merge pull request #3088 from matrix-org/erikj/as_parallelErik Johnston2018-04-121-2/+19
| |\ \
| | * | Send events to ASes concurrentlyErik Johnston2018-04-111-2/+19
* | | | Set all metrics at the same timeErik Johnston2018-04-121-4/+4
* | | | Track last processed event received_tsErik Johnston2018-04-111-0/+10
* | | | Track where event stream processing have gotten up toErik Johnston2018-04-111-0/+4
|/ / /
* | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sendsErik Johnston2018-04-101-49/+55
|\ \ \ | |/ / |/| |
| * | Note why we're limiting concurrent event sendsErik Johnston2018-04-101-0/+5
| * | Limit concurrent event sends for a roomErik Johnston2018-04-091-49/+50
* | | Merge pull request #2996 from krombel/allow_auto_join_roomsRichard van der Hoff2018-04-101-2/+34
|\ \ \ | |_|/ |/| |
| * | Merge branch 'develop' of into allow_auto_join_roomsKrombel2018-03-283-8/+14
| |\ \
| * | | move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-141-2/+34
* | | | Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoinRichard van der Hoff2018-04-091-0/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Return a 404 rather than a 500 on rejoining empty roomsRichard van der Hoff2018-04-091-0/+8
* | | | Implement group join APIDavid Baker2018-04-061-1/+39
|/ / /
* | | Merge pull request #3045 from matrix-org/dbkr/group_joinableLuke Barnard2018-04-051-0/+3
|\ \ \
| * | | Use join_policy API instead of joinableLuke Barnard2018-04-031-1/+1
| * | | Add joinability for groupsDavid Baker2018-03-281-0/+3
* | | | Merge pull request #3000 from NotAFile/change-except-styleRichard van der Hoff2018-04-041-3/+3
|\ \ \ \
| * | | | replace old style error catching with 'as' keywordNotAFile2018-03-151-3/+3
| | |/ / | |/| |
* | | | Merge pull request #3049 from matrix-org/rav/use_staticjsonRichard van der Hoff2018-04-031-2/+2
|\ \ \ \
| * | | | Use static JSONEncodersRichard van der Hoff2018-03-291-2/+2
* | | | | Use simplejson throughoutRichard van der Hoff2018-03-291-3/+5
|/ / / /
* | | | Merge pull request #3034 from matrix-org/rav/fix_key_claim_errorsRichard van der Hoff2018-03-281-28/+28
|\ \ \ \ | |_|_|/ |/| | |
| * | | Stringify exceptions for keys/{query,claim}Richard van der Hoff2018-03-271-1/+4
| * | | factor out exception handling for keys/claim and keys/queryRichard van der Hoff2018-03-271-28/+25
| | |/ | |/|
* | | Also do check inside linearizerErik Johnston2018-03-271-3/+4
* | | PEP8Erik Johnston2018-03-261-1/+3
* | | Linearize calls to _generate_user_idErik Johnston2018-03-261-4/+7
|/ /
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-192-4/+4
|\ \ | |/ |/|
| * Replace ujson with simplejsonErik Johnston2018-03-152-4/+4
* | Merge pull request #2992 from matrix-org/erikj/implement_member_workreErik Johnston2018-03-141-0/+102
|\ \
| * | s/join/joined/ in notify_user_membership_changeErik Johnston2018-03-141-1/+1
| * | Split RoomMemberWorkerHandler to separate fileErik Johnston2018-03-142-78/+102
| * | Implement RoomMemberWorkerHandlerErik Johnston2018-03-131-0/+78
* | | Merge pull request #2989 from matrix-org/erikj/profile_cache_masterErik Johnston2018-03-141-1/+4
|\ \ \
| * | | Only update remote profile cache on masterErik Johnston2018-03-131-1/+4
* | | | _remote_join and co take a requesterErik Johnston2018-03-131-4/+4
| |/ / |/| |
* | | Merge pull request #2987 from matrix-org/erikj/split_room_member_handlerErik Johnston2018-03-131-98/+185
|\ \ \ | |/ / |/| |
| * | Add missing param to docstringsErik Johnston2018-03-131-0/+3
| * | Correct import orderErik Johnston2018-03-131-3/+3
| * | Move user_*_room distributor stuff to master classErik Johnston2018-03-131-5/+50
| * | Split RoomMemberHandler into base and master classErik Johnston2018-03-131-96/+135
* | | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layerErik Johnston2018-03-136-6/+6
|\ \ \
| * | | s/replication_client/federation_client/Erik Johnston2018-03-136-6/+6
* | | | Merge pull request #2981 from matrix-org/erikj/factor_remote_leaveErik Johnston2018-03-131-22/+54
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_rem...Erik Johnston2018-03-1311-31/+49
| |\ \ \
| * | | | Add docstringErik Johnston2018-03-131-0/+26
| * | | | Factor out _remote_reject_invite in RoomMemberErik Johnston2018-03-131-22/+28
* | | | | Merge pull request #2979 from matrix-org/erikj/no_handlersErik Johnston2018-03-138-12/+7
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Split replication layer into twoErik Johnston2018-03-138-12/+7
* | | | Merge pull request #2980 from matrix-org/erikj/rm_privErik Johnston2018-03-131-7/+7
|\ \ \ \
| * | | | Make functions private that can beErik Johnston2018-03-131-7/+7
| | |/ / | |/| |
* | | | Merge pull request #2982 from matrix-org/erikj/fix_extra_usersErik Johnston2018-03-131-1/+1
|\ \ \ \
| * | | | extra_users is actually a list of UserIDsErik Johnston2018-03-131-1/+1
| |/ / /
* | | | Merge pull request #2983 from matrix-org/erikj/rename_register_3pidErik Johnston2018-03-132-11/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor get_or_register_3pid_guestErik Johnston2018-03-132-11/+25
| |/ /
* / / Split out edu/query registration to a separate classErik Johnston2018-03-138-12/+16
|/ /
* | Add transactional API to history purgeRichard van der Hoff2018-03-121-5/+99
* | Return an error when doing two purges on a roomRichard van der Hoff2018-03-121-3/+14
* | Fix up log messageErik Johnston2018-03-071-1/+1
* | Fix typoErik Johnston2018-03-071-2/+2
* | Fix race in sync when joining roomErik Johnston2018-03-071-28/+75
* | Merge pull request #2949 from krombel/use_bcrypt_checkpwRichard van der Hoff2018-03-061-2/+4
|\ \
| * | use bcrypt.checkpwKrombel2018-03-051-2/+4
* | | Merge pull request #2946 from matrix-org/rav/timestamp_to_purgeRichard van der Hoff2018-03-061-9/+5
|\ \ \
| * | | Provide a means to pass a timestamp to purge_historyRichard van der Hoff2018-03-051-9/+5
| |/ /
* / / Remove ability for AS users to call /events and /syncErik Johnston2018-03-052-10/+9
|/ /
* | Add missing yield during 3pid signature checksErik Johnston2018-03-021-1/+1
* | Merge pull request #2927 from matrix-org/erikj/read_marker_cachesErik Johnston2018-03-011-3/+3
|\ \
| * | Improve caching for read_marker APIErik Johnston2018-03-011-3/+3
* | | Move back to hs.is_mineErik Johnston2018-03-011-7/+6
* | | Move RoomMemberHandler out of HandlersErik Johnston2018-03-016-31/+37
|/ /
* | Check event auth on the workerErik Johnston2018-03-011-16/+16
* | Correctly send ratelimit and extra_users paramsErik Johnston2018-03-011-0/+2
* | Fixup commentsErik Johnston2018-03-011-4/+4
* | Calculate push actions on workerErik Johnston2018-02-281-25/+61
* | Delete from push_actions_staging in federation tooErik Johnston2018-02-201-9/+17
* | Ensure that we delete staging push actions on errorsErik Johnston2018-02-151-3/+9
* | Merge pull request #2854 from matrix-org/erikj/event_create_workerErik Johnston2018-02-131-6/+22
|\ \
| * | Move presence handling into handle_new_client_eventErik Johnston2018-02-071-6/+6
| * | Add replication http endpoint for event sendingErik Johnston2018-02-071-0/+16
* | | Merge pull request #2858 from matrix-org/rav/purge_updatesRichard van der Hoff2018-02-091-2/+2
|\ \ \ | |/ / |/| |
| * | delete_local_events for purge_historyRichard van der Hoff2018-02-091-2/+2
| * | rename delete_old_state -> purge_historyRichard van der Hoff2018-02-091-1/+1
* | | Remove pointless ratelimit checkErik Johnston2018-02-071-5/+0
* | | Merge pull request #2847 from matrix-org/erikj/separate_event_creationErik Johnston2018-02-065-179/+193
|\ \ \
| * | | Update copyrightErik Johnston2018-02-064-1/+4
| * | | s/_create_new_client_event/create_new_client_event/Erik Johnston2018-02-062-8/+8
| * | | Update places where we create eventsErik Johnston2018-02-054-29/+26
| * | | Split event creation into a separate handlerErik Johnston2018-02-051-146/+160
* | | | Store state groups separately from events (#2784)Erik Johnston2018-02-061-7/+17
|/ / /
* | | Rename resolve_state_groups -> resolve_state_groups_for_eventsRichard van der Hoff2018-02-011-6/+5
* | | add white space lineNeil Johnson2018-01-261-0/+1
* | | rather than try reconstruct the results object, better to guard against the x...Neil Johnson2018-01-261-6/+2
* | | fix return type, should be a dictNeil Johnson2018-01-251-1/+1
* | | fix PEP8 violationNeil Johnson2018-01-251-1/+1
* | | remove white spaceNeil Johnson2018-01-251-1/+0
* | | synapse 500s on a call to publicRooms in the case where the number of public ...Neil Johnson2018-01-251-0/+5
* | | Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-223-1/+15
* | | rewrite based on PR feedback:Matthew Hodgson2018-01-191-10/+5
* | | fix up v1, and improve errorsMatthew Hodgson2018-01-191-1/+12
|/ /
* | Sanity checking for user idsRichard van der Hoff2018-01-172-8/+19
* | Metrics for events processed in appservice and fed senderRichard van der Hoff2018-01-151-0/+7
* | Merge pull request #2773 from matrix-org/erikj/hash_bgErik Johnston2018-01-103-10/+18
|\ \
| * | Do bcrypt hashing in a background threadErik Johnston2018-01-103-10/+18
* | | fix order of operations derp and also use `.get` to default to {}Michael Telatynski2018-01-101-2/+3
* | | Fix publicised groups API (singular) over federationMichael Telatynski2018-01-101-4/+4
| |/ |/|
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom...Erik Johnston2017-12-0712-116/+389
|\ \
| * \ Merge pull request #2723 from matrix-org/matthew/search-all-local-usersMatthew Hodgson2017-12-053-16/+78
| |\ \
| | * | speed up the rate of initial spam for usersMatthew Hodgson2017-12-041-11/+12
| | * | fix pep8 and testsMatthew Hodgson2017-12-042-4/+3
| | * | switch to a simpler 'search_all_users' button as per review feedbackMatthew Hodgson2017-12-043-6/+6
| | * | Merge branch 'develop' into matthew/search-all-local-usersMatthew Hodgson2017-11-304-37/+139
| | |\|
| | * | fix thinkos galoreMatthew Hodgson2017-11-301-4/+6
| | * | kick the user_directory index when new users registerMatthew Hodgson2017-11-291-0/+8
| | * | untested WIP but might actually workMatthew Hodgson2017-11-292-4/+56
| | * | Add user_directory_include_pattern config param to expand search results to a...Matthew Hodgson2017-11-291-2/+2
| * | | support custom login types for validating usersRichard van der Hoff2017-12-051-24/+57
| * | | Factor out a validate_user_via_ui_auth methodRichard van der Hoff2017-12-051-0/+43
| * | | Refactor UI auth implementationRichard van der Hoff2017-12-051-17/+29
| | |/ | |/|
| * | Delete devices in various logout situationsRichard van der Hoff2017-11-293-1/+38
| * | Move set_password into its own handlerRichard van der Hoff2017-11-292-16/+45
| * | Move deactivate_account into its own handlerRichard van der Hoff2017-11-292-16/+44
| * | Remove pushers when deleting access tokensRichard van der Hoff2017-11-291-4/+12
| |/
| * Merge pull request #2686 from matrix-org/luke/as-flairLuke Barnard2017-11-171-0/+11
| |\
| | * Make sure we check AS groups for lookup on bulkLuke Barnard2017-11-161-0/+5
| | * Add automagical AS Publicised Group(s)Luke Barnard2017-11-161-0/+6
| * | typoMatthew Hodgson2017-11-171-1/+1
| * | Fix auth handler #2678Jurek2017-11-161-1/+1
| |/
| * Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcsRichard van der Hoff2017-11-152-4/+4
| |\
| | * Remove preserve_context_over_{fn, deferred}Richard van der Hoff2017-11-142-4/+4
| * | Reshuffle room list request codeRichard van der Hoff2017-11-141-27/+24
| * | Add a load of logging to the room_list handlerRichard van der Hoff2017-11-141-0/+13
| |/
* | Copy dict in update_membership tooErik Johnston2017-12-071-0/+4
* | PEP8Erik Johnston2017-11-281-1/+1
* | Fix wrong avatars when inviting multiple users when creating roomErik Johnston2017-11-281-5/+5
* | Fix auth handler #2678Jurek2017-11-171-1/+1
|/
* Revert "Allow upper-case characters in mxids"Richard van der Hoff2017-11-091-3/+3
* Allow upper-case characters in mxidsRichard van der Hoff2017-11-091-3/+3
* Have an explicit API to update room configErik Johnston2017-11-081-0/+1
* Revert "Modify group room association API to allow modification of is_public"Erik Johnston2017-11-081-2/+2
* Merge pull request #2631 from xyzz/fix_appservice_event_backlogErik Johnston2017-11-081-5/+1
|\
| * Remove useless assignment in notify_interested_servicesIlya Zhuravlev2017-11-071-1/+0
| * Fix appservices being backlogged and not receiving new events due to a bug in...Ilya Zhuravlev2017-11-021-4/+1
* | Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_resRichard van der Hoff2017-11-081-20/+46
|\ \
| * | s/items/iteritems/Richard van der Hoff2017-11-081-2/+2
| * | Update deltas when doing auth resolutionRichard van der Hoff2017-11-071-3/+7
| * | factor out _update_context_for_auth_eventsRichard van der Hoff2017-11-071-20/+42
* | | Merge pull request #2643 from matrix-org/matthew/user_dir_typosMatthew Hodgson2017-11-071-2/+2
|\ \ \ | |/ / |/| |
| * | s/intial/initial/Matthew Hodgson2017-11-041-2/+2
| |/
* | Merge pull request #2636 from farialima/me-masterErik Johnston2017-11-071-13/+8
|\ \ | |/ |/|
| * removed unused import flagged by flake8aFrancois Granade2017-11-031-1/+0
| * Fix for issue 2635: correctly update rooms avatar/display name when modified ...Francois Granade2017-11-031-12/+8
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 14:19:03 +0000