summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Move room_tag declaration to be closer to its useAndrew Morgan2019-01-251-4/+5
* Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-2575-1069/+1683
|\
| * Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-254-0/+86
| |\
| | * Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synap...Andrew Morgan2019-01-243-3/+3
| | |\
| | | * Apply suggestions from code reviewRichard van der Hoff2019-01-242-2/+2
| | | * Update synapse/api/filtering.pyRichard van der Hoff2019-01-241-1/+1
| | * | Remove redundant create event None checkAndrew Morgan2019-01-241-3/+0
| | |/
| | * Do not return in a deferred functionAndrew Morgan2019-01-221-3/+3
| | * Ensure new filter is actually createdAndrew Morgan2019-01-222-2/+1
| | * Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-223-35/+51
| | * Add changelogAndrew Morgan2019-01-181-0/+1
| | * Search for messages across predecessor roomsAndrew Morgan2019-01-183-0/+73
| * | Merge pull request #4447 from matrix-org/erikj/msc_1813Erik Johnston2019-01-255-7/+37
| |\ \
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-2563-1025/+1459
| | |\ \
| | * | | Review commentsErik Johnston2019-01-242-2/+4
| * | | | Merge pull request #4469 from matrix-org/revert-4451-erikj/require_format_ver...Erik Johnston2019-01-2518-253/+91
| |\ \ \ \
| | * | | | Revert "Require event format version to parse or create events"Erik Johnston2019-01-2518-253/+91
| |/ / / /
| * | | | Merge pull request #4451 from matrix-org/erikj/require_format_versionErik Johnston2019-01-2518-91/+253
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo...Erik Johnston2019-01-2438-698/+509
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-245-13/+67
| |\ \ \ \
| | * | | | Review commentsErik Johnston2019-01-242-1/+7
| * | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-245-39/+35
| |\ \ \ \ \
| | * | | | | Update make_membership_event docsErik Johnston2019-01-241-2/+5
| | * | | | | Remove unecessary setting of outlier bitErik Johnston2019-01-241-2/+0
| | * | | | | Use term 'out of band membership' insteadErik Johnston2019-01-243-9/+10
| * | | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-246-4/+49
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fixAndrew Morgan2019-01-242-2/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Change default timeout value from 0 to NoneAndrew Morgan2019-01-241-1/+1
| | * | | | | | | Use self.clock instead of datetimeAndrew Morgan2019-01-241-4/+3
| | * | | | | | | isortAndrew Morgan2019-01-241-1/+1
| | * | | | | | | Add changelogAndrew Morgan2019-01-241-0/+1
| | * | | | | | | lintAndrew Morgan2019-01-241-1/+2
| | * | | | | | | Time out filtered room dir queries after 60sAndrew Morgan2019-01-241-2/+12
| * | | | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookupRichard van der Hoff2019-01-243-12/+89
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Look up the right SRV recordRichard van der Hoff2019-01-243-4/+12
| | * | | | | | | | lots more tests for MatrixFederationAgentRichard van der Hoff2019-01-241-10/+79
| * | | | | | | | | Generate the debian config during build (#4444)Richard van der Hoff2019-01-244-617/+33
| * | | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-242-2/+4
| |/ / / / / / / /
| * | | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-245-9/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-223-7/+6
| | * | | | | | | | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-225-8/+16
| * | | | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_docNeil Johnson2019-01-242-1/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ChangelogDavid Baker2019-01-241-0/+1
| | * | | | | | | | | Clarify docs for public_baseurlDavid Baker2019-01-241-1/+5
| | | |/ / / / / / / | | |/| | | | | | |
| * / | | | | | | | Fix UPSERT check (#4459)Amber Brown2019-01-242-5/+29
| |/ / / / / / / /
| * | | | | | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-2414-43/+238
| * | | | | | | | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-243-6/+73
| | | | | | * | | Replace missed usages of FrozenEventErik Johnston2019-01-243-10/+14
| | | | | | * | | Fix testsErik Johnston2019-01-245-4/+14
| | | | | | * | | NewsfileErik Johnston2019-01-231-0/+1
| | | | | | * | | Require event format version to parse or create eventsErik Johnston2019-01-238-74/+193
| | | | | | * | | Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse...Erik Johnston2019-01-235-37/+32
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Clarify the invite flowsErik Johnston2019-01-233-7/+24
| | | | * | | | | Remove unnecessary '_sign_event'Erik Johnston2019-01-232-15/+8
| | | | * | | | | NewsfileErik Johnston2019-01-231-0/+1
| | | | * | | | | Store rejected remote invite events as outliersErik Johnston2019-01-233-38/+21
| | |_|/ / / / / | |/| | | | | |
| | | | | * | | Merge branch 'erikj/get_pdu_versions' into erikj/require_format_versionErik Johnston2019-01-2329-309/+937
| | | | | |\ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | NewsfileErik Johnston2019-01-231-0/+1
| | | | * | | | Add room_version param to get_pduErik Johnston2019-01-234-13/+60
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backportAndrew Morgan2019-01-232-0/+7
| |\ \ \ \ \ \
| | * | | | | | Add changelogAndrew Morgan2019-01-231-0/+1
| | * | | | | | Add metric for user dir current event stream positionAndrew Morgan2019-01-231-0/+6
| * | | | | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agentRichard van der Hoff2019-01-239-258/+555
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fix python2 test failureRichard van der Hoff2019-01-231-1/+1
| | * | | | | | Add a test for MatrixFederationAgentRichard van der Hoff2019-01-222-1/+195
| | * | | | | | put resolve_service in an objectRichard van der Hoff2019-01-223-83/+104
| | * | | | | | Require that service_name be a byte stringRichard van der Hoff2019-01-222-8/+8
| | * | | | | | changelogRichard van der Hoff2019-01-221-0/+1
| | * | | | | | Kill off matrix_federation_endpointRichard van der Hoff2019-01-222-145/+0
| | * | | | | | Make MatrixFederationClient use MatrixFederationAgentRichard van der Hoff2019-01-222-27/+106
| | * | | | | | MatrixFederationAgentRichard van der Hoff2019-01-222-0/+147
| * | | | | | | debian package: symlink to python-3.X (#4433)Richard van der Hoff2019-01-233-2/+16
| * | | | | | | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-232-1/+6
| * | | | | | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-238-36/+298
| | | | | * | | Merge branch 'erikj/msc_1813' into erikj/require_format_versionErik Johnston2019-01-235-8/+41
| | | | |/| | | | | | | | |/ /
| | | | | * | NewsfileErik Johnston2019-01-231-0/+1
| | | | | * | Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-234-8/+40
| | | | * | | Update newsfileErik Johnston2019-01-231-1/+1
| | | | |/ /
| | | | * | isortErik Johnston2019-01-232-4/+2
| | | | * | NewsfileErik Johnston2019-01-231-0/+1
| | | | * | Add support for persisting event format versionsErik Johnston2019-01-235-4/+50
| | |_|/ / | |/| | |
| * | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedupErik Johnston2019-01-222-26/+36
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Refactor to rewrite the SQL insteadErik Johnston2019-01-221-13/+16
| | * | | Don't shadow paramsErik Johnston2019-01-221-4/+3
| | * | | NewsfileErik Johnston2019-01-221-0/+1
| | * | | Fix bug when removing duplicate rows from user_ipsErik Johnston2019-01-221-13/+20
| * | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registrationNeil Johnson2019-01-223-11/+15
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | fix line lengthNeil Johnson2019-01-211-1/+3
| | * | | Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-213-11/+13
* | | | | Move tag and direct state copying into separate functionAndrew Morgan2019-01-251-43/+63
* | | | | lintAndrew Morgan2019-01-221-1/+3
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-223-172/+8
|\| | | |
| * | | | Make key fetches use regular federation client (#4426)Richard van der Hoff2019-01-223-172/+8
* | | | | Prevent duplicate room IDs in m.directAndrew Morgan2019-01-221-10/+9
* | | | | Fix commentsAndrew Morgan2019-01-221-2/+2
* | | | | Join logic covers both room creator and arbitrary usersAndrew Morgan2019-01-221-33/+0
* | | | | tags, m.direct copying over correctlyAndrew Morgan2019-01-222-11/+62
* | | | | Fix typosAndrew Morgan2019-01-224-14/+14
* | | | | Migrating dm and room tags work for migratorAndrew Morgan2019-01-221-2/+13
* | | | | Prevent crash on user who doesn't have any direct roomsAndrew Morgan2019-01-221-1/+1
* | | | | Add changelogAndrew Morgan2019-01-221-0/+1
* | | | | Preserve DM status of a room on upgradeAndrew Morgan2019-01-221-0/+19
* | | | | Fix typoAndrew Morgan2019-01-221-2/+2
|/ / / /
* | | | Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-226-86/+250
* | | | Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-228-57/+6
| |/ / |/| |
* | | Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_serverErik Johnston2019-01-214-6/+42
|\ \ \ | |/ / |/| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv...Erik Johnston2019-01-2124-118/+261
| |\ \ | |/ / |/| |
* | | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-214-68/+74
|\ \ \
* | | | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-213-0/+3
* | | | Fix race when persisting create event (#4404)Erik Johnston2019-01-182-1/+13
* | | | Tweak code coverage settings (#4400)Erik Johnston2019-01-183-0/+17
* | | | Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-184-93/+67
* | | | Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-174-3/+117
| |_|/ |/| |
* | | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-173-15/+18
* | | Changing macaroon_secret_key no longer logs you out (#4387)Richard van der Hoff2019-01-162-3/+1
* | | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-162-0/+20
* | | Merge pull request #4399 from andrewshadura/update-python-depsErik Johnston2019-01-162-2/+3
|\ \ \
| * | | Add a changelog entryAndrej Shadura2019-01-161-0/+1
| * | | Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynaclAndrej Shadura2019-01-161-1/+1
| * | | Use msgpack instead of msgpack-pythonAndrej Shadura2019-01-161-1/+1
|/ / /
* | | Merge pull request #4392 from matrix-org/neilj/fix_user_type_typoErik Johnston2019-01-152-1/+2
|\ \ \
| * | | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-152-1/+2
|/ / /
| | * NewsfileErik Johnston2019-01-161-0/+1
| | * Add /v2/invite federation APIErik Johnston2019-01-153-6/+41
| |/
| * NewsfileErik Johnston2019-01-151-0/+1
| * Add groundwork for new versions of federation APIsErik Johnston2019-01-153-68/+73
|/
* Merge branch 'release-v0.34.1.1' into developRichard van der Hoff2019-01-124-49/+163
|\
| * moar plusses!Richard van der Hoff2019-01-121-2/+2
| * Rewrite build_debian_packages github/release-v0.34.1.1 release-v0.34.1.1Richard van der Hoff2019-01-122-46/+154
| * s/Breaks/Conflicts/ in debian/controlRichard van der Hoff2019-01-112-3/+9
* | Silence travis-ci build warnings by removing non-functional python3.6 (#4377)Richard van der Hoff2019-01-122-0/+8
* | Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-124-4/+164
* | Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-116-195/+51
|\ \
| * | Merge Synapse v0.34.1.1Amber Brown2019-01-116-195/+51
| |\|
| | * changelog, for debianAmber Brown2019-01-111-0/+6
| | * changelog v0.34.1.1Amber Brown2019-01-112-1/+14
| | * versionAmber Brown2019-01-111-1/+1
| | * Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1Amber Brown2019-01-114-194/+31
| |/|
| | * changelogRichard van der Hoff2019-01-102-1/+1
| | * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-104-194/+31
| |/|
| | * Revert "Fix macaroon_secret_key fallback logic"Richard van der Hoff2019-01-101-3/+3
| | * changelogRichard van der Hoff2019-01-101-0/+1
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-103-197/+33
| | |\
| | | * 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-102-186/+28
| | | * Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
* | | | Merge pull request #4342 from aaronraimist/new-virtualenvRichard van der Hoff2019-01-102-3/+3
|\ \ \ \
| * | | | README.rst: fix hash_password pathRichard van der Hoff2019-01-021-2/+1
| * | | | Add changelogAaron Raimist2019-01-011-0/+1
| * | | | Update README to use new virtualenv (#4328)Aaron Raimist2019-01-011-2/+2
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-091-3/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fix docker build to install optional deps github/release-v0.34.1 release-v0.34.1Richard van der Hoff2019-01-091-3/+1
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-092-1/+8
|\| | | |
| * | | | debian: Remove Breaks: matrix-synapse-ldap3 v0.34.1+1Richard van der Hoff2019-01-092-1/+8
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-0945-46/+73
|\| | | |
| * | | | 0.34.1 v0.34.1Richard van der Hoff2019-01-095-5/+13
| * | | | Merge branch 'develop' into release-v0.34.1Erik Johnston2019-01-094-6/+13
| |\ \ \ \
| * | | | | clean up changelog v0.34.1rc1Richard van der Hoff2019-01-081-3/+2
| * | | | | 0.34.1rc1Richard van der Hoff2019-01-081-1/+1
| * | | | | changelogRichard van der Hoff2019-01-0841-41/+61
* | | | | | Merge pull request #4368 from matrix-org/erikj/better_errorsErik Johnston2019-01-092-68/+74
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-01-091-0/+1
| * | | | | | 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-093-1/+81
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #4362 from matrix-org/erikj/better_errorsErik Johnston2019-01-092-5/+6
|\| | | | |
| * | | | | NewsfileErik Johnston2019-01-081-0/+1
| * | | | | Use RequestSendFailed when fail to parse content type headersErik Johnston2019-01-081-5/+5
* | | | | | Merge pull request #4361 from matrix-org/erikj/better_errorsErik Johnston2019-01-082-1/+7
|\| | | | | | |/ / / / |/| | | |
| * | | | NewsfileErik Johnston2019-01-081-0/+1
| * | | | 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-086-44/+119
* | | | Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-082-1/+2
* | | | Fix command hint to generate a config file (#4353)Jason Robinson2019-01-073-2/+8
* | | | Add GET account data routes (#4303)Travis Ralston2019-01-072-1/+34
* | | | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-074-28/+75
* | | | fix the check for whether `is_url` to match all the other ones in codebase (#...Michael Telatynski2019-01-062-3/+9
* | | | Update debian Conflicts specifications (#4349)Richard van der Hoff2019-01-043-2/+14
* | | | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-022-10/+12
* | | | Update README to not lie about required restart (#4343)Aaron Raimist2019-01-022-2/+3
* | | | Merge pull request #4344 from matrix-org/neilj/fix_synchrotron_fix_4312Neil Johnson2019-01-022-25/+26
|\ \ \ \
| * | | | Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-022-25/+26
|/ / / /
* | | | Update docker-compose.yml (#4282)jribal2019-01-021-1/+1
* | | | Update PR template to use absolute links (#4341)Aaron Raimist2019-01-022-2/+3
* | | | Avoid packaging _trial_temp directory (#4326)Richard van der Hoff2019-01-022-2/+3
* | | | Install the optional dependencies into the debian package (#4325)Richard van der Hoff2019-01-025-20/+37
|/ / /
* | | Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-297-590/+45
* | | Remove mention of lt-cred-mech in the sample coturn config. (#4333)Krithin Sitaram2018-12-282-3/+3
* | | Log roomid along with Unknown room (#4297)Will Hunt2018-12-242-1/+2
* | | Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-243-1/+6
|\ \ \
| * | | NewsfileErik Johnston2018-12-181-0/+1
| * | | Add v2 room versionErik Johnston2018-12-182-1/+5
* | | | Return well_known in /login response (#4319)Richard van der Hoff2018-12-243-7/+15
* | | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5Richard van der Hoff2018-12-232-1/+24
|\ \ \ \
| * | | | Fix test_metrics.py compatibility prometheus_client 0.5Maarten de Vries2018-12-212-1/+24
* | | | | Merge pull request #4316 from matrix-org/rav/fix_docker_uploadRichard van der Hoff2018-12-212-2/+3
|\ \ \ \ \
| * | | | | Fix circleci config for synapse:latest docker uploadRichard van der Hoff2018-12-212-2/+3
| |/ / / /
* | | | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-2211-46/+157
* | | | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-222-35/+36
* | | | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-228-272/+590
* | | | | Make the dependencies more like a standard Python project and hook up the opt...Amber Brown2018-12-227-158/+111
|/ / / /
* | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-2/+7
|\ \ \ \
| * | | | Mention updating extensions github/release-v0.34.0 release-v0.34.0Richard van der Hoff2018-12-201-2/+7
* | | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-3/+4
|\| | | |
| * | | | clarify that installing -py3 removes the old pkgRichard van der Hoff2018-12-201-3/+4
* | | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-1/+8
|\| | | |
| * | | | buster is a thingRichard van der Hoff2018-12-201-1/+8
| | |/ / | |/| |
* | | | Merge branch 'master' into developRichard van der Hoff2018-12-2042-29/+2514
|\| | |
| * | | Clarify that py2 packages will continue to exist v0.34.0Richard van der Hoff2018-12-201-0/+4
| * | | document supported python 3 versionsRichard van der Hoff2018-12-202-5/+9
| * | | more changelog fixRichard van der Hoff2018-12-201-1/+1
| * | | minor changelog tweaksRichard van der Hoff2018-12-201-4/+4
| * | | fix UPGRADE formattingRichard van der Hoff2018-12-201-6/+6
| * | | Prepare 0.34 releaseRichard van der Hoff2018-12-207-24/+18
| * | | Update log config for debian packagesRichard van der Hoff2018-12-201-0/+1
| * | | Debian packaging via dh_virtualenvRichard van der Hoff2018-12-2041-2/+2481
| |\ \ \
| | * | | Debian packaging via dh_virtualenv (#4285)Richard van der Hoff2018-12-2036-509/+310
| | * | | import from package-debian-synapseAmber Brown2018-12-2038-0/+2678
| * | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-202-1/+3
| * | | | Improved welcome page (#4294)Nad Chishtie2018-12-142-25/+63
| * | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-142-1/+2
| |/ / /
* | | | Merge pull request #4309 from KB1RD/KB1RD-fixesRichard van der Hoff2018-12-192-3/+8
|\ \ \ \
| * | | | Create 4309.bugfixNathan Pennie2018-12-191-0/+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-182-1/+2
* | | | create support user (#4141)Neil Johnson2018-12-1420-47/+371
* | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-142-1/+2
* | | | Improved welcome page (#4294)Nad Chishtie2018-12-142-25/+63
* | | | Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_linkRichard van der Hoff2018-12-112-1/+2
|\ \ \ \
| * | | | Update CONTRIBUTING.rstMichael Kaye2018-12-111-1/+1
| * | | | changelogMichael Kaye2018-12-071-0/+1
| * | | | Update link to kernel.org DCO usageMichael Kaye2018-12-071-1/+1
* | | | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-1143-98/+146
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 0.34.0rc2 v0.34.0rc2Richard van der Hoff2018-12-115-4/+17
| * | | | remove changelog filesRichard van der Hoff2018-12-1134-36/+0
| * | | | Merge pull request #4290 from matrix-org/rav/remove_webclientRichard van der Hoff2018-12-116-58/+44
| |\ \ \ \
| | * | | | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-116-58/+44
| * | | | | Merge pull request #4289 from matrix-org/rav/welcome_pageRichard van der Hoff2018-12-113-0/+30
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'rav/disable_pager_in_ci' into rav/welcome_pageRichard van der Hoff2018-12-112-2/+3
| | |\ \ \ \ \
| | * | | | | | Add a welcome page to the static resourcesRichard van der Hoff2018-12-113-0/+30
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4291 from matrix-org/rav/disable_pager_in_ciRichard van der Hoff2018-12-112-2/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Disable pager for ci scriptRichard van der Hoff2018-12-112-2/+3
| | |/ / / /
| * | | | | fix upgrade.rst link again v0.34.0rc1Richard van der Hoff2018-12-041-1/+1
| * | | | | Fix link to upgrade notesRichard van der Hoff2018-12-041-1/+1
| * | | | | fix typo in changelogRichard van der Hoff2018-12-041-1/+1
| * | | | | Prepare 0.34.0rc1Richard van der Hoff2018-12-042-2/+56
| |/ / / /
* | | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-112-1/+3
* | | | | Merge pull request #4279 from matrix-org/hs/fix-config-corsWill Hunt2018-12-102-1/+2
|\ \ \ \ \
| * | | | | Move imports to one lineWill Hunt2018-12-101-4/+1
| * | | | | Use `send_cors`Will Hunt2018-12-101-4/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-15 12:47:17 +0000