summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Create 3378.miscAmber Brown2018-09-031-0/+1
* Merge branch 'develop' into developAmber Brown2018-09-03441-11570/+24237
|\
| * Merge pull request #3777 from matrix-org/neilj/fix_register_user_registrationNeil Johnson2018-08-319-5/+78
| |\
| | * assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
| | * move threepid checker to config, add missing yieldsNeil Johnson2018-08-316-21/+41
| | * fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
| | * typoNeil Johnson2018-08-311-1/+1
| | * ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-314-6/+24
| | * news fragemntNeil Johnson2018-08-311-0/+1
| | * fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-315-3/+38
| |/
| * Port storage/ to Python 3 (#3725)Amber Brown2018-08-3117-36/+208
| * Merge pull request #3764 from matrix-org/rav/close_db_conn_after_initRichard van der Hoff2018-08-3016-54/+41
| |\
| | * Fix up testsRichard van der Hoff2018-08-283-6/+10
| | * use abc.abstractpropertyRichard van der Hoff2018-08-281-5/+4
| | * changelogRichard van der Hoff2018-08-281-0/+1
| | * Make sure that we close db connections opened during initRichard van der Hoff2018-08-2812-48/+31
| * | Merge pull request #3768 from krombel/fix_3445Erik Johnston2018-08-292-2/+3
| |\ \
| | * | changelogKrombel2018-08-292-1/+1
| | * | fix #3445Krombel2018-08-292-2/+3
| |/ /
| * | Update CONTRIBUTING to clarify miscs & Markdown (#3730)Amber Brown2018-08-292-3/+5
| * | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-282-1/+9
| |/
| * Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3Erik Johnston2018-08-248-13/+14
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-243-4/+5
| | |\ | | |/ | |/|
| * | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_noticesErik Johnston2018-08-243-4/+5
| |\ \
| | * | NewsfileErik Johnston2018-08-241-0/+1
| | * | Fix checking if service notice room is already taggedErik Johnston2018-08-242-4/+4
| |/ /
| | * NewsfileErik Johnston2018-08-241-0/+1
| | * Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-247-13/+13
| |/
| * Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags hhs-2Erik Johnston2018-08-243-4/+16
| |\
| | * NewsfileErik Johnston2018-08-241-0/+1
| | * Ensure we wake up /sync when we add tag to notice roomErik Johnston2018-08-242-2/+13
| | * Make content of tag an empty object rather than nullErik Johnston2018-08-242-2/+2
| |/
| * Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1Erik Johnston2018-08-242-1/+2
| |\
| | * NewsfileErik Johnston2018-08-241-0/+1
| | * Fix bug when federation_domain_whitelist is an emtpy listErik Johnston2018-08-241-1/+1
| * | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticseErik Johnston2018-08-242-0/+5
| |\ \
| | * | NewsfileErik Johnston2018-08-241-0/+1
| | * | Fix bug where we broke sync when using limit_usage_by_mauErik Johnston2018-08-241-0/+4
| | |/
| * | Merge pull request #3751 from matrix-org/rav/twisted_17Richard van der Hoff2018-08-242-1/+2
| |\ \ | | |/ | |/|
| | * changelogRichard van der Hoff2018-08-241-0/+1
| | * Pin to twisted 17.1 or laterRichard van der Hoff2018-08-241-1/+1
| * | Merge pull request #3749 from matrix-org/erikj/add_trial_usersErik Johnston2018-08-248-5/+272
| |\ \ | | |/ | |/|
| | * NewsfileErik Johnston2018-08-231-0/+1
| | * Unit testsErik Johnston2018-08-232-3/+227
| | * Implement trail usersErik Johnston2018-08-235-2/+44
| |/
| * Merge pull request #3747 from matrix-org/erikj/fix_multiple_sends_noticeErik Johnston2018-08-233-1/+72
| |\
| | * NewsfileErik Johnston2018-08-231-0/+1
| | * Fix bug where we resent "limit exceeded" server noticesErik Johnston2018-08-232-1/+71
| |/
| * Merge pull request #3734 from matrix-org/travis/worker-docsTravis Ralston2018-08-232-1/+2
| |\
| | * Create 3734.miscTravis Ralston2018-08-211-0/+1
| | * Reference that the federation_reader needs the HTTP replication port setTravis Ralston2018-08-211-1/+1
| * | Merge pull request #3746 from matrix-org/erikj/mau_fixupsErik Johnston2018-08-233-1/+3
| |\ \
| | * | NewsfileErik Johnston2018-08-231-0/+1
| | * | Actually run the testsErik Johnston2018-08-231-0/+0
| | * | Add missing yieldErik Johnston2018-08-231-1/+2
| |/ /
| * | Merge pull request #3680 from matrix-org/neilj/server_notices_on_blockingErik Johnston2018-08-2210-32/+408
| |\ \
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-22116-764/+1624
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' into developRichard van der Hoff2018-08-223-4/+12
| |\ \ \
| | * | | Use recaptcha_ajax.js directly from GoogleRichard van der Hoff2018-08-222-196/+1
| | * | | Merge tag 'v0.33.3'Richard van der Hoff2018-08-22200-3529/+5653
| | |\ \ \
| | | * | | changelog for 0.33.3 v0.33.3 github/release-v0.33.3 release-v0.33.3Richard van der Hoff2018-08-222-1/+9
| | | * | | bump version to 0.33.3Richard van der Hoff2018-08-221-1/+1
| | | * | | Update attributions and PR links in changelogRichard van der Hoff2018-08-221-2/+2
| | * | | | Merge pull request #3685 from matrix-org/revert-3677-masterRichard van der Hoff2018-08-133-2/+196
| | |\ \ \ \
| | | * | | | Revert "Use recaptcha_ajax.js directly from Google"Richard van der Hoff2018-08-133-2/+196
| | |/ / / /
| | * | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-133-196/+2
| | |\ \ \ \
| * | \ \ \ \ Merge pull request #3724 from Half-Shot/hs/guest-fetch-eventErik Johnston2018-08-222-1/+2
| |\ \ \ \ \ \
| | * | | | | | 3724.featureWill Hunt2018-08-201-0/+1
| | * | | | | | Allow guests to access /rooms/:roomId/event/:eventIdWill Hunt2018-08-201-1/+1
| * | | | | | | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-229-44/+78
| |\ \ \ \ \ \ \
| | * | | | | | | Rename WorkerProfileHandler to BaseProfileHandlerErik Johnston2018-08-222-5/+12
| | * | | | | | | Add assert to ensure handler is only run on masterErik Johnston2018-08-221-0/+2
| | * | | | | | | Remove redundant varsErik Johnston2018-08-221-3/+0
| | * | | | | | | Add some fixmesErik Johnston2018-08-172-0/+6
| | * | | | | | | Call UserDirectoryHandler methods directlyErik Johnston2018-08-174-104/+8
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-17244-2980/+3681
| | |\ \ \ \ \ \ \
| | * | | | | | | | Split ProfileHandler into master and workerErik Johnston2018-08-173-11/+21
| | * | | | | | | | Remote profile cache should remain in master workerErik Johnston2018-08-171-4/+2
| | * | | | | | | | DocstringsErik Johnston2018-08-091-1/+11
| | * | | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-0967-408/+1156
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Update workers.rst with new pathsErik Johnston2018-08-071-0/+1
| | * | | | | | | | | Allow ratelimiting on workersErik Johnston2018-08-071-29/+29
| | * | | | | | | | | Allow profile changes to happen on workersErik Johnston2018-08-075-8/+106
| * | | | | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-2213-277/+437
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-20208-3244/+4271
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove redundant room_version checksErik Johnston2018-08-202-15/+4
| | * | | | | | | | | | | Revert spurious changeErik Johnston2018-08-201-2/+2
| | * | | | | | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | * | | | | | | | | | | Fix testsErik Johnston2018-08-096-5/+46
| | * | | | | | | | | | | Add fast path in state res for zero prev eventsErik Johnston2018-08-091-1/+6
| | * | | | | | | | | | | Choose state algorithm based on room versionErik Johnston2018-08-094-16/+105
| | * | | | | | | | | | | Add constants for room versionsErik Johnston2018-08-091-2/+7
| | * | | | | | | | | | | Refactor state moduleErik Johnston2018-08-092-296/+325
| * | | | | | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spellingRichard van der Hoff2018-08-222-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Create 3735.miscTravis Ralston2018-08-211-0/+1
| | * | | | | | | | | | | | limt -> limitTravis Ralston2018-07-311-1/+1
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.3' into developRichard van der Hoff2018-08-222-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #3732 from matrix-org/rav/fix_gdpr_consentRichard van der Hoff2018-08-222-3/+13
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | changelogRichard van der Hoff2018-08-211-0/+1
| | | * | | | | | | | | | | fix another consent encoding failRichard van der Hoff2018-08-211-1/+1
| | | * | | | | | | | | | | Fix 500 error from /consent formRichard van der Hoff2018-08-211-2/+11
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-223-28/+236
| * | | | | | | | | | | | Merge tag 'v0.33.3rc2' into developRichard van der Hoff2018-08-2146-46/+91
| |\| | | | | | | | | | |
| | * | | | | | | | | | | changelog v0.33.3rc2Amber Brown2018-08-213-2/+10
| | * | | | | | | | | | | Merge pull request #3723 from matrix-org/rav/fix_logcontext_disasterAmber Brown2018-08-213-3/+18
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | changelogRichard van der Hoff2018-08-201-0/+1
| | | * | | | | | | | | | | Fix exceptions when a connection is closed before we read the headersRichard van der Hoff2018-08-202-2/+10
| | | * | | | | | | | | | | Robustness fix for logcontext filterRichard van der Hoff2018-08-201-1/+7
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | changelog v0.33.3rc1Amber Brown2018-08-2143-42/+64
| | * | | | | | | | | | | versionAmber Brown2018-08-211-1/+1
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keysErik Johnston2018-08-213-5/+10
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Log more detail when we fail to authenticate requestErik Johnston2018-08-211-3/+3
| | * | | | | | | | | | | NewsfileErik Johnston2018-08-211-0/+1
| | * | | | | | | | | | | Don't log exceptions when failing to fetch server keysErik Johnston2018-08-212-4/+8
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #3722 from matrix-org/erikj/bg_process_iterationErik Johnston2018-08-213-8/+32
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix typoErik Johnston2018-08-211-4/+4
| | * | | | | | | | | | isortErik Johnston2018-08-211-1/+2
| | * | | | | | | | | | NewsfileErik Johnston2018-08-201-0/+1
| | * | | | | | | | | | Make the in flight requests metrics thread safeErik Johnston2018-08-201-3/+10
| | * | | | | | | | | | Make the in flight background process metrics thread safeErik Johnston2018-08-201-5/+20
| |/ / / / / / / / / /
| * | | / / / / / / / Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-2012-40/+91
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #3719 from matrix-org/erikj/use_cache_factErik Johnston2018-08-202-2/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2018-08-201-0/+1
| | * | | | | | | | | Use get_cache_factor_for function for `state_cache`Erik Johnston2018-08-201-2/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_loggingErik Johnston2018-08-202-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2018-08-171-0/+1
| | * | | | | | | | | Fix logging bug in EDU handling over replicationErik Johnston2018-08-171-1/+1
| * | | | | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commandsRichard van der Hoff2018-08-179-20/+54
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | changelogRichard van der Hoff2018-08-171-0/+1
| | * | | | | | | | | | Logcontexts for replication command handlersRichard van der Hoff2018-08-178-20/+53
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updatesRichard van der Hoff2018-08-176-21/+29
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | changelogRichard van der Hoff2018-08-171-0/+1
| | * | | | | | | | | | Fix logcontexts for running pushersRichard van der Hoff2018-08-175-21/+28
| | |/ / / / / / / / /
| * | | | | | | | | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-1817-67/+303
| * | | | | | | | | | Remove v1/register's broken shared secret functionality (#3703)Amber Brown2018-08-182-54/+1
| * | | | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-179-64/+63
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | changelogRichard van der Hoff2018-08-151-0/+1
| | * | | | | | | | | | Fix the testsAmber Brown2018-08-157-60/+49
| | * | | | | | | | | | Use a producer to stream back responsesRichard van der Hoff2018-08-151-4/+13
| * | | | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producersRichard van der Hoff2018-08-173-92/+180
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | changelogRichard van der Hoff2018-08-151-0/+1
| | * | | | | | | | | | | Refactor request logging codeRichard van der Hoff2018-08-152-92/+179
| | | | | | | | | | | | * Update notice formatErik Johnston2018-08-223-8/+24
| | | | | | | | | | | | * rename error codeNeil Johnson2018-08-184-8/+8
| | | | | | | | | | | | * special case server_notices_mxidNeil Johnson2018-08-181-0/+6
| | | | | | | | | | | | * special case server_notices_mxidNeil Johnson2018-08-182-1/+9
| | | | | | | | | | | | * clean up, no functional changesNeil Johnson2018-08-173-56/+64
| | | | | | | | | | | | * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-179-24/+75
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3707 from matrix-org/neilj/limit_exceeded_errorNeil Johnson2018-08-179-24/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse in...Neil Johnson2018-08-1712-4/+36
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-1711-4/+35
| | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | add new error type ResourceLimitNeil Johnson2018-08-161-0/+1
| | * | | | | | | | | | | | server limits config docsNeil Johnson2018-08-171-0/+26
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | add new error type ResourceLimitNeil Johnson2018-08-168-24/+47
| | | | | | | | | | | | * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-1711-4/+34
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre...Neil Johnson2018-08-177-3/+29
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | remove errant yieldNeil Johnson2018-08-171-1/+1
| | * | | | | | | | | | | | For resource limit blocked users, prevent writing into roomsNeil Johnson2018-08-161-0/+1
| | * | | | | | | | | | | | call reap on start up and fix under reaping bugNeil Johnson2018-08-164-2/+19
| | * | | | | | | | | | | | block event creation and room creation on hitting resource limitsNeil Johnson2018-08-162-1/+9
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3712 from matrix-org/travis/register-admin-docsAmber Brown2018-08-172-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Create 3712.miscTravis Ralston2018-08-171-0/+1
| | * | | | | | | | | | | Update the admin register documentation to return a real user IDTravis Ralston2018-08-171-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_workerErik Johnston2018-08-162-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | NewsfileErik Johnston2018-08-161-0/+1
| | * | | | | | | | | | Fix inbound federation on reader workerErik Johnston2018-08-161-0/+2
| |/ / / / / / / / / /
| | | | | | | | | | * flake8Neil Johnson2018-08-161-3/+2
| | | | | | | | | | * refactor for readability, and reuse caching for setting tagsNeil Johnson2018-08-163-68/+115
| | | | | | | | | | * add room taggingNeil Johnson2018-08-161-9/+5
| | | | | | | | | | * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-166-3/+98
| | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Add GET media/v1/config (#3184)Will Hunt2018-08-163-1/+51
| * | | | | | | | | | lazyload aware /messages (#3589)Matthew Hodgson2018-08-163-2/+47
| | | | | | | | | | * check for room state before deciding on actionNeil Johnson2018-08-163-87/+58
| | | | | | | | | | * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-167-28/+169
| | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-166-18/+159
| * | | | | | | | | | Merge pull request #3686 from matrix-org/rav/changelog_links_to_prsRichard van der Hoff2018-08-151-10/+10
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Changelog should link to PRsRichard van der Hoff2018-08-131-10/+10
| | | | | | | | | | | * WIP impl commiting to get feedbackNeil Johnson2018-08-161-6/+74
| | | | | | | | | | | * fix case where empty string state check is evaulated as FalseNeil Johnson2018-08-161-1/+2
| | | | | | | | | | | * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-1510-23/+231
| | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-154-4/+59
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix mau blocking calulation bug on loginNeil Johnson2018-08-151-0/+1
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-1531-186/+615
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-145-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | fix off by 1 errorsNeil Johnson2018-08-142-3/+14
| | * | | | | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-142-5/+4
| | * | | | | | | | | | | | | fix off by 1s on mauNeil Johnson2018-08-143-7/+50
| | * | | | | | | | | | | | | 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-148-22/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...Neil Johnson2018-08-147-20/+111
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove incorrectly re-added changelog filesRichard van der Hoff2018-08-152-2/+0
| * | | | | | | | | | | | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-158-19/+174
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-15163-2853/+2949
| | | | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-1516-138/+512
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-15217-2760/+2605
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Use federation handler function rather than duplicateErik Johnston2018-08-152-48/+10
| | * | | | | | | | | | | | | | | Rename slave TransactionStore to SlaveTransactionStoreErik Johnston2018-08-156-11/+11
| | * | | | | | | | | | | | | | | Update docs/workers.rstErik Johnston2018-08-091-0/+13
| | * | | | | | | | | | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | * | | | | | | | | | | | | | | Move clean_room_for_join to masterErik Johnston2018-08-092-2/+49
| | * | | | | | | | | | | | | | | Fixup doc commentsErik Johnston2018-08-092-0/+28
| | * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-0967-408/+1156
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Pull in necessary stores in federation_readerErik Johnston2018-08-062-1/+2
| | * | | | | | | | | | | | | | | Move necessary storage functions to worker classesErik Johnston2018-08-063-98/+100
| | * | | | | | | | | | | | | | | Import all functions from TransactionStoreErik Johnston2018-08-061-11/+2
| | * | | | | | | | | | | | | | | Add EDU/query handling over replicationErik Johnston2018-08-064-13/+62
| | * | | | | | | | | | | | | | | Add replication APIs for persisting federation eventsErik Johnston2018-08-064-10/+290
| | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-159-30/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | remove changelog referencing another PRNeil Johnson2018-08-151-1/+0
| | * | | | | | | | | | | | | | clean up AuthErrorNeil Johnson2018-08-151-7/+3
| | * | | | | | | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap...Neil Johnson2018-08-154-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | update error codesNeil Johnson2018-08-151-2/+2
| | | * | | | | | | | | | | | | | update resource limit error codesNeil Johnson2018-08-151-0/+1
| | | * | | | | | | | | | | | | | update error codes for resource limitingNeil Johnson2018-08-152-4/+3
| | * | | | | | | | | | | | | | | update admin email to uriNeil Johnson2018-08-152-2/+2
| | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-155-11/+11
| | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-1418-76/+373
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | remove blank lineNeil Johnson2018-08-141-1/+0
| | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Update register.pyNeil Johnson2018-08-141-10/+0
| | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | set admin email via configNeil Johnson2018-08-131-0/+1
| | * | | | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-137-22/+45
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_nameNeil Johnson2018-08-152-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro...Neil Johnson2018-08-148-22/+115
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Rename MAU prometheus metricNeil Johnson2018-08-141-0/+1
| | * | | | | | | | | | | | pep8Neil Johnson2018-08-141-0/+1
| | * | | | | | | | | | | | combine mau metrics into one groupNeil Johnson2018-08-141-4/+3
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbindErik Johnston2018-08-156-20/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | 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-086-20/+77
| * | | | | | | | | | | | Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re...Neil Johnson2018-08-144-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fix setup_test_homeserver to be postgres compatibleNeil Johnson2018-08-141-1/+1
| | * | | | | | | | | | | | Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved...Neil Johnson2018-08-141-0/+1
| | * | | | | | | | | | | | adding missing yieldNeil Johnson2018-08-141-1/+1
| | * | | | | | | | | | | | in case max_mau is less than I thinkNeil Johnson2018-08-141-1/+1
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-147-20/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | make comments clearerNeil Johnson2018-08-141-1/+2
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Dockerised sytest (#3660)Amber Brown2018-08-144-0/+53
| * | | | | | | | | | | Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgresAmber Brown2018-08-142-16/+29
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po...Amber Brown2018-08-1456-292/+404
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Implement a new test baseclass to cut down on boilerplate (#3684)Amber Brown2018-08-143-37/+174
| * | | | | | | | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-baseJan Christian Grünhage2018-08-142-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | update docker base-image to alpine 3.8Jan Christian Grünhage2018-08-092-1/+2
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Name changelog after PR, not bugRichard van der Hoff2018-08-131-0/+0
| * | | | | | | | | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-133-196/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | * | | | | | | | | | Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-103-196/+2
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-137-45/+22
| * | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-137-22/+45
| * | | | | | | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-1349-59/+227
| | | | * | | | | | | Fixes test_reap_monthly_active_users so it passes under postgresNeil Johnson2018-08-111-0/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-26 10:21:50 +0000