summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge pull request #4894 from matrix-org/erikj/postgres_tuningErik Johnston2019-03-192-2/+21
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-03-191-0/+1
| | * | | | | Add note on tuning postgresErik Johnston2019-03-191-2/+20
| |/ / / / /
| * | | | | Merge pull request #4879 from matrix-org/erikj/test_old_depsErik Johnston2019-03-193-1/+21
| |\ \ \ \ \
| | * | | | | Add comment back inErik Johnston2019-03-191-0/+1
| | * | | | | Update newsfileErik Johnston2019-03-191-1/+1
| | * | | | | Revert changesErik Johnston2019-03-191-12/+2
| | * | | | | Bring py27-old into line with other test envsErik Johnston2019-03-181-0/+14
| | * | | | | Add coverage to py27-oldErik Johnston2019-03-181-3/+6
| | * | | | | NewsfileErik Johnston2019-03-181-0/+1
| | * | | | | Add py27-old test case to buildkiteErik Johnston2019-03-181-0/+11
| * | | | | | Merge pull request #4889 from matrix-org/rav/test_real_configRichard van der Hoff2019-03-198-18/+44
| |\ \ \ \ \ \
| | * | | | | | Fix RegistrationTestCaseRichard van der Hoff2019-03-191-2/+9
| | * | | | | | changelogRichard van der Hoff2019-03-191-0/+1
| | * | | | | | Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-193-13/+25
| | * | | | | | Fix resource limits testsRichard van der Hoff2019-03-191-2/+5
| | * | | | | | Fix registration testRichard van der Hoff2019-03-191-1/+2
| | * | | | | | Fix email testRichard van der Hoff2019-03-191-0/+2
| | * | | | | | Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-1910-11/+45
| | |\ \ \ \ \ \
| * | | | | | | | Merge pull request #4888 from matrix-org/rav/fix_disabled_hsRichard van der Hoff2019-03-193-3/+24
| |\| | | | | | | | | |/ / / / / / | |/| | | | | |
| | * | | | | | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-193-3/+24
* | | | | | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-03-1967-1320/+2227
|\| | | | | | |
| * | | | | | | fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-195-5/+39
| * | | | | | | Fix user directory background update (#4887)Erik Johnston2019-03-192-1/+2
| * | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-03-193-5/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Repoint docs for federation (#4881)Michael Kaye2019-03-192-1/+2
| | * | | | | | fix some typos in federate.mdRichard van der Hoff2019-03-151-4/+2
| * | | | | | | Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-1916-171/+230
| * | | | | | | Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-198-301/+405
| * | | | | | | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-186-5/+86
| | |/ / / / / | |/| | | | |
| * | | | | | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-1511-37/+259
| * | | | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-158-761/+865
| |\ \ \ \ \ \
| | * | | | | | changelogRichard van der Hoff2019-03-131-0/+1
| | * | | | | | Rename and move the classesRichard van der Hoff2019-03-137-811/+864
| | * | | | | | Factor per-destination stuff out of TransactionQueueRichard van der Hoff2019-03-131-132/+182
| * | | | | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-156-55/+111
| |\| | | | | |
| | * | | | | | changelogRichard van der Hoff2019-03-131-0/+1
| | * | | | | | Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-134-33/+78
| | * | | | | | declare a ReadReceipt classRichard van der Hoff2019-03-132-24/+34
| * | | | | | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ciErik Johnston2019-03-155-17/+54
| |\ \ \ \ \ \ \
| | * | | | | | | Correctly handle all command line optionsErik Johnston2019-03-143-16/+42
| | * | | | | | | NewsfileErik Johnston2019-03-131-0/+1
| | * | | | | | | Allow passing --daemonize to workersErik Johnston2019-03-132-1/+11
| * | | | | | | | Add systemd setup that supports workers (#4662)Luca Corbatto2019-03-156-0/+205
| * | | | | | | | Add some stuff back to the .gitignore (#4843)Aaron Raimist2019-03-152-3/+8
* | | | | | | | | Revert "Reinstate EDU-batching hacks"Richard van der Hoff2019-03-191-47/+10
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-144-12/+11
|\| | | | | | | |
| * | | | | | | | Merge pull request #4859 from matrix-org/revert-4793-anoa/trailing_slashesErik Johnston2019-03-144-12/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ...Erik Johnston2019-03-144-12/+11
| |/ / / / / / / /
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-1440-333/+684
|\| | | | | | | |
| * | | | | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-1411-138/+206
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | fixupAmber Brown2019-03-132-2/+2
| | * | | | | | | fixupAmber Brown2019-03-134-75/+17
| | * | | | | | | fixupAmber Brown2019-03-121-2/+2
| | * | | | | | | fixupAmber Brown2019-03-121-1/+1
| | * | | | | | | fixupAmber Brown2019-03-121-1/+2
| | * | | | | | | fixupAmber Brown2019-03-124-176/+159
| | * | | | | | | fixupAmber Brown2019-03-121-1/+1
| | * | | | | | | use the old methodAmber Brown2019-03-121-3/+2
| | * | | | | | | fixAmber Brown2019-03-121-1/+1
| | * | | | | | | pep8Amber Brown2019-03-121-2/+1
| | * | | | | | | changelogAmber Brown2019-03-121-0/+1
| | * | | | | | | fixesAmber Brown2019-03-124-52/+74
| | * | | | | | | setup masterAmber Brown2019-03-111-0/+2
| | * | | | | | | master startupAmber Brown2019-03-112-0/+9
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-searchAmber Brown2019-03-118-19/+57
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | initialAmber Brown2019-03-115-4/+114
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-134-2/+17
| * | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developNeil Johnson2019-03-125-154/+207
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | fix orphaned sentenceNeil Johnson2019-03-121-1/+0
| | * | | | | Neilj/improved delegation doc 2 (#4832)Neil Johnson2019-03-124-148/+202
| | * | | | | Add zwsp in bug report template (#4811)Richard van der Hoff2019-03-061-6/+6
| | | |_|_|/ | | |/| | |
| * | | | | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-123-0/+62
| * | | | | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-114-6/+7
| | |_|_|/ | |/| | |
| * | | | Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-114-11/+12
| * | | | Merge pull request #4847 from matrix-org/erikj/fix_stacktrace_keyringErik Johnston2019-03-112-2/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | NewsfileErik Johnston2019-03-111-0/+1
| | * | | Correctly log expected errors when fetching server keysErik Johnston2019-03-111-2/+2
| |/ / /
| * | | Merge pull request #4839 from matrix-org/anoa/no_captcha_testsAndrew Morgan2019-03-112-0/+2
| |\ \ \
| | * | | Add changelogAndrew Morgan2019-03-081-0/+1
| | * | | Disable captcha registration by default in testsAndrew Morgan2019-03-081-0/+1
| | | |/ | | |/|
| * | | fix incorrect encoding of filenames with spaces in (#2090)Matthew Hodgson2019-03-112-3/+52
| * | | Merge pull request #4837 from matrix-org/erikj/optional_prev_stateErik Johnston2019-03-114-16/+3
| |\ \ \ | | |/ / | |/| |
| | * | Add comment to schemaErik Johnston2019-03-081-0/+2
| | * | NewsfileErik Johnston2019-03-081-0/+1
| | * | Make `prev_state` field optionalErik Johnston2019-03-082-16/+0
| |/ /
| * | Merge pull request #4814 from matrix-org/erikj/soft_fail_implErik Johnston2019-03-085-1/+113
| |\ \
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_...Erik Johnston2019-03-0840-503/+711
| | |\ \ | | |/ / | |/| |
| | * | Factor out soft fail checksErik Johnston2019-03-081-5/+22
| | * | NewsfileErik Johnston2019-03-061-0/+1
| | * | Implement soft failErik Johnston2019-03-064-1/+95
* | | | Reinstate EDU-batching hacksRichard van der Hoff2019-03-131-10/+47
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-0811-18/+105
|\| | |
| * | | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-082-3/+8
| |\ \ \
| | * | | NewsfileErik Johnston2019-03-071-0/+1
| | * | | When re-syncing device lists reset the stateErik Johnston2019-03-071-3/+7
| * | | | Merge pull request #4828 from matrix-org/erikj/debug_device_listsErik Johnston2019-03-072-2/+39
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | NewsfileErik Johnston2019-03-071-0/+1
| | * | | Add some debug logging for device list handlingErik Johnston2019-03-071-2/+38
| |/ / /
| * | | Merge pull request #4824 from matrix-org/rav/docker_docsRichard van der Hoff2019-03-072-4/+38
| |\ \ \
| | * | | Document the `generate` option for the docker image.Richard van der Hoff2019-03-072-4/+38
| * | | | Debian package: fix warning during preconfiguration. (#4823)Richard van der Hoff2019-03-072-1/+11
| |\ \ \ \
| | * | | | Debian package: fix warning during preconfiguration.Richard van der Hoff2019-03-072-1/+11
| | |/ / /
| * | | | Update example_log_config.yaml (#4820)Richard van der Hoff2019-03-072-1/+3
| * | | | Fix check-newsfragment for debian-only changes. (#4825)Richard van der Hoff2019-03-072-7/+6
* | | | | Merge branch 'develop' of ssh://github.com/matrix-org/synapse intoAmber Brown2019-03-0713-426/+449
|\| | | |
| * | | | Rewrite userdir to be faster (#4537)Amber Brown2019-03-076-409/+400
| * | | | Reword the sample config header to be less scary (#4801)Matthew Hodgson2019-03-073-10/+21
| |/ / /
| * | | Merge pull request #4779 from matrix-org/travis/iconsTravis Ralston2019-03-064-7/+8
| |\ \ \
| | * | | Update changelog.d/4779.miscRichard van der Hoff2019-03-061-1/+1
| | * | | ChangelogTravis Ralston2019-03-011-0/+1
| | * | | Use static locations for Riot iconsTravis Ralston2019-03-013-7/+7
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-0620-55/+197
|\| | | |
| * | | | Merge pull request #4818 from matrix-org/erikj/prefill_client_ipsErik Johnston2019-03-062-0/+3
| |\ \ \ \
| | * | | | Update changelogErik Johnston2019-03-062-1/+1
| | * | | | NewsfileErik Johnston2019-03-061-0/+1
| | * | | | Prefill client IPs cache on workersErik Johnston2019-03-061-0/+2
| * | | | | Merge pull request #4815 from matrix-org/erikj/docstringsErik Johnston2019-03-063-7/+46
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-03-061-0/+1
| | * | | | | Add docstrings from matrix-org-hotfixesErik Johnston2019-03-062-7/+45
| | |/ / / /
| * | | | | Merge pull request #4816 from matrix-org/erikj/4422_debugErik Johnston2019-03-062-7/+47
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-03-061-0/+1
| | * | | | | Port #4422 debug logging from hotfixesErik Johnston2019-03-061-7/+46
| | |/ / / /
| * | | | | Merge pull request #4817 from matrix-org/erikj/shutdown_room_messageErik Johnston2019-03-062-11/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | NewsfileErik Johnston2019-03-061-0/+1
| | * | | | Send message after room has been shutdownErik Johnston2019-03-061-11/+11
| |/ / / /
| * | | | Merge pull request #4792 from matrix-org/anoa/replication_tokensAndrew Morgan2019-03-062-3/+29
| |\ \ \ \
| | * | | | Simplify token replication logicAndrew Morgan2019-03-051-23/+14
| | * | | | Clean up logic and add commentsAndrew Morgan2019-03-041-11/+18
| | * | | | Clearer branching, fix missing list clearAndrew Morgan2019-03-041-4/+11
| | * | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | * | | | Prevent replication wedgingAndrew Morgan2019-03-041-4/+24
| * | | | | Merge pull request #4804 from matrix-org/babolivier/ratelimit_registration_im...Brendan Abolivier2019-03-067-31/+40
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-063-2/+6
| | * | | | Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-069-15/+11
| | * | | | Add changelogBrendan Abolivier2019-03-051-0/+1
| | * | | | Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-059-11/+15
| | * | | | Update sample configBrendan Abolivier2019-03-051-11/+13
| | * | | | Move settings from registration to ratelimiting in config fileBrendan Abolivier2019-03-052-18/+20
| |/ / / /
| * | | | Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-055-2/+85
| |\ \ \ \
| | * | | | add API documentationJoseph Weston2019-03-021-0/+22
| | * | | | Add changelog and AUTHORS file entryJoseph Weston2019-03-012-0/+4
| | * | | | Add 'server_version' endpoint to admin APIJoseph Weston2019-03-012-1/+58
| | * | | | Import 'admin' module rather than 'register_servlets' directlyJoseph Weston2019-03-011-2/+2
* | | | | | Reenable presence tests and remove pointless changeErik Johnston2019-03-062-10/+6
* | | | | | Remove redundant changes from synapse/replication/tcp/streams.py (#4813)Richard van der Hoff2019-03-061-2/+2
* | | | | | Run `black` on synapse/handlers/user_directory.py (#4812)Richard van der Hoff2019-03-061-43/+47
* | | | | | Revert EDU-batching hacks from matrix-org-hotfixesRichard van der Hoff2019-03-061-45/+10
* | | | | | Fix outbound federationErik Johnston2019-03-051-0/+2
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-05143-1425/+3116
|\| | | | |
| * | | | | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-0517-54/+186
| * | | | | Merge pull request #4795 from matrix-org/anoa/configinatoractoringAndrew Morgan2019-03-052-3/+4
| |\ \ \ \ \
| | * | | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | * | | | | Remove reference to that no longer exists in READMEAndrew Morgan2019-03-041-3/+3
| * | | | | | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahsAndrew Morgan2019-03-052-22/+23
| |\ \ \ \ \ \
| | * | | | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | * | | | | | Remove unnecessary dollar signsAndrew Morgan2019-03-041-22/+22
| | |/ / / / /
| * | | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-054-29/+127
| |\ \ \ \ \ \
| | * | | | | | clarify commentsErik Johnston2019-03-053-10/+13
| | * | | | | | Fix missing null guardErik Johnston2019-03-041-1/+1
| | * | | | | | Only check history visibility when filteringErik Johnston2019-03-042-35/+46
| | * | | | | | s/get_forward_events/get_successor_events/Erik Johnston2019-03-042-3/+3
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n...Erik Johnston2019-03-04101-535/+1462
| | |\ \ \ \ \ \
| | * | | | | | | Update newsfile to have a full stopErik Johnston2019-02-271-1/+1
| | * | | | | | | Update commentsErik Johnston2019-02-271-3/+13
| | * | | | | | | NewsfileErik Johnston2019-02-201-0/+1
| | * | | | | | | Stop backpaginating when events not visibleErik Johnston2019-02-203-5/+78
| * | | | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_codeErik Johnston2019-03-052-60/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | changelogRichard van der Hoff2019-03-041-0/+1
| | * | | | | | | | Remove redundant PreserveLoggingContextRichard van der Hoff2019-03-041-10/+5
| | * | | | | | | | Remove unused `wait_for_replication` methodRichard van der Hoff2019-03-041-50/+0
| * | | | | | | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-0511-747/+765
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2019-03-041-0/+1
| | * | | | | | | | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-043-2/+15
| | * | | | | | | | | Split DeviceHandler into master and workerErik Johnston2019-03-042-170/+179
| | * | | | | | | | | Fixup slave storesErik Johnston2019-03-046-577/+572
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #4798 from matrix-org/rav/rr_debugRichard van der Hoff2019-03-042-6/+21
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add some debug about processing read receipts.Richard van der Hoff2019-03-042-6/+21
| * | | | | | | | | | Merge pull request #4797 from matrix-org/rav/inline_rr_sendRichard van der Hoff2019-03-042-59/+45
| |\| | | | | | | | | | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Clean up read-receipt handling.Richard van der Hoff2019-03-042-59/+45
| |/ / / / / / / /
| * / / / / / / / Include a default configuration file in the 'docs' directory. (#4791)Richard van der Hoff2019-03-0411-13/+1114
| |/ / / / / / /
| * | | | | | | Fix v4v6 option in HAProxy example config (#4790)Seebi2019-03-042-7/+6
| * | | | | | | Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-046-19/+37
| | |/ / / / / | |/| | | | |
| * | | | | | Update test_typing to use HomeserverTestCase. (#4771)Richard van der Hoff2019-03-045-179/+176
| | |_|_|/ / | |/| | | |
| * | | | | Fix incorrect log about not persisting duplicate state event. (#4776)Richard van der Hoff2019-03-012-3/+5
| | |_|/ / | |/| | |
| * | | | Merge branch 'master' into developRichard van der Hoff2019-03-013-6/+6
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | 0.99.2 v0.99.2 github/release-v0.99.2 release-v0.99.2Richard van der Hoff2019-03-011-6/+0
| | * | 0.99.2Richard van der Hoff2019-03-013-4/+10
| * | | Minor docstring fixes for MatrixFederationAgent (#4765)Andrew Morgan2019-02-282-1/+6
| * | | Make 'event_id' a required parameter in federated state requests (#4741)Amber Brown2019-02-272-2/+3
| * | | Fix parsing of Content-Disposition headers (#4763)Richard van der Hoff2019-02-273-20/+111
| * | | Move from TravisCI to BuildKite (#4752)Amber Brown2019-02-2713-108/+325
| * | | Merge pull request #4759 from matrix-org/erikj/3pid_client_readerErik Johnston2019-02-274-33/+37
| |\ \ \
| | * | | Update changelog.d/4759.featureRichard van der Hoff2019-02-271-1/+1
| | * | | NewsfileErik Johnston2019-02-271-0/+1
| | * | | Move /account/3pid to client_readerErik Johnston2019-02-273-33/+36
| * | | | Merge pull request #4758 from matrix-org/erikj/use_presence_replicationErik Johnston2019-02-273-2/+9
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-02-271-0/+1
| | * | | | When presence is enabled don't send over replicationErik Johnston2019-02-272-2/+8
| | |/ / /
| * | | | Merge pull request #4757 from matrix-org/erikj/key_api_fed_readaeErik Johnston2019-02-274-1/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix unit testsErik Johnston2019-02-271-0/+6
| | * | | NewsfileErik Johnston2019-02-271-0/+1
| | * | | Move server key queries to federation readerErik Johnston2019-02-272-1/+6
| |/ / /
| * | | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoffErik Johnston2019-02-275-6/+43
| |\ \ \ | | |/ / | |/| |
| | * | Move connecting logic into ClientReplicationStreamProtocolErik Johnston2019-02-272-18/+17
| | * | NewsfileErik Johnston2019-02-261-0/+1
| | * | Increase the max delay between retry attemptsErik Johnston2019-02-261-1/+1
| | * | Fix tightloop over connecting to replication serverErik Johnston2019-02-263-5/+42
| * | | 0.99.2rc1 v0.99.2rc1Richard van der Hoff2019-02-2750-53/+63
* | | | Remove #4733 debug (#4767)Richard van der Hoff2019-03-042-5/+0
* | | | Add more debug for #4422 (#4769)Richard van der Hoff2019-02-282-0/+12
* | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-02-2715-23/+150
|\| | |
| * | | Limit cache invalidation replication line length (#4748)Erik Johnston2019-02-273-5/+28
| * | | Add database version to phonehome stats. (#4753)Richard van der Hoff2019-02-275-0/+46
| * | | Fix check-newsfragment script (#4750)Richard van der Hoff2019-02-263-4/+10
| * | | Fix apache reverse proxy example (#4742)Paul Tötterman2019-02-261-1/+1
| |/ /
| * | Merge pull request #4746 from matrix-org/anoa/public_rooms_federate_developAndrew Morgan2019-02-264-13/+65
| |\ \
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Andrew Morgan2019-02-26391-6363/+18845
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federateAndrew Morgan2019-02-264-70/+17
| |\ \ \
| | * | | Revert "Prevent showing non-fed rooms in fed /publicRooms"Andrew Morgan2019-02-264-70/+17
| |/ / /
| * | | Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-264-17/+70
| |\ \ \
| | * | | Cleaner chunk logicAndrew Morgan2019-02-261-5/+4
| | * | | Correct indentAndrew Morgan2019-02-261-3/+3
| | * | | Correct docstring types and chunk logicAndrew Morgan2019-02-261-10/+11
| | * | | Clean up room chunk logicAndrew Morgan2019-02-261-6/+8
| | * | | Make not showing non-federated rooms the defaultAndrew Morgan2019-02-262-13/+1
| | * | | Result may be NoneAndrew Morgan2019-02-261-1/+1
| | * | | Address rich commentsAndrew Morgan2019-02-262-7/+31
| | * | | Fix group's call to generate_room_entryAndrew Morgan2019-02-251-4/+2
| | * | | elif not else ifAndrew Morgan2019-02-251-1/+1
| | * | | syntax derpAndrew Morgan2019-02-251-1/+1
| | * | | Simplify call to generate_room_entryAndrew Morgan2019-02-251-17/+13
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Erik Johnston2019-02-25384-6331/+18693
| | |\ \ \
| | * | | | Docs and arg name clarificationAndrew Morgan2019-02-251-2/+15
| | * | | | Don't restrict non-fed rooms over client APIsAndrew Morgan2019-02-253-14/+22
| | * | | | Config option to prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-252-2/+26
| | | | * | Add changelogAndrew Morgan2019-02-261-0/+1
| | | | * | Put function def back to the way it wasAndrew Morgan2019-02-261-3/+3
| | | | * | Prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-263-17/+54
| | | |/ / | | |/| |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-02-2622-49/+161
|\| | | |
| * | | | Don't log stack trace when client has gone away during media download (#4738)Erik Johnston2019-02-252-2/+10
| * | | | Fix ACME config for python 2. (#4717)Richard van der Hoff2019-02-252-3/+8
| * | | | switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-255-5/+7
| * | | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-255-8/+14
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-02-252-1/+2
| | * | | | Log tracebacks correctlyErik Johnston2019-02-253-7/+12
| | | |/ / | | |/| |
| * | | | Merge pull request #4718 from matrix-org/erikj/fix_backfill_state_shredErik Johnston2019-02-252-3/+32
| |\ \ \ \
| | * | | | Fixup changelogErik Johnston2019-02-251-1/+1
| | * | | | Fix typoErik Johnston2019-02-251-1/+1
| | * | | | More commentsErik Johnston2019-02-251-0/+4
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-31 17:31:54 +0000