summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-156-90/+271
|
* Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-157-35/+92
|
* Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-153-9/+100
|
* Add a coveragerc (#4180)Amber Brown2018-11-154-2/+27
|
* Merge pull request #4188 from matrix-org/rav/readme-update-1Neil Johnson2018-11-152-3/+5
|\ | | | | Update README for #1491 fix
| * Update README for #1491 fixRichard van der Hoff2018-11-152-3/+5
|/
* Merge pull request #4184 from matrix-org/rav/fix_public_consentRichard van der Hoff2018-11-143-5/+16
|\ | | | | Fix an internal server error when viewing the public privacy policy
| * changelogRichard van der Hoff2018-11-141-0/+1
| |
| * Add a test for the public T&Cs formRichard van der Hoff2018-11-142-1/+8
| |
| * 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-143-2/+71
|\ | | | | Make e2e backup versions numeric in the DB
| * Merge remote-tracking branch 'origin/develop' into ↵David Baker2018-11-09140-758/+2475
| |\ | | | | | | | | | dbkr/e2e_backup_versions_are_numbers
| * | 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
| | |
| * | news fragmentDavid 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
| | | | | | | | | | | | | | | We were doing max(version) which does not do what we wanted on a column of type TEXT.
* | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_eventsErik Johnston2018-11-093-89/+75
|\ \ \ | |_|/ |/| | Drop incoming events from federation for unknown rooms
| * | 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
| | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| * | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| * | NewsfileErik Johnston2018-11-081-0/+1
| | |
| * | Drop PDUs of unknown roomsErik Johnston2018-11-081-1/+23
| | | | | | | | | | | | | | | | | | When we receive events over federation we will need to know the room version to be able to correctly handle them, e.g. once we start changing event formats. Currently, we attempt to handle events in unknown rooms.
* | | Merge pull request #4168 from ↵Brendan Abolivier2018-11-091-2/+7
|\ \ \ | | | | | | | | | | | | | | | | matrix-org/babolivier/federation-client-content-type Add a Content-Type header on POST requests to the federation client script
| * | | Add a Content-Type header on POST requests to the federation clientBrendan Abolivier2018-11-091-2/+7
| | | |
* | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparisonErik Johnston2018-11-083-1/+20
|\ \ \ \ | | | | | | | | | | Fix noop checks when updating device keys
| * | | | Add test to assert set_e2e_device_keys correctly returns False on no-opErik Johnston2018-11-081-0/+15
| | | | |
| * | | | Lets convert bytes to unicode insteadErik Johnston2018-11-081-5/+3
| | | | |
| * | | | NewsfileErik Johnston2018-11-081-0/+1
| | | | |
| * | | | Fix noop checks when updating device keysErik Johnston2018-11-081-0/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients often reupload their device keys (for some reason) so its important for the server to check for no-ops before sending out device list update notifications. The check is broken in python 3 due to the fact comparing bytes and unicode always fails, and that we write bytes to the DB but get unicode when we read.
* | | | Merge pull request #4163 from matrix-org/rav/fix_consent_on_py3Richard van der Hoff2018-11-083-6/+8
|\ \ \ \ | |/ / / |/| | | Fix encoding error for consent form on python3
| * | | fix parse_string docstringRichard van der Hoff2018-11-081-5/+4
| | | |
| * | | changelogRichard van der Hoff2018-11-081-0/+1
| | | |
| * | | Fix encoding error for consent form on python3hera2018-11-081-1/+3
|/ / / | | | | | | | | | | | | | | | The form was rendering this as "b'01234....'". -- richvdh
* | | Port hash_password to Python 3 (#4161)Amber Brown2018-11-083-8/+36
| | | | | | | | | | | | | | | | | | * port hash_password * changelog
* | | Fix URL preview bugs (type error when loading cache from db, content-type ↵Amber Brown2018-11-085-10/+187
| | | | | | | | | | | | including quotes) (#4157)
* | | Merge pull request #4155 from rubo77/purge-apiRichard van der Hoff2018-11-074-0/+212
|\ \ \ | | | | | | | | add purge_history.sh and purge_remote_media.sh scripts
| * | | add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/rubo772018-11-074-0/+212
| | | | | | | | | | | | | | | | Signed-off-by: Ruben Barkow <github@r.z11.de>
* | | | Remove some boilerplate in tests (#4156)Amber Brown2018-11-0711-216/+162
|/ / /
* | | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-0610-11/+65
| | | | | | | | | | | | So people can still collect consent the old way if they want to.
* | | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-054-52/+71
| | | | | | | | | fixes #4056
* | | Tests for user consent resource (#4140)Amber Brown2018-11-065-6/+140
| | |
* | | Add some tests for the HTTP pusher (#4149)Amber Brown2018-11-062-0/+160
| | |
* | | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-0610-45/+62
| | | | | | | | | | | | | | | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions.
* | | Set the encoding to UTF8 in the default logconfig (#4138)Amber Brown2018-11-032-0/+2
| | |
* | | Merge pull request #4137 from matrix-org/erikj/clean_up_eventsErik Johnston2018-11-026-10/+8
|\ \ \ | | | | | | | | Clean up event accesses and tests
| * | | NewsfileErik Johnston2018-11-021-0/+1
| | | |
| * | | Clean up event accesses and testsErik Johnston2018-11-025-10/+7
| | | | | | | | | | | | | | | | | | | | This is in preparation to refactor FrozenEvent to support different event formats for different room versions
* | | | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-035-5/+155
| | | |
* | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_lockingRichard van der Hoff2018-11-024-11/+129
|\ \ \ \ | | | | | | | | | | Fix locked upsert on device_lists_remote_cache
| * | | | changelogRichard van der Hoff2018-11-021-0/+1
| | | | |
| * | | | Add unique indexes to a couple of tablesRichard van der Hoff2018-11-023-6/+88
| | | | | | | | | | | | | | | | | | | | | | | | | The indexes on device_lists_remote_extremeties can be unique, and they therefore should, to ensure that the db remains consistent.
| * | | | Remove redundant database locks for device list updatesRichard van der Hoff2018-11-021-5/+40
| | | | | | | | | | | | | | | | | | | | We can rely on the application-level per-user linearizer.
* | | | | Merge pull request #4133 from matrix-org/travis/fix-terms-authRichard van der Hoff2018-11-022-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix logic error that prevented guests from seeing the privacy policy
| * | | | | ChangelogTravis Ralston2018-11-011-0/+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-023-2/+103
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix None exception in state res v2
| * | | | | NewsfileErik Johnston2018-11-021-0/+1
| | | | | |
| * | | | | Fix None exception in state res v2Erik Johnston2018-11-022-2/+102
| | |/ / / | |/| | |
* | | | | Merge pull request #3778 from z3ntu/patch-1Richard van der Hoff2018-11-012-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Fix build of Docker image with docker-compose
| * | | | changelog.d entry somehow got lostLuca Weiss2018-09-111-0/+1
| | | | |
| * | | | Fix build of Docker image with docker-composeLuca Weiss2018-09-111-2/+4
| | | | | | | | | | | | | | | | | | | | ... and fix a typo
* | | | | Merge pull request #4004 from matrix-org/travis/login-termsTravis Ralston2018-11-019-27/+277
|\ \ \ \ \ | |_|/ / / |/| | | | Add m.login.terms to the registration flow
| * | | | The tests also need a version parameter Travis Ralston2018-10-311-1/+1
| | | | |
| * | | | Include a version query string arg for the consent routeTravis Ralston2018-10-312-3/+8
| | | | |
| * | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-3191-1262/+2561
| |\ \ \ \
| * | | | | pep8Travis Ralston2018-10-242-6/+3
| | | | | |
| * | | | | It helps to import thingsTravis Ralston2018-10-241-0/+16
| | | | | |
| * | | | | Move test to where the other integration tests areTravis Ralston2018-10-242-97/+109
| | | | | |
| * | | | | Fix testTravis Ralston2018-10-241-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debug tests Try printing the channel fix Import and use six Remove debugging Disable captcha Add some mocks Define the URL Fix the clock? Less rendering? use the other render Complete the dummy auth stage Fix last stage of the test Remove mocks we don't need
| * | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-2490-971/+2312
| |\ \ \ \ \
| * | | | | | Fix terms UI auth testTravis Ralston2018-10-181-2/+5
| | | | | | |
| * | | | | | Test for terms UI authTravis Ralston2018-10-181-0/+70
| | | | | | |
| * | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1843-163/+308
| |\ \ \ \ \ \
| * | | | | | | 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-1513-3/+1447
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | also general cleanup
| * | | | | | | | Update documentation and templates for new consentTravis Ralston2018-10-122-10/+18
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1285-190/+313
| |\ \ \ \ \ \ \ \
| * | | | | | | | | ChangelogTravis Ralston2018-10-031-0/+1
| | | | | | | | | |
| * | | | | | | | | Use a flag rather than a new route for the public policyTravis Ralston2018-10-033-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also means that the template now has optional parameters, which will need to be documented somehow.
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/1692
| * | | | | | | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-034-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117
* | | | | | | | | | Merge pull request #4128 from matrix-org/erikj/state_res_v2_versionErik Johnston2018-11-013-2/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add STATE_V2_TEST room version
| * | | | | | | | | | NewsfileErik Johnston2018-11-011-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Add STATE_V2_TEST room versionErik Johnston2018-11-012-2/+7
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' into developAmber Brown2018-11-0131-31/+64
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-v0.33.8'Amber Brown2018-11-01108-1814/+4145
| |\ \ \ \ \ \ \ \
| | * | | | | | | | changelog v0.33.8 github/release-v0.33.8 release-v0.33.8Amber Brown2018-11-011-0/+6
| | | | | | | | | |
| | * | | | | | | | versionAmber Brown2018-11-011-1/+1
| | | | | | | | | |
| | * | | | | | | | changelog v0.33.8rc2Amber Brown2018-10-312-1/+10
| | | | | | | | | |
| | * | | | | | | | version bumpAmber Brown2018-10-311-1/+1
| | | | | | | | | |
| | * | | | | | | | Fix search 500ing (#4122)Amber Brown2018-10-313-3/+112
| | | | | | | | | |
| | * | | | | | | | changelog v0.33.8rc1Amber Brown2018-10-2930-30/+47
| | | | | | | | | |
| | * | | | | | | | version bumpAmber Brown2018-10-291-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4101 from matrix-org/rav/aliases_for_upgradesRichard van der Hoff2018-10-313-14/+141
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Attempt to move room aliases on room upgrades
| * | | | | | | | | | 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-313-14/+142
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4125 from MazeChaZer/fix-typo-in-docker-composeRichard van der Hoff2018-10-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in docker-compose.yml
| * | | | | | | | | | | Fix typo in docker-compose.ymlJonas Schürmann2018-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
* | | | | | | | | | | | Log some bits about event creation (#4121)Richard van der Hoff2018-10-313-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found these helpful in debugging my room upgrade tests.
* | | | | | | | | | | | Merge pull request #4124 from matrix-org/rav/fix_toxRichard van der Hoff2018-10-313-19/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Attempt to fix tox installs
| * | | | | | | | | | | changelogRichard van der Hoff2018-10-301-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Attempt to fix tox installsRichard van der Hoff2018-10-302-19/+14
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that, at some point, the ability to run tox on old servers (with old setuptools) got broken - and it was only working on our Jenkins instance by dint of reusing the tox environments. Let's try to get tox to do the right thing, and remove the guff from jenkins/prepare_synapse.sh. (There is a separate question about whether the jenkins builds should be using tox to prepare the virtualenv at all here, but that is somewhat orthogonal).
* | | | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120)Amber Brown2018-10-313-106/+13
| | | | | | | | | | |
* | | | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119)Amber Brown2018-10-315-113/+2
| | | | | | | | | | |
* | | | | | | | | | | Fix search 500ing (#4122)Amber Brown2018-10-313-3/+112
| | | | | | | | | | |
* | | | | | | | | | | Remove the unused /pull federation API (#4118)Amber Brown2018-10-313-14/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groupsErik Johnston2018-10-305-48/+138
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Delete unreferenced state groups during purge
| * | | | | | | | | | | 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 ↵Erik Johnston2018-10-26115-1683/+3799
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | erikj/purge_state_groups
| * | | | | | | | | | | pep8Erik Johnston2018-10-191-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-10-1970-301/+2020
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/purge_state_groups
| * | | | | | | | | | | | Batch process handling state groupsErik Johnston2018-10-192-101/+92
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix up commentsErik Johnston2018-10-121-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | NewsfileErik Johnston2018-10-041-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add state_group index to event_to_state_groupsErik Johnston2018-10-043-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to efficiently check for unreferenced state groups during purge.
| * | | | | | | | | | | | Delete unreferened state groups during purgeErik Johnston2018-10-042-6/+77
| | | | | | | | | | | | |
* | | | | | | | | | | | | Write some tests for the email pusher (#4095)Amber Brown2018-10-3010-13/+182
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4109 from matrix-org/erikj/repl_devicesErik Johnston2018-10-292-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of replication fixes for device lists
| * | | | | | | | | | | | NewsfileErik Johnston2018-10-291-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Deduplicate device updates sent over replicationErik Johnston2018-10-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently send several kHz of device list updates over replication occisonally, which often causes the replications streams to lag and then get dropped. A lot of those updates will actually be duplicates, since we don't send e.g. device_ids across replication, so let's deduplicate it when we pull them out of the database.
* | | | | | | | | | | | | Merge pull request #4111 from matrix-org/erikj/repl_namesErik Johnston2018-10-292-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erikj/repl names
| * | | | | | | | | | | | | NewsfileErik Johnston2018-10-291-0/+1
| |/ / / / / / / / / / / /
| * / / / / / / / / / / / Don't truncate command name in metricsErik Johnston2018-10-291-2/+2
|/ / / / / / / / / / / /
* | | | / / / / / / / / Delete the disused & unspecced identicon functionality (#4106)Amber Brown2018-10-296-113/+1
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatarRichard van der Hoff2018-10-292-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remember to copy the avatar on room upgrades
| * | | | | | | | | | | Remember to copy the avatar on room upgradesRichard van der Hoff2018-10-262-1/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_plsRichard van der Hoff2018-10-292-44/+82
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Better handling of odd PLs during room upgrades
| * | | | | | | | | | | | Better handling of odd PLs during room upgradesRichard van der Hoff2018-10-272-44/+82
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes handling of rooms where we have permission to send the tombstone, but not other state. We need to (a) fail more gracefully when we can't send the PLs in the old room, and (b) not set the PLs in the new room until we are done with the other stuff.
* | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgradesRichard van der Hoff2018-10-299-47/+325
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Room version upgrade support
| * | | | | | | | | | | optimise state copyingRichard van der Hoff2018-10-261-7/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Address review commentsRichard van der Hoff2018-10-262-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve comments, get old room state from the context we already have
| * | | | | | | | | | | fix broken testRichard van der Hoff2018-10-251-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test stubbed out some stuff in a very weird way. I have no idea why. It broke.
| * | | | | | | | | | | changelogRichard van der Hoff2018-10-251-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently just creates a new, empty, room, and sends a tombstone in the old room.
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save passing it into `_send_events_for_new_room`
| * | | | | | | | | | | Factor _generate_room_id out of create_roomRichard van der Hoff2018-10-251-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we're going to need this for room upgrades.
* | | | | | | | | | | | Make the replication logger quieter (#4108)Amber Brown2018-10-292-1/+2
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-266-202/+378
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4089 from dekonnection/masterRichard van der Hoff2018-10-252-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Make Docker image listen on ipv6 as well as ipv4
| * | | | | | | | | | Make Docker image listening on ipv6 as well as ipv4Cédric Laudrel2018-10-252-2/+3
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Cédric Laudrel <dek@iono.me>
* | | | | | | | | | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-2511-485/+714
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit.
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-10-252-2/+12
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #4072 from steamp0rt/patch-1Richard van der Hoff2018-10-232-2/+12
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add Caddy example to README
| | * | | | | | | | | README.rst: fix minor grammarRichard van der Hoff2018-10-221-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Whoops!steamport2018-10-191-1/+1
| | | | | | | | | | |
| | * | | | | | | | | I HATE RSTsteamport2018-10-191-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Fixsteamport2018-10-191-3/+4
| | | | | | | | | | |
| | * | | | | | | | | Fix formatting.steamport2018-10-191-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Add CLsteamport2018-10-191-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Add Caddy example to READMEsteamport2018-10-191-0/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_listErik Johnston2018-10-258-15/+256
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add config option to control alias creation
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-10-2591-948/+2364
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/alias_disallow_list
| * | | | | | | | | | | Use allow/denyErik Johnston2018-10-253-11/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Use match rather than searchErik Johnston2018-10-241-2/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Add tests for alias creation rulesErik Johnston2018-10-191-0/+48
| | | | | | | | | | | |
| * | | | | | | | | | | Add tests for config generationErik Johnston2018-10-191-0/+67
| | | | | | | | | | | |
| * | | | | | | | | | | Anchor returned regex to start and end of stringErik Johnston2018-10-191-2/+6
| | | | | | | | | | | |
| * | | | | | | | | | | NewsfileErik Johnston2018-10-191-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | 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-256-33/+94
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | fix race condiftion in calling initialise_reserved_users
| * | | | | | | | | | | add new lineNeil Johnson2018-10-251-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | improve commentsNeil Johnson2018-10-251-6/+6
| | | | | | | | | | | |
| * | | | | | | | | | | fix style inconsistenciesNeil Johnson2018-10-244-18/+51
| | | | | | | | | | | |
| * | | | | | | | | | | 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-2450-383/+1704
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | remove white spaceNeil Johnson2018-10-232-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-235-27/+55
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoinNeil Johnson2018-10-256-23/+101
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Autocreate autojoin rooms
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-10-25142-1205/+4207
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | matthew/autocreate_autojoin
* | | | | | | | | | | | | oops, run the check_isort buildRichard van der Hoff2018-10-251-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Only cache the wheelsRichard van der Hoff2018-10-251-2/+10
| | | | | | | | | | | | |
* | | | | | | | | | | | | Combine the pep8 and check_isort builds into oneRichard van der Hoff2018-10-251-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there's really no point spinning up two separate jobs for these.
* | | | | | | | | | | | | disable coverage checkingRichard van der Hoff2018-10-251-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think we ever use this, and it slows things down. If we want to use it, we should just do so on a couple of builds rather than all of them.
* | | | | | | | | | | | | only fetch develop for check-newsfragmentsRichard van der Hoff2018-10-241-4/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Disable newsfragment checks on branch buildsRichard van der Hoff2018-10-241-1/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | reduce git clone depthRichard van der Hoff2018-10-241-0/+4
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | fix branch regexpRichard van der Hoff2018-10-241-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | also build on release branchesRichard van der Hoff2018-10-241-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Disable travis-ci branch builds for most branchesRichard van der Hoff2018-10-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (We really don't need to kick off 10 builds for the branch as well as 10 for the PR)
* | | | | | | | | | | | Merge pull request #4083 from matrix-org/rav/fix_event_filter_validationRichard van der Hoff2018-10-243-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Allow backslashes in event field filters
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into ↵Richard van der Hoff2018-10-2421-81/+1344
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | rav/fix_event_filter_validation
* | | | | | | | | | | | | Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-2412-20/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a number of flake8 errors
| * | | | | | | | | | | | | Fix a number of flake8 errorsRichard van der Hoff2018-10-2412-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broadly three things here: * disable W504 which seems a bit whacko * remove a bunch of `as e` expressions from exception handlers that don't use them * use `r""` for strings which include backslashes Also, we don't use pep8 any more, so we can get rid of the duplicate config there.
* | | | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-249-61/+1323
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Add v2 state resolution algorithm
| * | | | | | | | | | | | | isortErik Johnston2018-10-241-4/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | CommentErik Johnston2018-10-241-2/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rename resolve_events_with_factoryErik Johnston2018-10-245-13/+13
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | NewsfileErik Johnston2018-10-161-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add some state res v2 testsErik Johnston2018-10-162-0/+666
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hook this up to the vdh test room version.
| | * | | | | | | | | | | | Allow backslashes in event field filtersRichard van der Hoff2018-10-243-2/+16
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which meant that single backslashes were not allowed in event field filters. The intention here is to allow single-backslashes, but disallow double-backslashes.
* | | | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-248-141/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the way logcontexts and threads work in the pushers
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and rename it, for even more sanity
| * | | | | | | | | | | | | ChangelogRichard van der Hoff2018-10-221-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Run PusherPool.start as a background processRichard van der Hoff2018-10-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't do anything with the result, so this is needed to give this code a logcontext.
| * | | | | | | | | | | | | Make on_started synchronous tooRichard van der Hoff2018-10-223-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings it into line with on_new_notifications and on_new_receipts. It requires a little bit of hoop-jumping in EmailPusher to load the throttle params before the first loop.
| * | | | | | | | | | | | | Remove redundant run_as_background_process() from pusherpoolRichard van der Hoff2018-10-227-50/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough.
| * | | | | | | | | | | | | Give pushers their own background logcontextRichard van der Hoff2018-10-222-58/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each pusher has its own loop which runs for as long as it has work to do. This should run in its own background thread with its own logcontext, as other similar loops elsewhere in the system do - which means that CPU usage is consistently attributed to that loop, rather than to whatever request happened to start the loop.
| * | | | | | | | | | | | | move get_all_pushers call downRichard van der Hoff2018-10-221-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplifies the interface to _start_pushers
| * | | | | | | | | | | | | Factor PusherPool._start_pusher out of _start_pushersRichard van der Hoff2018-10-221-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and use it from start_pusher_by_id. This mostly simplifies start_pusher_by_id.
| * | | | | | | | | | | | | Rename _refresh_pusherRichard van der Hoff2018-10-222-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is public (or at least, called from outside the class), so ought to have a better name.
* | | | | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creationErik Johnston2018-10-244-64/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | Clean up room alias creation
| * | | | | | | | | | | | | NewsfileErik Johnston2018-10-191-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Clean up room alias creationErik Johnston2018-10-193-64/+55
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-233-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle HttpResponseException more safely for federated groups
| * | | | | | | | | | | | | | 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-12120-924/+1167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove debugging statementTravis Ralston2018-09-261-1/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | ChangelogTravis Ralston2018-09-261-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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-233-7/+12
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-236-80/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap calls to deferToThread() in a thing which uses a child logcontext to attribute CPU usage to the right request. While we're in the area, remove the logcontext_tracer stuff, which is never used, and afaik doesn't work. Fixes #4064
* | | | | | | | | | | | | | | Merge pull request #3698 from spantaleev/add-matrix-docker-ansible-deployRichard van der Hoff2018-10-232-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | Add information about the matrix-docker-ansible-deploy playbook
| * | | | | | | | | | | | | | Add information about the matrix-docker-ansible-deploy playbookSlavi Pantaleev2018-10-142-0/+7
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Slavi Pantaleev <slavi@devture.com>
* | | | | | | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontextsRichard van der Hoff2018-10-222-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run MAU queries as background processes
| * | | | | | | | | | | | | | Run MAU queries as background processesRichard van der Hoff2018-10-202-8/+23
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3820
* | | | | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutilRichard van der Hoff2018-10-223-10/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make psutil an explicit dependency
| * | | | | | | | | | | | | | Make psutil an explicit dependencyRichard van der Hoff2018-10-193-10/+6
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of #4027, we require psutil to be installed, so it should be in our dependency list. We can also remove some of the conditional import code introduced by #992. Fixes #4062.
* | | | | | | | | | | | | | uh, Matrix is called Matrix these days...Matthew Hodgson2018-10-211-2/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase ↵Amber Brown2018-10-2027-518/+511
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on py3) (#4068)
* | | | | | | | | | | | | Merge branch 'rav/fix_email_templates_4065' into developRichard van der Hoff2018-10-192-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove notes on fallback for email_templatesRichard van der Hoff2018-10-192-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fallback didn't work, and was removed in #4069.
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-07 06:39:44 +0000