summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Expand)AuthorAgeFilesLines
* NewsfileErik Johnston2019-05-201-0/+1
* Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)"Richard van der Hoff2019-05-201-1/+0
* Add a test room version which updates event ID format (#5210)Richard van der Hoff2019-05-201-0/+1
* NewsfileErik Johnston2019-05-201-0/+1
* Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+1
|\
| * NewsfileErik Johnston2019-05-202-1/+1
| * NewsfileErik Johnston2019-05-151-0/+1
* | Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-201-0/+1
* | fix mapping of return values for get_or_register_3pid_guest (#5177)bytepoets-blo2019-05-171-0/+1
* | Merge pull request #5191 from matrix-org/erikj/refactor_pagination_boundsErik Johnston2019-05-171-0/+1
|\|
| * NewsfileErik Johnston2019-05-151-0/+1
* | expose SlavedProfileStore to ClientReaderSlavedStore (#5200)Neil Johnson2019-05-171-0/+1
* | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-05-171-0/+1
|\ \
| * | Stop telling people to install the optional dependencies. (#5197)Richard van der Hoff2019-05-171-0/+1
* | | Merge pull request #5196 from matrix-org/babolivier/per_room_profilesBrendan Abolivier2019-05-171-0/+1
|\ \ \
| * | | Changelog + sample configBrendan Abolivier2019-05-161-0/+1
* | | | Fix image orientation when generating thumbnail (#5039)PauRE2019-05-161-0/+1
* | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec...David Baker2019-05-131-0/+1
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec...David Baker2019-05-131-0/+1
| |\ \ \ \
| * | | | | Update changelogDavid Baker2019-05-101-1/+1
| * | | | | Thanks, automated grammar pedantry.David Baker2019-05-101-1/+1
| * | | | | Add changelog entryDavid Baker2019-05-101-0/+1
* | | | | | Make /sync attempt to return device updates for both joined and invited users...Matthew Hodgson2019-05-161-0/+1
* | | | | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_...David Baker2019-05-161-0/+1
|\ \ \ \ \ \
| * | | | | | Make newsfile clearerDavid Baker2019-05-151-1/+1
| * | | | | | Have I got newsfile for youDavid Baker2019-05-141-0/+1
* | | | | | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-0/+1
* | | | | | | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-151-0/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #5183 from matrix-org/erikj/async_serialize_eventErik Johnston2019-05-151-0/+1
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-05-141-0/+1
| |/ / / / /
* | | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_arrayErik Johnston2019-05-151-0/+1
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-05-141-0/+1
| |/ / / / /
* / / / / / NewsfileErik Johnston2019-05-141-0/+1
|/ / / / /
* | | | | Migrate all tests to use the dict-based config format instead of hanging item...Amber Brown2019-05-131-0/+1
* | | | | Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-131-0/+1
| |_|_|/ |/| | |
* | | | 0.99.4rc1 v0.99.4rc1Brendan Abolivier2019-05-1373-77/+0
| |_|/ |/| |
* | | Fix changelogBrendan Abolivier2019-05-131-0/+0
* | | ChangelogBrendan Abolivier2019-05-131-0/+1
| |/ |/|
* | URL preview blacklisting fixes (#5155)Andrew Morgan2019-05-101-0/+1
|/
* Set syslog identifiers in systemd units (#5023)Christoph Müller2019-05-101-0/+3
* Run Black on the tests again (#5170)Amber Brown2019-05-101-0/+1
* Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)Quentin Dufour2019-05-091-0/+1
* Fix bogus imports in tests (#5154)Brendan Abolivier2019-05-081-0/+1
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+1
* Merge pull request #5037 from matrix-org/erikj/limit_inflight_dnsErik Johnston2019-05-081-0/+1
|\
| * NewsfileErik Johnston2019-04-091-0/+1
* | Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-081-0/+1
* | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_inviteErik Johnston2019-05-071-0/+1
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_...Erik Johnston2019-04-2625-0/+25
| |\ \
| * | | NewsfileErik Johnston2019-04-261-0/+1
* | | | Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-071-0/+1
* | | | Fix spelling in server notices admin API docs (#5142)Travis Ralston2019-05-061-0/+1
* | | | Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-021-0/+1
* | | | Merge pull request #5124 from matrix-org/babolivier/aliasesBrendan Abolivier2019-05-021-0/+1
|\ \ \ \
| * | | | Add some limitations to alias creationBrendan Abolivier2019-05-021-0/+1
* | | | | Factor out an "assert_requester_is_admin" function (#5120)Richard van der Hoff2019-05-021-0/+1
* | | | | changelogRichard van der Hoff2019-05-011-0/+1
|/ / / /
* | | | Merge pull request #5116 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-05-011-0/+1
|\ \ \ \
| * | | | Rename changelog fileBrendan Abolivier2019-05-011-0/+0
| * | | | Add changelogBrendan Abolivier2019-05-011-0/+1
* | | | | Add a default .m.rule.tombstone push rule (#4867)Travis Ralston2019-04-291-0/+1
* | | | | Merge pull request #5100 from matrix-org/rav/verification_hackeryRichard van der Hoff2019-04-291-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | changelogRichard van der Hoff2019-04-251-0/+1
* | | | | Fix infinite loop in presence handlerRichard van der Hoff2019-04-261-0/+1
|/ / / /
* | | | Merge pull request #5098 from matrix-org/rav/fix_pep_517Richard van der Hoff2019-04-251-0/+1
|\ \ \ \
| * | | | ChangelogRichard van der Hoff2019-04-251-0/+1
* | | | | Fix handling of SYNAPSE_NO_TLS in docker image (#5005)*=0=1=4=*2019-04-251-0/+1
|/ / / /
* | | | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-251-0/+1
* | | | Remove log error for .well-known/matrix/client (#4972)Michael Kaye2019-04-241-0/+1
* | | | Prevent "producer not unregistered" message (#5009)Amber Brown2019-04-241-0/+1
|/ / /
* | | Don't crash on lack of expiry templatesBrendan Abolivier2019-04-181-0/+1
* | | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-1744-0/+46
|\ \ \
| * \ \ Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-0/+1
| |\ \ \
| * \ \ \ Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-171-0/+1
| |\ \ \ \
| | * | | | Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-171-0/+1
| * | | | | Merge pull request #5070 from matrix-org/erikj/postpathErik Johnston2019-04-171-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | NewsfileErik Johnston2019-04-161-0/+1
| * | | | | Merge pull request #5065 from matrix-org/erikj/fix_versionsErik Johnston2019-04-161-0/+1
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-04-151-0/+1
| * | | | | | Use packages.matrix.org for packages (#5067)Travis Ralston2019-04-161-0/+1
| * | | | | | Add systemd-python to optional dependencies (#4339)Silke Hofstra2019-04-161-0/+1
| |/ / / / /
| * | | | | Merge pull request #5063 from matrix-org/erikj/move_endpointsErik Johnston2019-04-151-0/+1
| |\| | | |
| | * | | | NewsfileErik Johnston2019-04-151-0/+1
| * | | | | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-111-0/+1
| * | | | | Merge pull request #5033 from matrix-org/erikj/fix_schema_deltaErik Johnston2019-04-101-0/+1
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-04-091-0/+1
| * | | | | | Fix disappearing exceptions in manhole. (#5035)Richard van der Hoff2019-04-101-0/+1
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-091-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_kRichard van der Hoff2019-04-091-0/+1
| |\ \ \ \ \
| | * | | | | changelogRichard van der Hoff2019-04-091-0/+1
| * | | | | | Bump psycopg requirement (#5032)Richard van der Hoff2019-04-091-0/+1
| |/ / / / /
| * | | | | Remove unused server_tls_certificates functions (#5028)Richard van der Hoff2019-04-082-1/+2
| * | | | | add context to phonehome stats (#5020)Neil Johnson2019-04-081-0/+1
| * | | | | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeysRichard van der Hoff2019-04-081-0/+1
| |\ \ \ \ \
| | * | | | | Fix from_server buglet in get_keys_from_perspectivesRichard van der Hoff2019-04-081-0/+1
| * | | | | | drop tables listed in #1830 (#4992)Neil Johnson2019-04-081-0/+1
| |/ / / / /
| * | | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2019-04-081-0/+1
| |\ \ \ \ \
| | * | | | | changelogRichard van der Hoff2019-04-041-0/+1
| * | | | | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-041-0/+1
| | |_|/ / / | |/| | | |
| * | | | | Clean up the database pagination code (#5007)Amber Brown2019-04-051-0/+1
| * | | | | Merge pull request #5002 from matrix-org/erikj/delete_groupErik Johnston2019-04-041-0/+1
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-04-031-0/+1
| * | | | | | Prevent kicking users who aren't in the room (#4999)Andrew Morgan2019-04-041-0/+1
| * | | | | | Avoid redundant URL encoding (#4555)Marcel Krüger2019-04-041-0/+1
| * | | | | | Merge pull request #5004 from ajensenwaud/developErik Johnston2019-04-041-0/+1
| |\ \ \ \ \ \
| | * | | | | | Fix issue #4596Anders2019-04-031-0/+1
| * | | | | | | Correct default POSTGRES_USER in Docker README (#4987)*=0=1=4=*2019-04-041-0/+1
| | |/ / / / / | |/| | | | |
| * | | | | | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-031-0/+1
| | |/ / / / | |/| | | |
| * | | | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986)Richard van der Hoff2019-04-031-0/+1
| * | | | | Remove presence lists (#4989)Neil Johnson2019-04-031-0/+1
| * | | | | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-031-0/+1
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-04-011-0/+1
| * | | | | | Run black on the rest of the storage module (#4996)Amber Brown2019-04-031-0/+1
| * | | | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startupErik Johnston2019-04-021-0/+1
| |\ \ \ \ \ \
| | * | | | | | s/misc/feature/Erik Johnston2019-04-021-0/+0
| | * | | | | | NewsfileErik Johnston2019-04-021-0/+1
| * | | | | | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-021-0/+1
| * | | | | | | Add config.signing_key_path. (#4974)Richard van der Hoff2019-04-021-0/+1
| |/ / / / / /
| * | / / / / Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-021-0/+1
| | |/ / / / | |/| | | |
| * | | | | Neilj/fix threepid auth check (with tests) (#4474)Neil Johnson2019-04-011-0/+1
| * | | | | Merge pull request #4981 from matrix-org/manuroe/demo_bypass_account_rate_lim...manuroe2019-04-011-0/+1
| |\ \ \ \ \
| | * | | | | start.sh: Fix the --no-rate-limit option for messages and make it bypass rate...manuroe2019-04-011-0/+1
| * | | | | | Merge branch 'master' into developNeil Johnson2019-04-0184-85/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| * | | | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-011-0/+2
| | |/ / / | |/| | |
| * | | | Add changelog.d entryJurrie Overgoor2019-03-291-0/+1
| * | | | Merge pull request #4955 from matrix-org/rav/merge_state_into_eventsRichard van der Hoff2019-03-281-0/+1
| |\ \ \ \
| | * | | | changelogRichard van der Hoff2019-03-271-0/+1
| * | | | | Merge pull request #4954 from matrix-org/rav/refactor_parse_rowRichard van der Hoff2019-03-281-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_rowRichard van der Hoff2019-03-281-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | changelogRichard van der Hoff2019-03-271-0/+1
| * | | | | | remove log line for password (#4965)Neil Johnson2019-03-281-0/+1
| * | | | | | Allow password providers to bind emails (#4947)Andrew Morgan2019-03-281-0/+1
| * | | | | | Merge pull request #4942 from matrix-org/erikj/fix_presenceErik Johnston2019-03-281-0/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | NewsfileErik Johnston2019-03-271-0/+1
| * | | | | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streamsRichard van der Hoff2019-03-281-0/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | changelogRichard van der Hoff2019-03-271-0/+2
| * | | | | | Run `black` on some storage modules that the stats branch touches (#4959)Amber Brown2019-03-291-0/+1
| |/ / / / /
| * / / / / Fix/improve some docstrings in the replication code. (#4949)Richard van der Hoff2019-03-271-0/+1
| |/ / / /
* | | | / Add management endpoints for account validityBrendan Abolivier2019-04-171-0/+1
| |_|_|/ |/| | |
* | | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-0/+1
| |_|/ |/| |
* | | Add account expiration featureBrendan Abolivier2019-04-091-0/+1
| |/ |/|
* | 0.99.3rc1 v0.99.3rc1Neil Johnson2019-03-2784-85/+0
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-0/+1
* Use the state event amount for userdir import batching, not room count (#4944)Amber Brown2019-03-271-0/+1
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-261-0/+1
* Fix ClientReplicationStreamProtocol.__str__ (#4929)Richard van der Hoff2019-03-251-0/+1
* Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-251-0/+1
* Use an explicit dbname for postgres connections in the tests. (#4928)Richard van der Hoff2019-03-251-0/+1
* Fix nginx example in ACME doc. (#4923)Richard van der Hoff2019-03-251-0/+1
* Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-251-0/+1
* Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-221-0/+1
|\
| * NewsfileErik Johnston2019-03-221-0/+1
* | Allow newsfragments to end with exclamation marks! (#4912)Richard van der Hoff2019-03-211-0/+1
* | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)Amber Brown2019-03-221-0/+1
* | Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-211-0/+1
|\ \ | |/ |/|
| * Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-112-0/+2
| |\
| * \ Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-113-0/+3
| |\ \
| * | | Add changelogAndrew Morgan2019-03-081-0/+1
* | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-211-0/+1
|\ \ \ \
| * | | | Update changelog.d/4908.bugfixRichard van der Hoff2019-03-211-1/+1
| * | | | NewsfileErik Johnston2019-03-211-0/+1
* | | | | Update Apache Setup To Remove Location Syntax (#4870)Colin W2019-03-211-0/+1
* | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-211-0/+1
|\| | | |
| * | | | NewsfileErik Johnston2019-03-201-0/+1
* | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-211-0/+1
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-03-191-0/+1
* | | | | | Log requests which are simulated by the unit tests. (#4905)Richard van der Hoff2019-03-201-0/+1
* | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-201-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | NewsfileErik Johnston2019-03-191-0/+1
| |/ / / /
* | | | | Batching in the user directory import (#4900)Amber Brown2019-03-211-0/+1
* | | | | Add a config option for torture-testing worker replication. (#4902)Richard van der Hoff2019-03-201-0/+1
* | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-201-0/+1
|/ / / /
* | | | NewsfileErik Johnston2019-03-191-0/+1
* | | | Merge pull request #4879 from matrix-org/erikj/test_old_depsErik Johnston2019-03-191-0/+1
|\ \ \ \
| * | | | Update newsfileErik Johnston2019-03-191-1/+1
| * | | | NewsfileErik Johnston2019-03-181-0/+1
* | | | | changelogRichard van der Hoff2019-03-191-0/+1
* | | | | Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-194-0/+4
|\ \ \ \ \
| * | | | | fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-192-0/+2
| * | | | | Fix user directory background update (#4887)Erik Johnston2019-03-191-0/+1
| * | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-03-191-0/+1
| |\ \ \ \ \
| | * | | | | Repoint docs for federation (#4881)Michael Kaye2019-03-191-0/+1
* | | | | | | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-191-0/+2
|/ / / / / /
* | | | | | Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-191-0/+1
* | | | | | Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-191-0/+1
* | | | | | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-181-0/+1
| |/ / / / |/| | | |
* | | | | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-151-0/+1
* | | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-151-0/+1
|\ \ \ \ \
| * | | | | changelogRichard van der Hoff2019-03-131-0/+1
* | | | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-151-0/+1
|\| | | | |
| * | | | | changelogRichard van der Hoff2019-03-131-0/+1
* | | | | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ciErik Johnston2019-03-151-0/+1
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-03-131-0/+1
* | | | | | | Add systemd setup that supports workers (#4662)Luca Corbatto2019-03-151-0/+1
* | | | | | | Add some stuff back to the .gitignore (#4843)Aaron Raimist2019-03-151-0/+1
* | | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ...Erik Johnston2019-03-141-1/+0
* | | | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | changelogAmber Brown2019-03-121-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-131-0/+1
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developNeil Johnson2019-03-121-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Neilj/improved delegation doc 2 (#4832)Neil Johnson2019-03-121-0/+1
* | | | | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-121-0/+1
* | | | | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-111-0/+1
| |_|_|/ |/| | |
* | | | Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-111-0/+1
* | | | NewsfileErik Johnston2019-03-111-0/+1
| |/ / |/| |
* | | Merge pull request #4839 from matrix-org/anoa/no_captcha_testsAndrew Morgan2019-03-111-0/+1
|\ \ \
| * | | Add changelogAndrew Morgan2019-03-081-0/+1
| | |/ | |/|
* | | fix incorrect encoding of filenames with spaces in (#2090)Matthew Hodgson2019-03-111-0/+1
* | | NewsfileErik Johnston2019-03-081-0/+1
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_...Erik Johnston2019-03-0814-0/+14
|\ \
| * \ Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-081-0/+1
| |\ \
| | * | NewsfileErik Johnston2019-03-071-0/+1
| * | | NewsfileErik Johnston2019-03-071-0/+1
| |/ /
| * | Merge pull request #4824 from matrix-org/rav/docker_docsRichard van der Hoff2019-03-071-0/+1
| |\ \
| | * | Document the `generate` option for the docker image.Richard van der Hoff2019-03-071-0/+1
| * | | Update example_log_config.yaml (#4820)Richard van der Hoff2019-03-071-0/+1
| * | | Fix check-newsfragment for debian-only changes. (#4825)Richard van der Hoff2019-03-071-0/+1
| * | | Rewrite userdir to be faster (#4537)Amber Brown2019-03-071-0/+1
| * | | Reword the sample config header to be less scary (#4801)Matthew Hodgson2019-03-071-0/+1
| |/ /
| * | Merge pull request #4779 from matrix-org/travis/iconsTravis Ralston2019-03-061-0/+1
| |\ \
| | * | Update changelog.d/4779.miscRichard van der Hoff2019-03-061-1/+1
| | * | ChangelogTravis Ralston2019-03-011-0/+1
| * | | Merge pull request #4818 from matrix-org/erikj/prefill_client_ipsErik Johnston2019-03-061-0/+1
| |\ \ \
| | * | | Update changelogErik Johnston2019-03-062-1/+1
| | * | | NewsfileErik Johnston2019-03-061-0/+1
| * | | | Merge pull request #4815 from matrix-org/erikj/docstringsErik Johnston2019-03-061-0/+1
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-03-061-0/+1
| | |/ / /
| * | | | Merge pull request #4816 from matrix-org/erikj/4422_debugErik Johnston2019-03-061-0/+1
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-03-061-0/+1
| | |/ / /
| * / / / NewsfileErik Johnston2019-03-061-0/+1
| |/ / /
| * | | Merge pull request #4792 from matrix-org/anoa/replication_tokensAndrew Morgan2019-03-061-0/+1
| |\ \ \
| | * | | Add changelogAndrew Morgan2019-03-041-0/+1
| * | | | Add changelogBrendan Abolivier2019-03-051-0/+1
* | | | | NewsfileErik Johnston2019-03-061-0/+1
|/ / / /
* | | | Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-0/+1
|\ \ \ \
| * | | | Add changelog and AUTHORS file entryJoseph Weston2019-03-011-0/+1
| |/ / /
* | | | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-0/+1
* | | | Merge pull request #4795 from matrix-org/anoa/configinatoractoringAndrew Morgan2019-03-051-0/+1
|\ \ \ \
| * | | | Add changelogAndrew Morgan2019-03-041-0/+1
* | | | | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahsAndrew Morgan2019-03-051-0/+1
|\ \ \ \ \
| * | | | | Add changelogAndrew Morgan2019-03-041-0/+1
| |/ / / /
* | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-051-0/+1
|\ \ \ \ \
| * | | | | clarify commentsErik Johnston2019-03-051-1/+1
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n...Erik Johnston2019-03-0436-27/+10
| |\ \ \ \ \
| * | | | | | Update newsfile to have a full stopErik Johnston2019-02-271-1/+1
| * | | | | | NewsfileErik Johnston2019-02-201-0/+1
* | | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_codeErik Johnston2019-03-051-0/+1
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2019-03-041-0/+1
* | | | | | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-051-0/+1
|\ \ \ \ \ \ \ \