summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into anoa/v2_lookupAndrew Morgan2019-08-214-0/+4
|\
| * Drop some unused tables. (#5893)Richard van der Hoff2019-08-211-0/+1
| * Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-201-0/+1
| |\
| | * Refactor the Appservice scheduler codeRichard van der Hoff2019-08-201-0/+1
| * | Avoid deep recursion in appservice recovery (#5885)Richard van der Hoff2019-08-201-0/+1
| * | Opentracing doc update (#5776)Jorik Schellekens2019-08-201-0/+1
| |/
* / add changelogAndrew Morgan2019-08-211-0/+1
|/
* Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-191-0/+1
|\
| * NewsfileErik Johnston2019-08-161-0/+1
* | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexHubert Chathi2019-08-161-0/+1
|\ \
| * | fix changelogHubert Chathi2019-08-151-1/+1
| * | add changelogHubert Chathi2019-08-141-0/+1
* | | Opentracing misc (#5856)Jorik Schellekens2019-08-161-0/+1
* | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-0/+1
* | | Don't create broken room when power_level_content_override.users does not con...Michael Telatynski2019-08-151-0/+1
| |/ |/|
* | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-141-0/+1
|\ \
| * | NewsfileErik Johnston2019-08-131-0/+1
* | | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-1361-61/+0
* | | changelogAmber H. Brown2019-08-141-0/+1
* | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-131-0/+1
|\ \ \ | |/ / |/| |
| * | NewsfileErik Johnston2019-08-011-0/+1
* | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-131-0/+1
* | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-131-0/+1
|\ \ \
| * | | NewsfileErik Johnston2019-08-121-0/+1
| | |/ | |/|
* | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-131-0/+1
|\ \ \
| * | | NewsfileErik Johnston2019-08-061-0/+1
* | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visErik Johnston2019-08-121-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-08-121-0/+1
* | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptErik Johnston2019-08-121-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Changelogs should end in '.' or '!'Erik Johnston2019-08-121-1/+1
| * | | | Fix curl command typo in purge_remote_media.shThomas Citharel2019-08-091-0/+1
| | |/ / | |/| |
* | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | changelogRichard van der Hoff2019-07-301-0/+1
* | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-061-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-08-061-0/+1
| | |/ / | |/| |
* / | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-0/+1
|/ / /
* | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-011-0/+1
|\ \ \
| * | | ChangelogBrendan Abolivier2019-08-011-0/+1
* | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-011-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-08-011-0/+1
* | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-011-0/+1
* | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-011-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | NewsfileErik Johnston2019-08-011-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-011-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-07-311-0/+1
* | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-011-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix spelling.Erik Johnston2019-08-011-1/+1
| |/ / /
| * | | NewsfileErik Johnston2019-07-311-0/+1
* | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-011-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-07-311-0/+1
| |/ / /
* | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-011-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-07-301-0/+1
* | | | | NewsfileErik Johnston2019-07-311-0/+1
| |/ / / |/| | |
* | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-311-0/+1
* | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownErik Johnston2019-07-311-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-07-311-0/+1
* | | | | Remove DelayedCall debugging from test runs (#5787)Amber Brown2019-07-311-0/+1
* | | | | NewsfileErik Johnston2019-07-311-0/+1
|/ / / /
* | / / NewsfileErik Johnston2019-07-301-0/+1
| |/ / |/| |
* | | NewsfileErik Johnston2019-07-301-0/+1
* | | NewsfileErik Johnston2019-07-301-0/+1
* | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-301-0/+1
|\ \ \
| * | | NewsfileErik Johnston2019-07-231-0/+1
* | | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-0/+1
| |_|/ |/| |
* | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+1
| |/ |/|
* | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-291-0/+1
|\ \
| * | NewsfileErik Johnston2019-07-261-0/+1
* | | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-291-0/+1
|\| |
| * | NewsfileErik Johnston2019-07-241-0/+1
| |/
* | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-291-0/+1
|\ \
| * | NewsfileErik Johnston2019-07-291-0/+1
* | | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-301-0/+1
* | | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-291-0/+1
* | | Fix debian packages for sid being called buster. (#5775)Erik Johnston2019-07-301-0/+1
|/ /
* | ChangelogBrendan Abolivier2019-07-291-0/+1
* | Merge branch 'master' into developRichard van der Hoff2019-07-262-2/+0
|\ \
| * | 1.2.1Richard van der Hoff2019-07-262-2/+0
| * | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-261-0/+1
| |\ \
* | \ \ Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-261-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-261-0/+1
* | | | Convert RedactionTestCase to modern test style (#5768)Richard van der Hoff2019-07-261-0/+1
* | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idRichard van der Hoff2019-07-251-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | log when a redaction attempts to redact an event in a different roomRichard van der Hoff2019-07-251-0/+1
| |/ /
| * | 1.2.0rc2 v1.2.0rc2Andrew Morgan2019-07-241-1/+0
| * | Fix servlet metric names (#5734)Jorik Schellekens2019-07-241-0/+1
* | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-251-0/+1
* | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-241-0/+1
|\ \ \
| * | | Update changelog.d/5743.bugfixErik Johnston2019-07-231-1/+1
| * | | NewsfileErik Johnston2019-07-231-0/+1
* | | | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-241-0/+1
* | | | Add a prometheus metric for active cache lookups. (#5750)Richard van der Hoff2019-07-241-0/+1
* | | | Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-231-0/+1
* | | | Replace returnValue with return (#5736)Amber Brown2019-07-231-0/+1
| |_|/ |/| |
* | | Opentracing Utils (#5722)Jorik Schellekens2019-07-231-0/+1
* | | Merge pull request #5732 from matrix-org/erikj/sdnotifyErik Johnston2019-07-231-0/+1
|\ \ \ | |/ / |/| |
| * | NewsfileErik Johnston2019-07-221-0/+1
* | | NewsfileErik Johnston2019-07-231-0/+1
* | | Merge pull request #5738 from matrix-org/erikj/faster_updateErik Johnston2019-07-231-0/+1
|\ \ \
| * | | NewsfileErik Johnston2019-07-231-0/+1
* | | | NewsfileErik Johnston2019-07-221-0/+1
|/ / /
* | | Fix logging in workers (#5729)Amber Brown2019-07-221-0/+1
* | | Merge pull request #5730 from matrix-org/erikj/cache_versionsErik Johnston2019-07-221-0/+1
|\ \ \
| * | | Update changelog.d/5730.miscErik Johnston2019-07-221-1/+1
| * | | NewsfileErik Johnston2019-07-221-0/+1
| |/ /
* | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeJason Robinson2019-07-221-0/+1
|\ \ \
| * | | Add `user_type` to returned fields in admin API user list endpointsJason Robinson2019-07-221-0/+1
| |/ /
* | | Fix stack overflow in Keyring (#5724)Richard van der Hoff2019-07-221-0/+1
|\ \ \
| * | | changelogRichard van der Hoff2019-07-191-0/+1
* | | | Merge tag 'v1.2.0rc1' into developAndrew Morgan2019-07-2252-55/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | 1.2.0rc1Andrew Morgan2019-07-2252-55/+0
* | | Demo uses deprecated cli option (#5725)Jorik Schellekens2019-07-221-0/+1
* | | Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-221-0/+1
|\| |
| * | Opentracing Documentation (#5703)Jorik Schellekens2019-07-221-0/+1
* | | Merge pull request #5720 from matrix-org/erikj/transactions_upsertErik Johnston2019-07-191-0/+1
|\ \ \
| * | | NewsfileErik Johnston2019-07-191-0/+1
| | |/ | |/|
* | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_stateErik Johnston2019-07-191-0/+1
|\ \ \
| * | | NewsfileErik Johnston2019-07-181-0/+1
* | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_stateErik Johnston2019-07-191-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-07-181-0/+1
* | | | | Don't accept opentracing data from clients. (#5715)Jorik Schellekens2019-07-191-0/+1
* | | | | Add 'rel' attribute to default welcome page. (#5695)Neil Johnson2019-07-191-0/+1
* | | | | Update the coding style doc (#5719)Richard van der Hoff2019-07-191-0/+1
| |_|/ / |/| | |
* | | | Speed up the PostgreSQL unit tests (#5717)Amber Brown2019-07-191-0/+1
* | | | Remove non-dedicated logging options and command line arguments (#5678)Amber Brown2019-07-191-0/+1
| |_|/ |/| |
* | | towncrierNeil Johnson2019-07-181-0/+1
| |/ |/|
* | Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-183-1/+4
* | Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-181-0/+1
* | Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-181-0/+1
* | Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-181-0/+1
* | Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-171-0/+1
* | Improve `Depends` specs in debian package. (#5675)Richard van der Hoff2019-07-171-0/+1
* | More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-171-0/+1
* | Fix redaction authentication (#5700)Richard van der Hoff2019-07-171-0/+2
* | Refactor `get_events_as_list` (#5699)Richard van der Hoff2019-07-171-0/+1
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-15123-85/+39
|\
| * Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-151-0/+1
| * Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-151-0/+1
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi...Erik Johnston2019-07-0591-85/+7
| | |\
| * | | Add a `docker` type to the towncrier configuration (#5673)Richard van der Hoff2019-07-125-2/+3
| * | | Implement access token expiry (#5660)Richard van der Hoff2019-07-121-0/+1
| * | | fix changelog nameRichard van der Hoff2019-07-121-0/+0
| * | | Update reverse_proxy.rst (#5397)Ulrik Günther2019-07-121-0/+1
| * | | Add missing space in default logging file format generated by the Docker imag...Slavi Pantaleev2019-07-121-0/+1
| * | | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619)Slavi Pantaleev2019-07-121-0/+1
| * | | Add a mechanism for per-test configs (#5657)Richard van der Hoff2019-07-121-0/+1
| * | | Use /src for checking out synapse during sytests (#5664)Amber Brown2019-07-111-0/+1
| * | | Improved docs on setting up Postgresql (#5661)Lrizika2019-07-111-0/+1
| * | | small typo fix (#5655)Andrew Morgan2019-07-111-0/+1
| * | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-111-0/+1
| * | | Add basic opentracing support (#5544)Jorik Schellekens2019-07-111-0/+1
| * | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-0/+1
| * | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-101-0/+1
| |\ \ \
| | * | | Rename changelog fileBrendan Abolivier2019-07-101-0/+0
| | * | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-101-0/+1
| * | | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-101-0/+1
| |/ / /
| * | | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-0/+1
| * | | Add a linting script (#5627)Andrew Morgan2019-07-101-0/+1
| * | | Correct pep517 flag in readme (#5651)Bruno Windels2019-07-101-0/+1
| * | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-091-0/+1
| |\ \ \
| | * \ \ Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-0888-75/+14
| | |\ \ \
| | * | | | ChangelogBrendan Abolivier2019-07-081-0/+1
| * | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-091-0/+1
| * | | | | Include the original event in /relations (#5626)Andrew Morgan2019-07-091-0/+1
| * | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+1
| |\ \ \ \ \
| | * | | | | ChangelogBrendan Abolivier2019-07-081-0/+1
| | | |/ / / | | |/| | |
| * | | | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-081-0/+1
| * | | | | Unblacklist some user_directory sytests (#5637)Richard van der Hoff2019-07-091-0/+1
| * | | | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-081-0/+1
| |/ / / /
| * | | | Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-081-0/+1
| * | | | Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-0/+1
| * | | | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-0/+1
| * | | | Add a few more common environment directory names to black exclusion (#5630)Andrew Morgan2019-07-081-0/+1
| * | | | Add default push rule to ignore reactions (#5623)J. Ryan Stinnett2019-07-051-0/+1
| * | | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-0/+1
| * | | | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-051-0/+1
| | |_|/ | |/| |
| * | | remove dead transaction persist code (#5622)Richard van der Hoff2019-07-051-0/+1
| * | | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-051-0/+1
| * | | Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-051-0/+1
| * | | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Amber Brown2019-07-051-0/+1
| * | | Add a sytest blacklist file (#5611)Andrew Morgan2019-07-051-0/+1
| * | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-0/+1
| * | | Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-031-0/+1
| * | | 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-034-4/+0
| * | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-031-0/+1
| * | | Remove SMTP_* env var functionality from docker conf (#5596)Andrew Morgan2019-07-031-0/+1
| * | | Fix media repo breaking (#5593)Amber Brown2019-07-021-0/+1
| * | | Merge remote-tracking branch 'origin/master' into release-v1.1.0Richard van der Hoff2019-07-021-0/+1
| |\ \ \
| | * \ \ Merge pull request #5552 from matrix-org/rav/github_templatesRichard van der Hoff2019-06-261-0/+1
| | |\ \ \
| | | * | | changelogRichard van der Hoff2019-06-251-0/+1
| * | | | | prepare v1.1.0rc1Richard van der Hoff2019-07-0288-89/+0
| * | | | | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-021-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0119-0/+19
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-2659-1/+59
| | |\ \ \ \ \ \
| | * | | | | | | changelogRichard van der Hoff2019-06-111-0/+1
| | * | | | | | | Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-111-0/+1
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge pull request #5587 from matrix-org/erikj/fix_synctlErik Johnston2019-07-021-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2019-07-021-0/+1
| * | | | | | | | | | Add ability to set timezone for Docker container (#5383)Amir Zarrinkafsh2019-07-021-0/+1
| * | | | | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-0/+1
| |/ / / / / / / / /
* | | | | | | | | / NewsfileErik Johnston2019-07-021-0/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | NewsfileErik Johnston2019-07-021-0/+1
|/ / / / / / / /
* | | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-011-0/+1
* | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-011-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | NewsfileErik Johnston2019-06-211-0/+1
* | | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-291-0/+1
* | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-281-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | ChangelogBrendan Abolivier2019-06-281-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Don't log GC 0s at INFO (#5557)Amber Brown2019-06-281-0/+1
* | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-282-0/+2
* | | | | | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-271-0/+1
* | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-271-0/+1
* | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesErik Johnston2019-06-271-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Move changelogErik Johnston2019-06-261-0/+0
| * | | | | | | NewsfileErik Johnston2019-06-261-0/+1
* | | | | | | | Docker image: Add a migrate_config mode (#5567)Richard van der Hoff2019-06-271-0/+1
* | | | | | | | Docker image: open the non-TLS port by default. (#5568)Richard van der Hoff2019-06-271-0/+1
* | | | | | | | Deprecate the env var way of running the docker image (#5566)Richard van der Hoff2019-06-271-0/+1
* | | | | | | | Fix JWT login (#5555)PauRE2019-06-271-0/+1
* | | | | | | | Merge pull request #5565 from matrix-org/rav/docker/fix_log_configRichard van der Hoff2019-06-271-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
* | | | | | | | | Reduce the amount of stuff we send in the docker context (#5564)Richard van der Hoff2019-06-271-0/+1
* | | | | | | | | Merge pull request #5563 from matrix-org/rav/docker/data_dirRichard van der Hoff2019-06-271-0/+1
|\| | | | | | | |
| * | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
* | | | | | | | | Merge pull request #5562 from matrix-org/rav/docker/no-generate-keysRichard van der Hoff2019-06-271-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #5561 from matrix-org/rav/docker/refactorRichard van der Hoff2019-06-271-0/+1
|\| | | | | | | |
| * | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
* | | | | | | | | Merge pull request #5570 from almereyda/patch-2Richard van der Hoff2019-06-271-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix changelogRichard van der Hoff2019-06-271-1/+1
| * | | | | | | | | Create 5570.miscjon r2019-06-271-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5313 from twrist/patch-1Richard van der Hoff2019-06-271-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Create 5313.miscIke Johnson2019-06-021-0/+1
* | | | | | | | | Improve docs on choosing server_name (#5558)Richard van der Hoff2019-06-261-0/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Remove & changelog (#5548)Amber Brown2019-06-261-0/+1
* | | | | | | | Merge branch 'master' into developAndrew Morgan2019-06-251-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Update changelog to better expain password reset change (#5545) github/release-v1.0.0 release-v1.0.0Andrew Morgan2019-06-241-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-251-0/+1
* | | | | | Increase default log level for docker image to INFO. (#5547)Richard van der Hoff2019-06-251-0/+1
* | | | | | Update docker image to use Python 3.7. (#5546)Richard van der Hoff2019-06-251-0/+1
* | | | | | Add info about black to code_style.rst (#5537)Andrew Morgan2019-06-241-0/+1
* | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-241-0/+1
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2019-06-241-0/+1
* | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-241-0/+1
|\| | | | | |
| * | | | | | changelogRichard van der Hoff2019-06-241-0/+1
* | | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsRichard van der Hoff2019-06-241-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-2417-0/+17
| |\ \ \ \ \ \ \
| * | | | | | | | changelogRichard van der Hoff2019-06-191-0/+1
* | | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-241-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-0/+1
* | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-241-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |