Commit Graph

10561 Commits (955823672842b2102c4c6e204f81efbcd67200bc)
 

Author SHA1 Message Date
Richard van der Hoff 9558236728
Merge pull request #3127 from matrix-org/rav/deferred_timeout 7 years ago
Richard van der Hoff 6146332387 Merge remote-tracking branch 'origin/develop' into rav/deferred_timeout 7 years ago
Erik Johnston d2737c1fae Merge branch 'master' of github.com:matrix-org/synapse into develop 7 years ago
Richard van der Hoff 3d1ae61399 Merge branch 'develop' into rav/deferred_timeout 7 years ago
Richard van der Hoff 9d2c1b8429 Backport deferred.addTimeout 7 years ago
Richard van der Hoff 41d4b07a53
Merge pull request #3142 from matrix-org/rav/reraise 7 years ago
Neil Johnson 05ba7e3a44
Update CHANGES.rst 7 years ago
Neil Johnson 53849ea9d3
Update CHANGES.rst 7 years ago
Richard van der Hoff 268e40341b
Merge pull request #3136 from matrix-org/rav/fix_dependencies 7 years ago
Richard van der Hoff 9c3da24561
Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions 7 years ago
Richard van der Hoff 53494c34df
Merge pull request #3139 from matrix-org/rav/consume_errors 7 years ago
Richard van der Hoff 6493b22b42 reraise exceptions more carefully 7 years ago
Richard van der Hoff 605defb9e4 Add missing consumeErrors 7 years ago
Richard van der Hoff 9255a6cb17 Improve exception handling for background processes 7 years ago
Neil Johnson d842ed14f4 Merge tag 'v0.28.0' 7 years ago
Richard van der Hoff 31c8be956f also upgrade pip when installing 7 years ago
Neil Johnson 28dd536e80 update changelog and bump version to 0.28.0 7 years ago
Neil Johnson 8721580303 Merge branch 'develop' of https://github.com/matrix-org/synapse into release-v0.28.0-rc1 7 years ago
Richard van der Hoff dbf76fd4b9 jenkins build: make sure we have a recent setuptools 7 years ago
Richard van der Hoff d78ada3166 Miscellaneous fixes to python_dependencies 7 years ago
Erik Johnston 0ced8b5b47
Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api 7 years ago
Erik Johnston 7ec8e798b4 Fix media admin APIs 7 years ago
Erik Johnston a5ad88913c
Merge pull request #3130 from matrix-org/erikj/fix_quarantine_room 7 years ago
Erik Johnston 22881b3d69 Also fix reindexing of search 7 years ago
Erik Johnston ba3166743c Fix quarantine media admin API 7 years ago
Neil Johnson 6ab3b9c743
Update CHANGES.rst 7 years ago
Neil Johnson 1bb83d5d41 Merge branch 'master' into develop 7 years ago
Neil Johnson 13a2beabca
Update CHANGES.rst 7 years ago
Neil Johnson 2c3e995f38 Bump version and update changelog 7 years ago
Neil Johnson 8e8b06715f Revert "Bump version and update changelog" 7 years ago
Neil Johnson 08b29d4574 Bump version and update changelog 7 years ago
Richard van der Hoff 77ebef9d43
Merge pull request #3118 from matrix-org/rav/reject_prev_events 7 years ago
Richard van der Hoff 9b9c38373c Remove spurious param 7 years ago
Richard van der Hoff 286e20f2bc
Merge pull request #3109 from NotAFile/py3-tests-fix 7 years ago
Richard van der Hoff 1ea904b9f0 Use deferred.addTimeout instead of time_bound_deferred 7 years ago
Richard van der Hoff dc875d2712
Merge pull request #3106 from NotAFile/py3-six-itervalues-1 7 years ago
Richard van der Hoff 8dc4a6144b
Merge pull request #3107 from NotAFile/py3-bool-nonzero 7 years ago
Richard van der Hoff d06a9ea5f7
Merge pull request #3104 from NotAFile/py3-unittest-config 7 years ago
Richard van der Hoff c09a6daf09
Merge pull request #3110 from NotAFile/py3-six-queue 7 years ago
Richard van der Hoff 692a3cc806
Merge pull request #3103 from NotAFile/py3-baseexcepton-message 7 years ago
Erik Johnston 366dd893fc
Merge pull request #3100 from silkeh/readme-srv-cname 7 years ago
Erik Johnston bdb7714d13
Merge pull request #3125 from matrix-org/erikj/add_contrib_docs 7 years ago
Erik Johnston 67dabe143d Document contrib directory 7 years ago
Richard van der Hoff 3de7d9fe99 accept stupid events over backfill 7 years ago
Richard van der Hoff 11a67b7c9d
Merge pull request #3093 from matrix-org/rav/response_cache_wrap 7 years ago
Richard van der Hoff 0c280d4d99 Reinstate linearizer for federation_server.on_context_state_request 7 years ago
Richard van der Hoff bc381d5798
Merge pull request #3117 from matrix-org/rav/refactor_have_events 7 years ago
Richard van der Hoff b1dfbc3c40 Refactor store.have_events 7 years ago
Richard van der Hoff dacf3a50ac
Merge pull request #3113 from matrix-org/rav/fix_huge_prev_events 7 years ago
Richard van der Hoff 1f4b498b73 Add some comments 7 years ago