summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Add groundwork for new versions of federation APIsErik Johnston2019-01-153-68/+73
| |/ / /
| * | | Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-122-4/+160
| * | | Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-113-41/+30
| |\ \ \
| | * | | versionAmber Brown2019-01-111-1/+1
| | * | | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-102-40/+29
| | |\ \ \
| | | * | | Revert "Fix macaroon_secret_key fallback logic"Richard van der Hoff2019-01-101-3/+3
| | | * | | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-102-43/+32
| | | |\ \ \
| | | | * | | Fix macaroon_secret_key fallback logicRichard van der Hoff2019-01-101-3/+3
| | | | * | | Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-101-38/+27
| | | | * | | Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
| * | | | | | Merge branch 'master' into developRichard van der Hoff2019-01-091-1/+1
| |\| | | | |
| | * | | | | 0.34.1 v0.34.1Richard van der Hoff2019-01-091-1/+1
| | * | | | | Merge branch 'develop' into release-v0.34.1Erik Johnston2019-01-092-6/+11
| | |\ \ \ \ \
| | * | | | | | 0.34.1rc1Richard van der Hoff2019-01-081-1/+1
| * | | | | | | Merge pull request #4368 from matrix-org/erikj/better_errorsErik Johnston2019-01-091-68/+73
| |\ \ \ \ \ \ \
| | * | | | | | | Fixup docstrings for matrixfederationclientErik Johnston2019-01-091-68/+73
| | | |/ / / / / | | |/| | | | |
| * / | | | | | Fix adding new rows instead of updating them if one of the key values is a NU...Amber Brown2019-01-091-1/+9
| |/ / / / / /
| * | | | | | Use RequestSendFailed when fail to parse content type headersErik Johnston2019-01-081-5/+5
| * | | | | | Don't log stack traces for HTTP error responsesErik Johnston2019-01-081-1/+6
| |/ / / / /
| * | | | | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-084-41/+108
| * | | | | Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-081-1/+1
| * | | | | Add GET account data routes (#4303)Travis Ralston2019-01-071-1/+33
| * | | | | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-073-28/+74
| * | | | | fix the check for whether `is_url` to match all the other ones in codebase (#...Michael Telatynski2019-01-061-3/+8
| * | | | | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-021-10/+11
| * | | | | Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-021-25/+25
| * | | | | Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-294-445/+0
| * | | | | Log roomid along with Unknown room (#4297)Will Hunt2018-12-241-1/+1
| * | | | | Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-242-1/+5
| |\ \ \ \ \
| | * | | | | Add v2 room versionErik Johnston2018-12-182-1/+5
| * | | | | | Return well_known in /login response (#4319)Richard van der Hoff2018-12-241-7/+11
| * | | | | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-229-46/+89
| * | | | | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-221-35/+35
| * | | | | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-223-171/+255
| * | | | | | Make the dependencies more like a standard Python project and hook up the opt...Amber Brown2018-12-223-147/+90
| * | | | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Prepare 0.34 releaseRichard van der Hoff2018-12-201-1/+1
| | * | | | | Debian packaging via dh_virtualenvRichard van der Hoff2018-12-201-1/+1
| | |\ \ \ \ \
| | | * | | | | Debian packaging via dh_virtualenv (#4285)Richard van der Hoff2018-12-202-2/+2
| | * | | | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-201-1/+2
| | * | | | | | Improved welcome page (#4294)Nad Chishtie2018-12-141-25/+62
| | * | | | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
| | |/ / / / /
| * | | | | | Fixed line lengthNathan Pennie2018-12-191-1/+5
| * | | | | | Fix the variable names used for account_dataNathan Pennie2018-12-191-3/+3
| * | | | | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305)Neil Johnson2018-12-181-1/+1
| * | | | | | create support user (#4141)Neil Johnson2018-12-1410-33/+159
| * | | | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
| * | | | | | Improved welcome page (#4294)Nad Chishtie2018-12-141-25/+62
| * | | | | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-115-51/+68
| |\| | | | |
| | * | | | | 0.34.0rc2 v0.34.0rc2Richard van der Hoff2018-12-111-1/+1
| | * | | | | Merge pull request #4290 from matrix-org/rav/remove_webclientRichard van der Hoff2018-12-113-50/+38
| | |\ \ \ \ \
| | | * | | | | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-113-50/+38
| | * | | | | | Merge pull request #4289 from matrix-org/rav/welcome_pageRichard van der Hoff2018-12-112-0/+29
| | |\ \ \ \ \ \
| | | * | | | | | Add a welcome page to the static resourcesRichard van der Hoff2018-12-112-0/+29
| | | |/ / / / /
| | * / / / / / Prepare 0.34.0rc1Richard van der Hoff2018-12-041-1/+1
| | |/ / / / /
| * | | | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-111-1/+2
| * | | | | | Move imports to one lineWill Hunt2018-12-101-4/+1
| * | | | | | Use `send_cors`Will Hunt2018-12-101-4/+1
| * | | | | | changelog & isortWill Hunt2018-12-091-1/+5
| * | | | | | Make /config more CORS-yWill Hunt2018-12-091-1/+3
| * | | | | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-074-14/+37
| * | | | | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-077-2/+256
| * | | | | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-073-31/+153
| * | | | | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-065-154/+3
| | |_|_|/ / | |/| | | |
| * | | | | drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-061-7/+6
| * | | | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-053-0/+81
| |/ / / /
| * | | | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-042-9/+25
| * | | | Fix non-ASCII pushrules (#4248)Amber Brown2018-12-041-12/+23
| * | | | Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-043-1/+20
| * | | | add more detail to logging regarding "More than one row matched" error (#4234)Ben Parsons2018-12-041-6/+6
| * | | | Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-042-8/+46
| * | | | Merge pull request #4244 from aaronraimist/drop-sent-txtRichard van der Hoff2018-12-046-74/+3
| |\ \ \ \
| | * | | | Drop sent_transactionsAaron Raimist2018-12-016-74/+3
| * | | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3Richard van der Hoff2018-12-041-1/+1
| |\ \ \ \ \
| | * | | | | fix type errorAmber Brown2018-12-031-1/+1
| * | | | | | Run the AS senders as background processes (#4189)Richard van der Hoff2018-12-041-12/+24
| |/ / / / /
| * / / / / Workaround for non-ascii event ids (#4241)Richard van der Hoff2018-12-031-1/+3
| |/ / / /
| * | | | Neilj/fix autojoin (#4223)Neil Johnson2018-11-283-2/+24
| * | | | Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-281-2/+3
| * | | | Support m.login.sso (#4220)Richard van der Hoff2018-11-274-52/+49
| * | | | 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
| |/ / /
| * | | 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
| * | | | 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
| * | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | 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
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Put function def back to the way it wasAndrew Morgan2019-02-261-3/+3
* | | | | | | | | | | | Prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-263-17/+54
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | 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
|/ / / / / / / / / /
* / / / / / / / / / Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-262-0/+215
|/ / / / / / / / /
* | | | | | | | | 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
| * | | | | | | | | | | | 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
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-28 14:14:16 +0000