| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | Only fetch required fields from database | Erik Johnston | 2018-05-08 | 1 | -1/+2 | |
| | * | | | | | | | | | Split paginate_room_events storage function | Erik Johnston | 2018-05-08 | 1 | -28/+72 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #3007 from matrix-org/rav/warn_on_logcontext_fail | Richard van der Hoff | 2018-05-03 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail | Richard van der Hoff | 2018-05-03 | 173 | -1459/+3290 | |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks | Richard van der Hoff | 2018-05-03 | 1 | -3/+14 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Fix logcontext leaks in rate limiter | Richard van der Hoff | 2018-05-03 | 1 | -3/+14 | |
| * | | | | | | | | | | | Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown | Richard van der Hoff | 2018-05-03 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Don't abortConnection() if the transport connection has already closed. | Will Hunt | 2018-05-03 | 1 | -3/+8 | |
| * | | | | | | | | | | | | Merge pull request #3178 from matrix-org/rav/fix_request_timeouts | Richard van der Hoff | 2018-05-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | add missing param to cancelled_to_request_timed_out_error | Richard van der Hoff | 2018-05-02 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Fix changes warning | Richard van der Hoff | 2018-05-03 | 1 | -2/+2 | |
| * | | | | | | | | | | | | Warn of potential client incompatibility from #3161 | Richard van der Hoff | 2018-05-03 | 1 | -0/+15 | |
| * | | | | | | | | | | | | Merge pull request #3141 from matrix-org/erikj/fixup_state | Erik Johnston | 2018-05-03 | 1 | -37/+67 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fix up grammar | Erik Johnston | 2018-05-03 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | Refactor event storage to not require state | Erik Johnston | 2018-04-27 | 1 | -37/+67 | |
| * | | | | | | | | | | | | | Merge pull request #3161 from NotAFile/remove-v1auth | Richard van der Hoff | 2018-05-03 | 7 | -25/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Burminate v1auth | Adrian Tschira | 2018-04-30 | 7 | -25/+24 | |
| * | | | | | | | | | | | | | | Merge pull request #3175 from matrix-org/erikj/escape_metric_values | Erik Johnston | 2018-05-03 | 2 | -3/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Make _escape_character take MatchObject | Erik Johnston | 2018-05-02 | 1 | -2/+10 | |
| | * | | | | | | | | | | | | | Escape label values in prometheus metrics | Erik Johnston | 2018-05-02 | 2 | -3/+40 | |
| * | | | | | | | | | | | | | | Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 2 | -33/+93 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into rav/more_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 6 | -6/+71 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Remove spurious unittest.DEBUG | Richard van der Hoff | 2018-05-02 | 1 | -1/+0 | |
| | * | | | | | | | | | | | | | | | Fix a class of logcontext leaks | Richard van der Hoff | 2018-05-02 | 2 | -33/+94 | |
| * | | | | | | | | | | | | | | | | Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fix logcontext leak in media repo | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 | |
| | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 2 | -3/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Fix a couple of logcontext leaks in unit tests | Richard van der Hoff | 2018-05-02 | 2 | -3/+9 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge pull request #3168 from matrix-org/rav/fix_logformatter | Richard van der Hoff | 2018-05-02 | 2 | -1/+39 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Fix incorrect reference to StringIO | Richard van der Hoff | 2018-05-02 | 2 | -1/+39 | |
| | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | missing word :| | Matthew Hodgson | 2018-05-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Merge branch 'release-v0.28.1' into develop | Matthew Hodgson | 2018-05-01 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fix markdown | Matthew Hodgson | 2018-05-01 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-05-01 | 2 | -2/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | fix conflict in changelog from previous release | Neil Johnson | 2018-05-01 | 6 | -7/+68 | |
| | |\| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | changelog for 0.28.1 v0.28.1 | Matthew Hodgson | 2018-05-01 | 1 | -2/+23 | |
| | | * | | | | | | | | | | | Update __init__.py | Neil Johnson | 2018-05-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Merge branch 'release-v0.28.1' into develop | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge commit '33f469b' into release-v0.28.1 | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 3 | -4/+26 | |
| | * | | | | | | | | | | | | Miscellaneous fixes to python_dependencies | Richard van der Hoff | 2018-05-01 | 1 | -1/+19 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157) | Will Hunt | 2018-04-30 | 2 | -8/+8 | |
| * | | | | | | | | | | | | Merge pull request #3160 from krombel/fix_3076 | Richard van der Hoff | 2018-04-30 | 1 | -1/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | add guard for None on purge_history api | Krombel | 2018-04-30 | 1 | -1/+14 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge pull request #3129 from matrix-org/matthew/fix_group_dups | Matthew Hodgson | 2018-04-30 | 1 | -0/+57 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | fix missing import | Matthew Hodgson | 2018-04-28 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | pep8 | Matthew Hodgson | 2018-04-28 | 1 | -3/+5 | |
| | * | | | | | | | | | | | | make it work with sqlite | Matthew Hodgson | 2018-04-28 | 2 | -34/+54 | |
| | * | | | | | | | | | | | | remove duplicates from groups tables | Matthew Hodgson | 2018-04-25 | 1 | -0/+34 | |
| | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Remove redundant call to preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 | |
| * | | | | | | | | | | | | | Merge pull request #3144 from matrix-org/rav/run_in_background_exception_hand... | Richard van der Hoff | 2018-04-30 | 1 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Trap exceptions thrown within run_in_background | Richard van der Hoff | 2018-04-27 | 1 | -1/+7 | |
| * | | | | | | | | | | | | | | Merge pull request #3159 from NotAFile/py3-tests-config | Richard van der Hoff | 2018-04-30 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | run config tests on py3 | Adrian Tschira | 2018-04-30 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge pull request #3102 from NotAFile/py3-attributeerror | Richard van der Hoff | 2018-04-30 | 1 | -3/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | add comment explaining attributeerror | Adrian Tschira | 2018-04-30 | 1 | -0/+3 | |
| | * | | | | | | | | | | | | | | Make event properties raise AttributeError instead | Adrian Tschira | 2018-04-15 | 1 | -3/+12 | |
| * | | | | | | | | | | | | | | | Merge pull request #3152 from NotAFile/py3-local-imports | Richard van der Hoff | 2018-04-30 | 4 | -7/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | make imports local | Adrian Tschira | 2018-04-28 | 4 | -7/+7 | |
| * | | | | | | | | | | | | | | | | Merge pull request #3153 from NotAFile/py3-httplib | Richard van der Hoff | 2018-04-30 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | move httplib import to six | Adrian Tschira | 2018-04-28 | 1 | -3/+3 | |
| | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3151 from NotAFile/py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 9 | -11/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 42 | -121/+161 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Move more xrange to six | Adrian Tschira | 2018-04-28 | 9 | -11/+28 | |
| | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'rav/test_36' into develop | Richard van der Hoff | 2018-04-30 | 1 | -5/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | add py36 to build matrix | Richard van der Hoff | 2018-04-30 | 1 | -5/+13 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #3150 from NotAFile/py3-listcomp-yield | Richard van der Hoff | 2018-04-30 | 1 | -5/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Don't yield in list comprehensions | Adrian Tschira | 2018-04-28 | 1 | -5/+9 | |
| | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3085 from NotAFile/py3-config-text-mode | Richard van der Hoff | 2018-04-30 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | open log_config in text mode too | Adrian Tschira | 2018-04-28 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | Open config file in non-bytes mode | Adrian Tschira | 2018-04-10 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #3084 from NotAFile/py3-certs-byte-mode | Richard van der Hoff | 2018-04-30 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Open certificate files as bytes | Adrian Tschira | 2018-04-10 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #3154 from NotAFile/py3-stringio | Richard van der Hoff | 2018-04-30 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | replace stringIO imports | Adrian Tschira | 2018-04-28 | 2 | -3/+3 | |
| | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3145 from NotAFile/py3-tests | Richard van der Hoff | 2018-04-30 | 1 | -1/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Update tox.ini | Richard van der Hoff | 2018-04-30 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | Add py3 tests to tox with folders that work | Adrian Tschira | 2018-04-27 | 1 | -1/+9 | |
| | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3155 from NotAFile/py3-bytes-1 | Richard van der Hoff | 2018-04-30 | 4 | -7/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | more bytes strings | Adrian Tschira | 2018-04-29 | 4 | -7/+10 | |
| | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3140 from matrix-org/rav/use_run_in_background | Richard van der Hoff | 2018-04-30 | 22 | -72/+98 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | pep8; remove spurious import | Richard van der Hoff | 2018-04-27 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 28 | -261/+416 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 22 | -71/+97 | |
| | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3156 from NotAFile/py3-hmac-bytes | Richard van der Hoff | 2018-04-30 | 2 | -11/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Construct HMAC as bytes on py3 | Adrian Tschira | 2018-04-29 | 2 | -11/+15 | |
| | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 8 | -21/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 8 | -21/+20 | |
| | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3127 from matrix-org/rav/deferred_timeout | Richard van der Hoff | 2018-04-27 | 7 | -130/+135 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/deferred_timeout | Richard van der Hoff | 2018-04-27 | 28 | -261/+416 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-04-27 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-27 | 1 | -1/+1 | |
| | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #3142 from matrix-org/rav/reraise | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | reraise exceptions more carefully | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 | |
| | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Merge pull request #3136 from matrix-org/rav/fix_dependencies | Richard van der Hoff | 2018-04-27 | 2 | -2/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | also upgrade pip when installing | Richard van der Hoff | 2018-04-27 | 1 | -0/+4 | |
| | * | | | | | | | | | | | | | | | jenkins build: make sure we have a recent setuptools | Richard van der Hoff | 2018-04-26 | 1 | -1/+12 | |
| | * | | | | | | | | | | | | | | | Miscellaneous fixes to python_dependencies | Richard van der Hoff | 2018-04-26 | 1 | -1/+19 | |
| * | | | | | | | | | | | | | | | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions | Richard van der Hoff | 2018-04-27 | 20 | -237/+335 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 20 | -237/+335 | |
| | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3139 from matrix-org/rav/consume_errors | Richard van der Hoff | 2018-04-27 | 3 | -5/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add missing consumeErrors | Richard van der Hoff | 2018-04-27 | 3 | -5/+9 | |
| | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge tag 'v0.28.0' | Neil Johnson | 2018-04-27 | 4 | -7/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | update changelog and bump version to 0.28.0 v0.28.0 release-v0.28.0-rc1 | Neil Johnson | 2018-04-26 | 2 | -1/+10 | |
| | * | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into release-... | Neil Johnson | 2018-04-26 | 2 | -4/+4 | |
| | |\| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-24 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-24 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | Merge branch 'develop' into rav/deferred_timeout | Richard van der Hoff | 2018-04-27 | 11 | -21/+148 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api | Erik Johnston | 2018-04-26 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Fix media admin APIs | Erik Johnston | 2018-04-26 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Merge pull request #3130 from matrix-org/erikj/fix_quarantine_room | Erik Johnston | 2018-04-25 | 2 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Also fix reindexing of search | Erik Johnston | 2018-04-25 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | Fix quarantine media admin API | Erik Johnston | 2018-04-25 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-04-24 | 2 | -3/+44 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Bump version and update changelog v0.28.0-rc1 | Neil Johnson | 2018-04-24 | 2 | -3/+44 | |
| | * | | | | | | | | | | | | Revert "Bump version and update changelog" | Neil Johnson | 2018-04-24 | 2 | -41/+3 | |
| | * | | | | | | | | | | | | Bump version and update changelog | Neil Johnson | 2018-04-24 | 2 | -3/+41 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge pull request #3118 from matrix-org/rav/reject_prev_events | Richard van der Hoff | 2018-04-23 | 2 | -9/+94 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Remove spurious param | Richard van der Hoff | 2018-04-23 | 1 | -1/+0 | |
| | * | | | | | | | | | | | | accept stupid events over backfill | Richard van der Hoff | 2018-04-20 | 1 | -4/+9 | |
| | * | | | | | | | | | | | | Add some comments | Richard van der Hoff | 2018-04-18 | 2 | -5/+35 | |
| | * | | | | | | | | | | | | Check events on backfill too | Richard van der Hoff | 2018-04-18 | 1 | -15/+42 | |
| | * | | | | | | | | | | | | Reject events which have too many auth_events or prev_events | Richard van der Hoff | 2018-04-18 | 1 | -4/+28 | |
| * | | | | | | | | | | | | | Merge pull request #3109 from NotAFile/py3-tests-fix | Richard van der Hoff | 2018-04-23 | 5 | -5/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Make tests py3 compatible | Adrian Tschira | 2018-04-16 | 5 | -5/+6 | |
| | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| | | | * | | | | | | | | | Backport deferred.addTimeout | Richard van der Hoff | 2018-04-27 | 5 | -14/+90 | |
| | | | * | | | | | | | | | Use deferred.addTimeout instead of time_bound_deferred | Richard van der Hoff | 2018-04-23 | 6 | -130/+59 | |
| | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #3106 from NotAFile/py3-six-itervalues-1 | Richard van der Hoff | 2018-04-20 | 4 | -11/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Use six.itervalues in some places | Adrian Tschira | 2018-04-15 | 4 | -11/+18 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #3107 from NotAFile/py3-bool-nonzero | Richard van der Hoff | 2018-04-20 | 3 | -0/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | add __bool__ alias to __nonzero__ methods | Adrian Tschira | 2018-04-15 | 3 | -0/+9 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #3104 from NotAFile/py3-unittest-config | Richard van der Hoff | 2018-04-20 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Add some more variables to the unittest config | Adrian Tschira | 2018-04-15 | 1 | -0/+4 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #3110 from NotAFile/py3-six-queue | Richard van der Hoff | 2018-04-20 | 2 | -4/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Replace Queue with six.moves.queue | Adrian Tschira | 2018-04-16 | 2 | -4/+6 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #3103 from NotAFile/py3-baseexcepton-message | Richard van der Hoff | 2018-04-20 | 2 | -10/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Use str(e) instead of e.message | Adrian Tschira | 2018-04-15 | 2 | -10/+10 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #3100 from silkeh/readme-srv-cname | Erik Johnston | 2018-04-20 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Clarify that SRV may not point to a CNAME | Silke | 2018-04-14 | 1 | -0/+3 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #3125 from matrix-org/erikj/add_contrib_docs | Erik Johnston | 2018-04-20 | 2 | -0/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Document contrib directory | Erik Johnston | 2018-04-20 | 2 | -0/+14 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #3093 from matrix-org/rav/response_cache_wrap | Richard van der Hoff | 2018-04-20 | 6 | -79/+111 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Reinstate linearizer for federation_server.on_context_state_request | Richard van der Hoff | 2018-04-20 | 1 | -5/+11 | |
| | * | | | | | | | | | | | ResponseCache: fix handling of completed results | Richard van der Hoff | 2018-04-13 | 1 | -13/+19 | |
| | * | | | | | | | | | | | Refactor ResponseCache usage | Richard van der Hoff | 2018-04-12 | 6 | -67/+87 | |
| * | | | | | | | | | | | | Merge pull request #3117 from matrix-org/rav/refactor_have_events | Richard van der Hoff | 2018-04-20 | 3 | -27/+55 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Refactor store.have_events | Richard van der Hoff | 2018-04-20 | 3 | -27/+55 | |
| | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #3113 from matrix-org/rav/fix_huge_prev_events | Richard van der Hoff | 2018-04-18 | 4 | -54/+162 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 4 | -54/+162 | |
| |/ / / / / / / / / / / | ||||||
| * | / / / / / / / / / | fix spurious changelog dup | Matthew Hodgson | 2018-04-15 | 1 | -1/+0 | |
| | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' of https://github.com/matrix-org/synapse into develop | Neil Johnson | 2018-04-13 | 3 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse | Neil Johnson | 2018-04-13 | 3 | -2/+10 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Bump version and Change log v0.27.4 release-v0.27.0 | Neil Johnson | 2018-04-13 | 2 | -1/+9 | |
| | | * | | | | | | | | | Merge pull request #3095 from matrix-org/rav/bump_canonical_json | Neil Johnson | 2018-04-13 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | Bump canonicaljson to 1.1.3 | Richard van der Hoff | 2018-04-13 | 1 | -1/+1 | |
| | | | * | | | | | | | | | Update canonicaljson dependency | Richard van der Hoff | 2018-04-12 | 1 | -1/+1 | |
| | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #3099 from matrix-org/matthew/fix-federation-domain-whitelist | Matthew Hodgson | 2018-04-13 | 1 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | fix federation_domain_whitelist | Matthew Hodgson | 2018-04-13 | 1 | -6/+6 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | revert last to PR properly | Matthew Hodgson | 2018-04-13 | 1 | -6/+6 | |
| * | | | | | | | | | | | correctly auth inbound federation_domain_whitelist reqs | Matthew Hodgson | 2018-04-13 | 1 | -6/+6 | |
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/matrix-org/synapse into develop | Neil Johnson | 2018-04-13 | 3 | -3/+11 | |
| |\| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3 | Neil Johnson | 2018-04-11 | 51 | -278/+956 | |
| | |\| | | | | | | | | | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| | | * | | | | | | | | bump version/changelog | Neil Johnson | 2018-04-11 | 2 | -1/+9 | |
| | | * | | | | | | | | Merge commit '11d2609da70af797405241cdf7d9df19db5628f2' of https://github.com... | Neil Johnson | 2018-04-11 | 1 | -48/+80 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Update README.rst | Neil Johnson | 2018-03-28 | 1 | -2/+2 | |
| * | | | | | | | | | | | Revert "Use sortedcontainers instead of blist" | Richard van der Hoff | 2018-04-13 | 3 | -10/+10 | |
| | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #3092 from matrix-org/rav/response_cache_metrics | Richard van der Hoff | 2018-04-12 | 6 | -7/+21 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Add metrics for ResponseCache | Richard van der Hoff | 2018-04-10 | 6 | -7/+21 | |
| * | | | | | | | | | | | Merge pull request #3090 from matrix-org/erikj/processed_event_lag | Erik Johnston | 2018-04-12 | 7 | -5/+121 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Format docstring | Erik Johnston | 2018-04-12 | 1 | -2/+3 | |
| | * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/processed_... | Erik Johnston | 2018-04-12 | 2 | -2/+51 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #3059 from matrix-org/rav/doc_response_cache | Richard van der Hoff | 2018-04-12 | 1 | -0/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Document the behaviour of ResponseCache | Richard van der Hoff | 2018-04-04 | 1 | -0/+32 | |
| * | | | | | | | | | | | | | Merge pull request #3088 from matrix-org/erikj/as_parallel | Erik Johnston | 2018-04-12 | 1 | -2/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Send events to ASes concurrently | Erik Johnston | 2018-04-11 | 1 | -2/+19 | |
| | | | * | | | | | | | | | | | Doc we raise on unknown event | Erik Johnston | 2018-04-12 | 1 | -2/+3 | |
| | | | * | | | | | | | | | | | s/list/tuple | Erik Johnston | 2018-04-12 | 1 | -2/+2 | |
| | | | * | | | | | | | | | | | Set all metrics at the same time | Erik Johnston | 2018-04-12 | 2 | -10/+10 | |
| | | | * | | | | | | | | | | | Fix tests | Erik Johnston | 2018-04-11 | 1 | -0/+1 | |
| | | | * | | | | | | | | | | | Track last processed event received_ts | Erik Johnston | 2018-04-11 | 4 | -0/+52 | |
| | | | * | | | | | | | | | | | Track where event stream processing have gotten up to | Erik Johnston | 2018-04-11 | 4 | -0/+24 | |
| | | | * | | | | | | | | | | | Add GaugeMetric | Erik Johnston | 2018-04-11 | 2 | -1/+38 | |
| | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #2760 from Valodim/pypy | Richard van der Hoff | 2018-04-11 | 7 | -13/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Don't disable GC when running on PyPy | Vincent Breitmoser | 2018-04-10 | 1 | -1/+7 | |
| | * | | | | | | | | | | | | | In DomainSpecificString, override __repr__ in addition to __str__ | Vincent Breitmoser | 2018-04-10 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | Fix pep8 error on psycopg2cffi hack | Richard van der Hoff | 2018-04-10 | 1 | -6/+5 | |
| | * | | | | | | | | | | | | | Use psycopg2cffi module instead of psycopg2 if running on pypy | Vincent Breitmoser | 2018-04-10 | 2 | -2/+8 | |
| | * | | | | | | | | | | | | | Use sortedcontainers instead of blist | Vincent Breitmoser | 2018-04-10 | 3 | -10/+10 | |
| * | | | | | | | | | | | | | | Merge pull request #3086 from matrix-org/r30_stats | Matthew Hodgson | 2018-04-10 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | fix typo | Neil Johnson | 2018-04-10 | 1 | -2/+2 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 2 | -55/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Note why we're limiting concurrent event sends | Erik Johnston | 2018-04-10 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | | | Limit concurrent event sends for a room | Erik Johnston | 2018-04-09 | 1 | -49/+50 | |
| | * | | | | | | | | | | | | | | Use create_and_send_nonmember_event everywhere | Erik Johnston | 2018-04-09 | 1 | -6/+1 | |
| * | | | | | | | | | | | | | | | Merge pull request #3078 from matrix-org/erikj/federation_sender | Erik Johnston | 2018-04-10 | 1 | -15/+41 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Use run_in_background instead | Erik Johnston | 2018-04-10 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | Preserve log contexts correctly | Erik Johnston | 2018-04-10 | 1 | -1/+4 | |
| | * | | | | | | | | | | | | | | Log event ID on exception | Erik Johnston | 2018-04-10 | 1 | -1/+4 | |
| | * | | | | | | | | | | | | | | Handle all events in a room correctly | Erik Johnston | 2018-04-09 | 1 | -1/+2 | |
| | * | | | | | | | | | | | | | | Send federation events concurrently | Erik Johnston | 2018-04-09 | 1 | -4/+18 | |
| | * | | | | | | | | | | | | | | Handle exceptions in get_hosts_for_room when sending events over federation | Erik Johnston | 2018-04-09 | 1 | -11/+16 | |
| | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ... | Neil Johnson | 2018-04-10 | 3 | -7/+62 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | remove errant print v0.27.3-rc2 | Neil Johnson | 2018-04-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | Fix msec to sec, again | Neil Johnson | 2018-04-09 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | Fix msec to sec | Neil Johnson | 2018-04-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | v0.27.3-rc2 | Neil Johnson | 2018-04-09 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | Fix psycopg2 interpolation | Neil Johnson | 2018-04-09 | 1 | -5/+5 | |
| | * | | | | | | | | | | | | version bump v0.27.3-rc2 | Neil Johnson | 2018-04-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into release-... | Neil Johnson | 2018-04-09 | 35 | -186/+728 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ... | Neil Johnson | 2018-04-09 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ... | Neil Johnson | 2018-04-09 | 1 | -4/+8 | |
| | |\| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-09 | 1 | -1/+2 | |
| | | * | | | | | | | | | | | | | Update CHANGES.rst | Neil Johnson | 2018-04-09 | 1 | -3/+6 | |
| | * | | | | | | | | | | | | | | bump version to release candidate | Neil Johnson | 2018-04-09 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | bump version v0.27.3-rc1 | Neil Johnson | 2018-04-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | Merge branch 'develop' into release-v0.27.0 | Neil Johnson | 2018-04-09 | 20 | -47/+88 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | 0.27.3 | Neil Johnson | 2018-04-09 | 1 | -0/+46 | |
| * | | | | | | | | | | | | | | | Merge pull request #3082 from matrix-org/erikj/urlencode_paths | Erik Johnston | 2018-04-10 | 1 | -48/+80 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | / / / / / / | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Ensure slashes are escaped | Erik Johnston | 2018-04-10 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | URL quote path segments over federation | Erik Johnston | 2018-04-10 | 1 | -48/+80 | |
| | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 3 | -34/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 53 | -111/+264 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 3 | -34/+35 | |
| * | | | | | | | | | | | | | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 6 | -14/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 6 | -14/+14 | |
| * | | | | | | | | | | | | | | | Merge pull request #3073 from NotAFile/use-six-reraise | Richard van der Hoff | 2018-04-09 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Replace old-style raise with six.reraise | Adrian Tschira | 2018-04-06 | 1 | -1/+3 | |
| | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #2938 from dklug/develop | Richard van der Hoff | 2018-04-09 | 1 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Return 401 for invalid access_token on logout | dklug | 2018-03-02 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | | | | Merge pull request #3074 from NotAFile/fix-py3-prints | Richard van der Hoff | 2018-04-09 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | use python3-compatible prints | Adrian Tschira | 2018-04-06 | 1 | -5/+5 | |
| | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3075 from NotAFile/six-type-checks | Richard van der Hoff | 2018-04-09 | 5 | -8/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Replace some type checks with six type checks | Adrian Tschira | 2018-04-07 | 5 | -8/+18 | |
| | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3016 from silkeh/improve-service-lookups | Richard van der Hoff | 2018-04-09 | 2 | -122/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Remove address resolution of hosts in SRV records | Silke | 2018-04-04 | 2 | -122/+10 | |
| * | | | | | | | | | | | | | | | | | Merge pull request #3069 from krombel/update_prometheus_config | Richard van der Hoff | 2018-04-09 | 3 | -19/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | make prometheus config compliant to v0.28 | Krombel | 2018-04-05 | 3 | -19/+19 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoin | Richard van der Hoff | 2018-04-09 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Return a 404 rather than a 500 on rejoining empty rooms | Richard van der Hoff | 2018-04-09 | 1 | -0/+8 | |
| * | | | | | | | | | | | | | | | | | | Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics" | Richard van der Hoff | 2018-04-09 | 5 | -28/+52 | |
| | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3046 from matrix-org/dbkr/join_group | Luke Barnard | 2018-04-06 | 5 | -25/+133 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | de-lint, quote consistency | Luke Barnard | 2018-04-06 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | Explicitly grab individual columns from group object | Luke Barnard | 2018-04-06 | 1 | -6/+8 | |
| | * | | | | | | | | | | | | | | | | | When exposing group state, return is_openly_joinable | Luke Barnard | 2018-04-06 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | | | | | | By default, join policy is "invite" | Luke Barnard | 2018-04-06 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | add_user -> _add_user | Luke Barnard | 2018-04-06 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | | | | | pep8 | Luke Barnard | 2018-04-06 | 2 | -2/+4 | |
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |