summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* typo github/neilj/fix_4229 neilj/fix_4229Neil Johnson2018-11-281-1/+1
* Fix synapse_admin_mau:current metric is not updating when config.mau_stats_on...Neil Johnson2018-11-281-1/+1
* Merge branch 'develop' into neilj/create_support_userNeil Johnson2018-11-283-1/+24
|\
| * Neilj/fix autojoin (#4223)Neil Johnson2018-11-283-2/+24
* | fix reference to unused config.support_user_idNeil Johnson2018-11-281-3/+13
* | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_sup...Neil Johnson2018-11-281-2/+3
|\|
| * Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-281-2/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_sup...Neil Johnson2018-11-274-52/+49
|\|
| * Support m.login.sso (#4220)Richard van der Hoff2018-11-274-52/+49
* | Merge branch 'develop' into neilj/create_support_userNeil Johnson2018-11-2212-164/+206
|\|
| * Ignore __pycache__ directories in schema delta dirRichard van der Hoff2018-11-201-1/+1
| * Remove riot.im from the list of trusted Identity Servers in the default confi...Neil Johnson2018-11-201-1/+3
| * Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixesRichard van der Hoff2018-11-201-2/+3
| |\
| | * Fix logcontext leak in EmailPusherRichard van der Hoff2018-11-191-2/+3
| * | Merge remote-tracking branch 'origin/master' into developAmber Brown2018-11-191-1/+1
| |\ \
| | * | versionAmber Brown2018-11-191-1/+1
| | * | release 0.33.9rc1 v0.33.9rc1 github/release-v0.33.9 release-v0.33.9Neil Johnson2018-11-141-1/+1
| * | | Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-22/+16
| | |/ | |/|
| * | Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-152-3/+3
| * | Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-153-90/+110
| * | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-153-35/+47
| * | Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-151-9/+22
| |/
* | improve docstringNeil Johnson2018-11-142-1/+2
* | clean upNeil Johnson2018-11-142-9/+4
* | tests for support user behaviourNeil Johnson2018-11-141-18/+20
* | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_sup...Neil Johnson2018-11-1414-123/+234
|\|
| * Add a test for the public T&Cs formRichard van der Hoff2018-11-141-1/+1
| * Fix an internal server error when viewing the public privacy policyRichard van der Hoff2018-11-141-4/+7
| * Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbersDavid Baker2018-11-142-2/+70
| |\
| | * Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a...David Baker2018-11-0947-416/+763
| | |\
| | * | pep8David Baker2018-11-091-1/+2
| | * | add docsDavid Baker2018-11-091-1/+4
| | * | Remove unnecessary str()David Baker2018-11-091-1/+1
| | * | Cast to int here tooDavid Baker2018-10-301-0/+5
| | * | Cast bacjup version to int when queryingDavid Baker2018-10-301-1/+6
| | * | Convert version back to a stringDavid Baker2018-10-301-0/+1
| | * | Try & make it work on postgresDavid Baker2018-10-301-2/+2
| | * | Make e2e backup versions numeric in the DBDavid Baker2018-10-293-2/+55
| * | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_eventsErik Johnston2018-11-092-89/+74
| |\ \ \ | | |_|/ | |/| |
| | * | Remove hack to support rejoining roomsErik Johnston2018-11-091-74/+42
| | * | Simplify to always drop events if server isn't in the roomErik Johnston2018-11-091-14/+9
| | * | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| | * | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| | * | Drop PDUs of unknown roomsErik Johnston2018-11-081-1/+23
| * | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparisonErik Johnston2018-11-081-1/+4
| |\ \ \
| | * | | Lets convert bytes to unicode insteadErik Johnston2018-11-081-5/+3
| | * | | Fix noop checks when updating device keysErik Johnston2018-11-081-0/+5
| | |/ /
| * | | fix parse_string docstringRichard van der Hoff2018-11-081-5/+4
| * | | Fix encoding error for consent form on python3hera2018-11-081-1/+3
| |/ /
| * | Fix URL preview bugs (type error when loading cache from db, content-type inc...Amber Brown2018-11-082-10/+20
| * | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-064-3/+21
| * | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-052-10/+33
* | | tweak tests and tidyNeil Johnson2018-11-133-12/+2
* | | fix unit testsNeil Johnson2018-11-131-0/+1
* | | wip - move support user logic into handler from storageNeil Johnson2018-11-133-75/+54
* | | fix boolean typingNeil Johnson2018-11-131-1/+1
* | | remove errant printsNeil Johnson2018-11-131-3/+2
* | | implementation and tests for db backed support userNeil Johnson2018-11-136-50/+65
* | | add db support for support userNeil Johnson2018-11-131-0/+20
* | | move to db backed support userNeil Johnson2018-11-125-14/+45
* | | remove white spaceNeil Johnson2018-11-081-1/+1
* | | tiday up cruftNeil Johnson2018-11-083-4/+5
* | | fix case where auto creation of rooms should never auto create for support userNeil Johnson2018-11-071-3/+9
* | | replace filter with list comp to aid py2 py3 compat, make test more paranoidNeil Johnson2018-11-071-5/+7
* | | remove unused importNeil Johnson2018-11-061-1/+0
* | | remove unused dependencyNeil Johnson2018-11-061-1/+0
* | | replace is with ==Neil Johnson2018-11-061-3/+3
* | | fix misnamed varNeil Johnson2018-11-061-4/+3
* | | remove need to create support user in homeserverNeil Johnson2018-11-062-23/+2
* | | fix py2/3 incompatibilityNeil Johnson2018-11-051-2/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_sup...Neil Johnson2018-11-0510-45/+62
|\| |
| * | Tests for user consent resource (#4140)Amber Brown2018-11-061-1/+1
| * | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-068-44/+60
| * | Set the encoding to UTF8 in the default logconfig (#4138)Amber Brown2018-11-031-0/+1
* | | remove unused variable localpartNeil Johnson2018-11-051-1/+0
* | | ensure support user created if does not existNeil Johnson2018-11-023-15/+23
* | | test suppoer user filteringNeil Johnson2018-11-021-2/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_sup...Neil Johnson2018-11-0247-453/+1196
|\| |
| * | Merge pull request #4137 from matrix-org/erikj/clean_up_eventsErik Johnston2018-11-023-7/+4
| |\ \
| | * | Clean up event accesses and testsErik Johnston2018-11-023-7/+4
| * | | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-032-4/+24
| * | | Merge pull request #4132 from matrix-org/rav/fix_device_list_lockingRichard van der Hoff2018-11-023-11/+128
| |\ \ \
| | * | | Add unique indexes to a couple of tablesRichard van der Hoff2018-11-023-6/+88
| | * | | Remove redundant database locks for device list updatesRichard van der Hoff2018-11-021-5/+40
| * | | | Merge pull request #4133 from matrix-org/travis/fix-terms-authRichard van der Hoff2018-11-021-1/+1
| |\ \ \ \
| | * | | | Fix logic error that prevented guests from seeing the privacy policyTravis Ralston2018-11-011-1/+1
| | |/ / /
| * | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_noneErik Johnston2018-11-021-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix None exception in state res v2Erik Johnston2018-11-021-0/+4
| | |/ /
| * | | Merge pull request #4004 from matrix-org/travis/login-termsTravis Ralston2018-11-015-17/+135
| |\ \ \ | | |/ / | |/| |
| | * | Include a version query string arg for the consent routeTravis Ralston2018-10-312-3/+8
| | * | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-3145-879/+1761
| | |\ \
| | * \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-2446-503/+1136
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1821-106/+472
| | |\ \ \ \
| | * | | | | pep8Travis Ralston2018-10-153-14/+3
| | * | | | | Ensure the terms params are actually providedTravis Ralston2018-10-151-0/+1
| | * | | | | Python is hardTravis Ralston2018-10-151-5/+6
| | * | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1510-3/+1047
| | |\ \ \ \ \
| | * | | | | | Update login terms structure for the proposed language supportTravis Ralston2018-10-121-4/+7
| | * | | | | | Rely on the lack of ?u to represent public accessTravis Ralston2018-10-122-10/+6
| | * | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1218-125/+224
| | |\ \ \ \ \ \
| | * | | | | | | Use a flag rather than a new route for the public policyTravis Ralston2018-10-033-17/+25
| | * | | | | | | Auto-consent to the privacy policy if the user registered with termsTravis Ralston2018-10-031-0/+6
| | * | | | | | | Make the terms flow requriedTravis Ralston2018-10-031-4/+4
| | * | | | | | | Flesh out the fallback auth for termsTravis Ralston2018-10-031-7/+67
| | * | | | | | | Supply params for terms auth stageTravis Ralston2018-10-031-0/+9
| | * | | | | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-034-0/+40
| * | | | | | | | Merge pull request #4128 from matrix-org/erikj/state_res_v2_versionErik Johnston2018-11-012-2/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add STATE_V2_TEST room versionErik Johnston2018-11-012-2/+7
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into developAmber Brown2018-11-011-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | versionAmber Brown2018-11-011-1/+1
| | * | | | | | | version bumpAmber Brown2018-10-311-1/+1
| | * | | | | | | Fix search 500ing (#4122)Amber Brown2018-10-311-2/+6
| | * | | | | | | version bumpAmber Brown2018-10-291-1/+1
| * | | | | | | | Merge pull request #4101 from matrix-org/rav/aliases_for_upgradesRichard van der Hoff2018-10-312-14/+140
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Avoid else clause on exception for clarityRichard van der Hoff2018-10-311-2/+1
| | * | | | | | | | Attempt to move room aliases on room upgradesRichard van der Hoff2018-10-312-14/+141
| * | | | | | | | | Log some bits about event creation (#4121)Richard van der Hoff2018-10-312-0/+7
| * | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120)Amber Brown2018-10-312-106/+12
| * | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119)Amber Brown2018-10-314-113/+1
| * | | | | | | | | Fix search 500ing (#4122)Amber Brown2018-10-311-2/+6
| * | | | | | | | | Remove the unused /pull federation API (#4118)Amber Brown2018-10-312-14/+0
| * | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groupsErik Johnston2018-10-304-48/+137
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Move _find_unreferenced_groupsErik Johnston2018-10-292-81/+83
| | * | | | | | | | | Fix set operations thinkoErik Johnston2018-10-291-3/+4
| | * | | | | | | | | Don't make temporary listErik Johnston2018-10-291-3/+2
| | * | | | | | | | | Make SQL a bit cleanerErik Johnston2018-10-291-3/+2
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-2659-948/+2189
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | pep8Erik Johnston2018-10-191-1/+1
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-1949-250/+1763
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Batch process handling state groupsErik Johnston2018-10-192-101/+92
| | * | | | | | | | | | Fix up commentsErik Johnston2018-10-121-3/+3
| | * | | | | | | | | | Add state_group index to event_to_state_groupsErik Johnston2018-10-043-1/+27
| | * | | | | | | | | | Delete unreferened state groups during purgeErik Johnston2018-10-042-6/+77
| * | | | | | | | | | | Write some tests for the email pusher (#4095)Amber Brown2018-10-303-6/+14
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Deduplicate device updates sent over replicationErik Johnston2018-10-291-1/+5
| * | | | | | | | | | Don't truncate command name in metricsErik Johnston2018-10-291-2/+2
| * | | | | | | | | | Delete the disused & unspecced identicon functionality (#4106)Amber Brown2018-10-294-74/+0
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatarRichard van der Hoff2018-10-291-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remember to copy the avatar on room upgradesRichard van der Hoff2018-10-261-1/+2
| * | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_plsRichard van der Hoff2018-10-291-44/+81
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Better handling of odd PLs during room upgradesRichard van der Hoff2018-10-271-44/+81
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgradesRichard van der Hoff2018-10-297-38/+323
| |\| | | | | | | | |
| | * | | | | | | | | optimise state copyingRichard van der Hoff2018-10-261-7/+5
| | * | | | | | | | | Address review commentsRichard van der Hoff2018-10-262-12/+25
| | * | | | | | | | | restrict PLs in old roomRichard van der Hoff2018-10-251-1/+43
| | * | | | | | | | | copy stateRichard van der Hoff2018-10-251-11/+26
| | * | | | | | | | | preserve PLsRichard van der Hoff2018-10-251-1/+7
| | * | | | | | | | | preserve room visibilityRichard van der Hoff2018-10-252-4/+6
| | * | | | | | | | | Basic initial support for room upgradesRichard van der Hoff2018-10-255-0/+208
| | * | | | | | | | | Allow power_level_content_override=None for _send_events_for_new_roomRichard van der Hoff2018-10-251-5/+6
| | * | | | | | | | | Make room_member_handler a member of RoomCreationHandlerRichard van der Hoff2018-10-252-8/+7
| | * | | | | | | | | Factor _generate_room_id out of create_roomRichard van der Hoff2018-10-251-22/+23
| * | | | | | | | | | Make the replication logger quieter (#4108)Amber Brown2018-10-291-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-262-0/+215
| |/ / / / / / / /
* | | | | | | | | wip tests to filter out support userNeil Johnson2018-10-291-4/+2
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_sup...Neil Johnson2018-10-2540-769/+1787
|\| | | | | | | |
| * | | | | | | | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-259-420/+603
| * | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_listErik Johnston2018-10-255-15/+140
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-2546-443/+1124
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Use allow/denyErik Johnston2018-10-251-6/+6
| | * | | | | | | | | Use match rather than searchErik Johnston2018-10-241-2/+3
| | * | | | | | | | | Anchor returned regex to start and end of stringErik Johnston2018-10-191-2/+6
| | * | | | | | | | | Add config option to control alias creationErik Johnston2018-10-195-15/+135
| * | | | | | | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-254-31/+84
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | add new lineNeil Johnson2018-10-251-0/+1
| | * | | | | | | | | improve commentsNeil Johnson2018-10-251-6/+6
| | * | | | | | | | | fix style inconsistenciesNeil Johnson2018-10-242-15/+47
| | * | | | | | | | | commit transaction before closingNeil Johnson2018-10-241-0/+1
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-2431-368/+994
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | remove white spaceNeil Johnson2018-10-231-2/+1
| | * | | | | | | | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-233-25/+45
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-2583-676/+2779
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid...Richard van der Hoff2018-10-2412-67/+665
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-246-6/+6
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix a number of flake8 errorsRichard van der Hoff2018-10-246-6/+6
| | | * | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-246-61/+659
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | CommentErik Johnston2018-10-241-2/+5
| | | | * | | | | | | | | Rename resolve_events_with_factoryErik Johnston2018-10-244-11/+11
| | | | * | | | | | | | | Update event_auth table for rejected eventsErik Johnston2018-10-161-15/+21
| | | | * | | | | | | | | Fix up use of resolve_events_with_factoryErik Johnston2018-10-161-13/+10
| | | | * | | | | | | | | User event.sender rather than alias event.user_idErik Johnston2018-10-161-1/+1
| | | | * | | | | | | | | Add v2 state res algorithm.Erik Johnston2018-10-163-24/+616
| | * | | | | | | | | | | Allow backslashes in event field filtersRichard van der Hoff2018-10-241-1/+4
| | |/ / / / / / / / / /
| | * | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-247-141/+141
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix start_pushers vs _start_pushers confusionRichard van der Hoff2018-10-241-3/+3
| | | * | | | | | | | | | sanity-check the is_processing flagRichard van der Hoff2018-10-242-8/+14
| | | * | | | | | | | | | Run PusherPool.start as a background processRichard van der Hoff2018-10-221-5/+7
| | | * | | | | | | | | | Make on_started synchronous tooRichard van der Hoff2018-10-223-11/+21
| | | * | | | | | | | | | Remove redundant run_as_background_process() from pusherpoolRichard van der Hoff2018-10-227-50/+14
| | | * | | | | | | | | | Give pushers their own background logcontextRichard van der Hoff2018-10-222-58/+54
| | | * | | | | | | | | | move get_all_pushers call downRichard van der Hoff2018-10-221-3/+9
| | | * | | | | | | | | | Factor PusherPool._start_pusher out of _start_pushersRichard van der Hoff2018-10-221-18/+33
| | | * | | | | | | | | | Rename _refresh_pusherRichard van der Hoff2018-10-222-3/+4
| | * | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creationErik Johnston2018-10-243-64/+55
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Clean up room alias creationErik Johnston2018-10-193-64/+55
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-232-8/+22
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Comments helpTravis Ralston2018-10-231-0/+5
| | | * | | | | | | | | | isortTravis Ralston2018-10-121-1/+1
| | | * | | | | | | | | | More sane handling of group errors and pep8Travis Ralston2018-10-121-4/+5
| | | * | | | | | | | | | Merge branch 'develop' into travis/fix-federated-group-requestsTravis Ralston2018-10-1249-314/+590
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Remove debugging statementTravis Ralston2018-09-261-1/+0
| | | * | | | | | | | | | Handle HttpResponseException more safely for federated groupsTravis Ralston2018-09-261-2/+11
| | | * | | | | | | | | | Fix exception documentation in matrixfederationclient.pyTravis Ralston2018-09-261-6/+6
| * | | | | | | | | | | | isortNeil Johnson2018-10-241-2/+1
| * | | | | | | | | | | | remove trailing whiter spaceNeil Johnson2018-10-241-1/+1
| * | | | | | | | | | | | fix tupleRichard van der Hoff2018-10-241-1/+2
| * | | | | | | | | | | | remove errant exception and styleNeil Johnson2018-10-232-6/+6
| * | | | | | | | | | | | clean up config error logic and importsNeil Johnson2018-10-172-19/+20
| * | | | | | | | | | | | no need to join room if creatorNeil Johnson2018-10-131-1/+2
| * | | | | | | | | | | | improve auto room join logic, comments and testsNeil Johnson2018-10-122-4/+18
| * | | | | | | | | | | | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-0417-130/+240
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-041-27/+18
| * | | | | | | | | | | | | emit room aliases eventMatthew Hodgson2018-09-291-3/+8
| * | | | | | | | | | | | | fix thinkosMatthew Hodgson2018-09-292-7/+7
| * | | | | | | | | | | | | fix UTsMatthew Hodgson2018-09-282-5/+10
| * | | | | | | | | | | | | untested stab at autocreating autojoin roomsMatthew Hodgson2018-09-282-0/+22
* | | | | | | | | | | | | | move to using config.support_user_idNeil Johnson2018-10-233-7/+10
* | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_sup...Neil Johnson2018-10-2350-305/+1742
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Give some more things logcontexts (#4077)Richard van der Hoff2018-10-232-7/+11
| * | | | | | | | | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-235-80/+96
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontextsRichard van der Hoff2018-10-221-8/+22
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Run MAU queries as background processesRichard van der Hoff2018-10-201-8/+22
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutilRichard van der Hoff2018-10-222-10/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Make psutil an explicit dependencyRichard van der Hoff2018-10-192-10/+5
| | |/ / / / / / / / / / /
| * / / / / / / / / / / / Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-209-71/+70
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065Richard van der Hoff2018-10-192-28/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Calculate absolute path for email templatesRichard van der Hoff2018-10-192-28/+20
| * | | | | | | | | | | Fix manhole on py3 (pt 2) (#4067)Amber Brown2018-10-191-0/+2
| * | | | | | | | | | | Make the metrics less racy (#4061)Amber Brown2018-10-192-16/+21
| * | | | | | | | | | | make a bytestringAmber Brown2018-10-191-2/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-10-1811-5/+369
| |\| | | | | | | | |
| | * | | | | | | | | 0.33.7 v0.33.7Richard van der Hoff2018-10-181-1/+1
| | * | | | | | | | | v0.33.7rc2Richard van der Hoff2018-10-171-1/+1
| | * | | | | | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-174-35/+25
| | * | | | | | | | | Put the warning blob at the top of the fileRichard van der Hoff2018-10-171-6/+9
| | * | | | | | | | | Ship the email templates as package_dataRichard van der Hoff2018-10-1710-4/+365
| | * | | | | | | | | version bumpAmber Brown2018-10-151-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Fix bug where we raised StopIteration in a generatorErik Johnston2018-10-171-2/+5
| * | | | | | | | | Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-172-3/+10
| * | | | | | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-164-35/+25
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Various cleanups in the federation client code (#4031)Richard van der Hoff2018-10-163-61/+63
| |/ / / / / / /
| * | | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-158-0/+1044
| |\ \ \ \ \ \ \
| | * | | | | | | missed oneDavid Baker2018-10-121-0/+1
| | * | | | | | | Linting soothes the savage PEP8 monsterDavid Baker2018-10-121-4/+9
| | * | | | | | | Misc PR feedback bitsDavid Baker2018-10-121-2/+2
| | * | | | | | | Don't mangle exceptionsDavid Baker2018-10-121-4/+2
| | * | | | | | | Split /room_keys/version into 2 servletsDavid Baker2018-10-121-9/+21
| | * | | | | | | PR feedback pt. 1David Baker2018-10-123-29/+22
| | * | | | | | | Fix mergefailDavid Baker2018-10-091-1/+1
| | * | | | | | | isortDavid Baker2018-10-091-1/+1
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-14 23:03:28 +0000