Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias | Richard van der Hoff | 2018-09-18 | 3 | -4/+17 |
|\ | |||||
| * | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
| * | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 2 | -4/+16 |
* | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metrics | Richard van der Hoff | 2018-09-18 | 3 | -12/+13 |
|\ \ | |||||
| * | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | Fix more b'abcd' noise in metrics | Richard van der Hoff | 2018-09-17 | 2 | -12/+12 |
* | | | Merge pull request #3897 from aaronraimist/synaspse-typo | Richard van der Hoff | 2018-09-18 | 2 | -1/+2 |
|\ \ \ | |||||
| * | | | Add changelog | Aaron Raimist | 2018-09-17 | 1 | -0/+1 |
| * | | | Fix typo in README, synaspse -> synapse | Aaron Raimist | 2018-09-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logs | Richard van der Hoff | 2018-09-17 | 3 | -5/+9 |
|\| | | |||||
| * | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | Fix some b'abcd' noise in logs and metrics | Richard van der Hoff | 2018-09-17 | 2 | -5/+8 |
|/ / | |||||
* / | README: run python_dependencies with -m | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3888 from matrix-org/rav/nuke_nuke_rooms | Amber Brown | 2018-09-17 | 2 | -57/+1 |
|\ | |||||
| * | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | Remove nuke-room-from-db.sh script | Richard van der Hoff | 2018-09-17 | 1 | -57/+0 |
|/ | |||||
* | missing changelog | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
* | mention libjemalloc in readme (#3877) | Vincent Breitmoser | 2018-09-15 | 1 | -0/+8 |
* | Fix timeout function | Erik Johnston | 2018-09-15 | 1 | -1/+2 |
* | Merge pull request #3875 from matrix-org/erikj/extra_timeouts | Erik Johnston | 2018-09-14 | 3 | -0/+63 |
|\ | |||||
| * | Newsfile | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| * | Add an awful secondary timeout to fix wedged requests | Erik Johnston | 2018-09-14 | 2 | -0/+62 |
|/ | |||||
* | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 2 | -8/+1 |
* | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2 | Erik Johnston | 2018-09-14 | 5 | -7/+13 |
|\ | |||||
| * | fix | Amber Brown | 2018-09-15 | 1 | -3/+3 |
| * | changelog | Amber Brown | 2018-09-15 | 1 | -0/+1 |
| * | fix | Amber Brown | 2018-09-14 | 1 | -1/+4 |
| * | fix | Amber Brown | 2018-09-14 | 1 | -1/+1 |
| * | redact better | Amber Brown | 2018-09-14 | 1 | -2/+2 |
| * | we do that higher up | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| * | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2 | Amber Brown | 2018-09-14 | 8 | -61/+55 |
| |\ | |||||
| * | | buffer? | Amber Brown | 2018-09-14 | 1 | -1/+2 |
* | | | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metrics | Erik Johnston | 2018-09-14 | 5 | -4/+217 |
|\ \ \ | |||||
| * | | | Remove spurious comment | Erik Johnston | 2018-09-14 | 1 | -2/+0 |
| * | | | Measure outbound requests | Erik Johnston | 2018-09-14 | 1 | -3/+6 |
| * | | | Newsfile | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| * | | | Tests | Erik Johnston | 2018-09-14 | 1 | -0/+81 |
| * | | | Add in flight real time metrics for Measure blocks | Erik Johnston | 2018-09-14 | 2 | -1/+131 |
|/ / / | |||||
* | | | Merge pull request #3860 from matrix-org/travis/typo-1 | Travis Ralston | 2018-09-13 | 2 | -1/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Create 3860.misc | Travis Ralston | 2018-09-13 | 1 | -0/+1 |
| * | | Fix minor typo in exception | Travis Ralston | 2018-09-13 | 1 | -1/+1 |
|/ / | |||||
* / | merge (#3576) | Amber Brown | 2018-09-14 | 8 | -61/+55 |
|/ | |||||
* | Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8 | Erik Johnston | 2018-09-13 | 2 | -16/+29 |
|\ | |||||
| * | comment | Erik Johnston | 2018-09-13 | 1 | -0/+2 |
| * | pep8 | Erik Johnston | 2018-09-13 | 1 | -1/+0 |
| * | Create indices after insertion | Erik Johnston | 2018-09-13 | 1 | -14/+18 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_p... | Erik Johnston | 2018-09-13 | 4 | -2/+28 |
| |\ | |||||
| * | | Newsfile | Erik Johnston | 2018-09-13 | 1 | -0/+1 |
| * | | Make purge history slightly faster | Erik Johnston | 2018-09-13 | 1 | -2/+9 |
* | | | Merge pull request #3859 from matrix-org/erikj/add_iterkeys | Amber Brown | 2018-09-14 | 3 | -1/+7 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2018-09-13 | 1 | -0/+1 |
| * | | | Fix handling of redacted events from federation | Erik Johnston | 2018-09-13 | 2 | -1/+6 |
* | | | | fix circleci merged builds (#3858) | Amber Brown | 2018-09-14 | 2 | -0/+5 |
|/ / / | |||||
* | / | Attempt to figure out what's going on with timeouts (#3857) | Amber Brown | 2018-09-14 | 4 | -57/+241 |
| |/ |/| | |||||
* | | Remove some superfluous logging (#3855) | Amber Brown | 2018-09-13 | 4 | -2/+28 |
|/ | |||||
* | Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7 | Neil Johnson | 2018-09-12 | 4 | -3/+60 |
|\ | |||||
| * | improve naming | Neil Johnson | 2018-09-12 | 4 | -10/+14 |
| * | towncrier | Neil Johnson | 2018-09-12 | 1 | -0/+1 |
| * | expose number of real reserved users | Neil Johnson | 2018-09-12 | 3 | -3/+55 |
* | | show heroes if a room has a 'deleted' name/canonical_alias (#3851) | Matthew Hodgson | 2018-09-12 | 2 | -2/+16 |
* | | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time | Erik Johnston | 2018-09-12 | 2 | -75/+75 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| * | | Log outbound requests when we retry | Erik Johnston | 2018-09-12 | 1 | -75/+74 |
* | | | argh pep8 | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | correctly log gappy sync metrics | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | fix logline | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | Merge pull request #3841 from matrix-org/erikj/manhole_key_length | Erik Johnston | 2018-09-12 | 2 | -13/+32 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2018-09-11 | 1 | -0/+1 |
| * | | | Change the manhole SSH key to have more bits | Erik Johnston | 2018-09-11 | 1 | -13/+31 |
* | | | | Add JUnit summaries to CircleCI as well as merged runs (#3704) | Amber Brown | 2018-09-12 | 3 | -0/+94 |
* | | | | Port federation/ to py3 (#3847) | Amber Brown | 2018-09-12 | 4 | -19/+19 |
* | | | | Merge pull request #3835 from krombel/fix_3821 | Amber Brown | 2018-09-12 | 2 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | add changelog | Krombel | 2018-09-10 | 1 | -0/+1 |
| * | | | | fix VOIP crashes under Python 3 (#3821) | Krombel | 2018-09-10 | 1 | -1/+5 |
* | | | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyring | Amber Brown | 2018-09-12 | 4 | -13/+47 |
|\ \ \ \ \ | |||||
| * | | | | | changelog | Richard van der Hoff | 2018-09-07 | 1 | -0/+1 |
| * | | | | | clearer logging when things fail, too | Richard van der Hoff | 2018-09-06 | 2 | -7/+28 |
| * | | | | | add some logging for the keyring queue | Richard van der Hoff | 2018-09-06 | 1 | -6/+18 |
* | | | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_import | Amber Brown | 2018-09-12 | 3 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | changelog | Richard van der Hoff | 2018-09-07 | 1 | -0/+1 |
| * | | | | | | Fix jwt import check | Richard van der Hoff | 2018-09-07 | 2 | -1/+1 |
* | | | | | | | Port rest/ to Python 3 (#3823) | Amber Brown | 2018-09-12 | 18 | -100/+113 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Port crypto/ to Python 3 (#3822) | Amber Brown | 2018-09-12 | 4 | -6/+14 |
* | | | | | | Merge pull request #3845 from matrix-org/erikj/timeout_reads | Amber Brown | 2018-09-12 | 2 | -7/+46 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| * | | | | | Timeout reading body for outbound HTTP requests | Erik Johnston | 2018-09-12 | 1 | -7/+45 |
|/ / / / / | |||||
* | | | / | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 5 | -30/+159 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #3834 from mvgorcum/develop | Erik Johnston | 2018-09-10 | 2 | -10/+17 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | add runtime dependencies | Jan Christian Grünhage | 2018-09-10 | 1 | -5/+10 |
| * | | | Newsfile | Mathijs van Gorcum | 2018-09-10 | 1 | -0/+1 |
| * | | | Move COPY before RUN and merge RUNs | Mathijs van Gorcum | 2018-09-10 | 1 | -5/+5 |
| * | | | Remove build requirements after building | Mathijs van Gorcum | 2018-09-10 | 1 | -2/+3 |
|/ / / | |||||
* | | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join | Amber Brown | 2018-09-07 | 2 | -0/+14 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| * | | | Don't send empty tags list down sync | Erik Johnston | 2018-09-06 | 1 | -0/+5 |
| * | | | Send existing room tags down sync on join | Erik Johnston | 2018-09-06 | 1 | -0/+8 |
* | | | | Merge pull request #3783 from cwmke/develop | Richard van der Hoff | 2018-09-07 | 1 | -0/+12 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Remove end '/'s | Colin W | 2018-09-02 | 1 | -2/+2 |
| * | | | Update readme on develop branch | Colin W | 2018-09-02 | 1 | -0/+12 |
* | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-07 | 29 | -28/+61 |
|\ \ \ \ | |||||
| * | | | | changelog v0.33.4 github/release-v0.33.4 release-v0.33.4 | Amber Brown | 2018-09-07 | 2 | -1/+9 |
| * | | | | version | Amber Brown | 2018-09-07 | 1 | -1/+1 |
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into release-v0.33.4 v0.33.4rc2 | Erik Johnston | 2018-09-06 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| * | | | | | Bump version and changelog | Erik Johnston | 2018-09-06 | 2 | -1/+7 |
| * | | | | | Merge tag 'v0.33.3.1' into release-v0.33.4 | Erik Johnston | 2018-09-06 | 7 | -46/+158 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #3802 from matrix-org/jcgruenhage/docker-unignore-synctl | Amber Brown | 2018-09-06 | 2 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Create 3802.misc | Jan Christian Grünhage | 2018-09-06 | 1 | -0/+1 |
| | * | | | | | | remove synctl from .dockerignore | Jan Christian Grünhage | 2018-09-06 | 1 | -1/+0 |
| |/ / / / / / | |||||
| * | | | | | | version and towncrier v0.33.4rc1 | Amber Brown | 2018-09-04 | 29 | -28/+45 |
* | | | | | | | Port tests/ to Python 3 (#3808) | Amber Brown | 2018-09-07 | 12 | -430/+349 |
* | | | | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 5 | -6/+54 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | ensure guests never enter mau list | Neil Johnson | 2018-09-06 | 4 | -8/+10 |
| * | | | | | | towncrier | Neil Johnson | 2018-09-05 | 1 | -0/+1 |
| * | | | | | | guest users should not be part of mau total | Neil Johnson | 2018-09-05 | 2 | -3/+48 |
* | | | | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus | Amber Brown | 2018-09-07 | 2 | -0/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Spelling | Erik Johnston | 2018-09-06 | 1 | -1/+1 |
| * | | | | | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| * | | | | | | | Limit the number of PDUs/EDUs per fedreation transaction | Erik Johnston | 2018-09-06 | 1 | -0/+12 |
* | | | | | | | | Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis | Amber Brown | 2018-09-07 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| * | | | | | | | | Only start postgres instance for postgres tests on Travis CI | Erik Johnston | 2018-09-06 | 1 | -3/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_id | Amber Brown | 2018-09-07 | 2 | -12/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove conn_id | Erik Johnston | 2018-09-04 | 1 | -2/+2 |
| * | | | | | | | | Newsfile | Erik Johnston | 2018-09-03 | 1 | -0/+1 |
| * | | | | | | | | Remove conn_id from repl prometheus metrics | Erik Johnston | 2018-09-03 | 1 | -10/+10 |
* | | | | | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 2 | -8/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2018-09-05 | 1 | -0/+1 |
| * | | | | | | | | | User iter* during sync state calculations | Erik Johnston | 2018-09-05 | 1 | -8/+8 |
* | | | | | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_dep | Amber Brown | 2018-09-07 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-06 | 1 | -0/+1 |
| * | | | | | | | | | bump dep on pyopenssl to 16.x | Richard van der Hoff | 2018-09-06 | 1 | -2/+2 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 8 | -19/+24 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-09-06 | 9 | -47/+157 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge tag 'v0.33.3.1' | Richard van der Hoff | 2018-09-06 | 9 | -47/+157 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | prepare v0.33.3.1 v0.33.3.1 github/release-v0.33.3.1 release-v0.33.3.1 | Richard van der Hoff | 2018-09-06 | 3 | -2/+15 |
| | * | | | | | Create 3802.misc | Jan Christian Grünhage | 2018-09-06 | 1 | -0/+1 |
| | * | | | | | remove synctl from .dockerignore | Jan Christian Grünhage | 2018-09-06 | 1 | -1/+0 |
| | * | | | | | Fix origin handling for pushed transactions | Richard van der Hoff | 2018-09-05 | 5 | -29/+32 |
| | * | | | | | Check that signatures on events are valid | Richard van der Hoff | 2018-09-05 | 1 | -16/+110 |
* | | | | | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter | Richard van der Hoff | 2018-09-05 | 3 | -13/+40 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-04 | 1 | -0/+1 |
| * | | | | | | | Implement 'event_format' filter param in /sync | Richard van der Hoff | 2018-09-04 | 2 | -13/+39 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Port http/ to Python 3 (#3771) | Amber Brown | 2018-09-06 | 8 | -186/+134 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5 | Neil Johnson | 2018-09-04 | 3 | -7/+22 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | towncrier | Neil Johnson | 2018-09-04 | 1 | -0/+1 |
| * | | | | | improve human readable error message | Neil Johnson | 2018-09-04 | 1 | -1/+2 |
| * | | | | | improve human readable error messages | Neil Johnson | 2018-09-04 | 2 | -7/+20 |
* | | | | | | Fix tests on postgresql (#3740) | Amber Brown | 2018-09-04 | 18 | -341/+356 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 4 | -57/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-09-03 | 1 | -0/+1 |
| * | | | | | Remove unnecessary resolve_events_with_state_map | Erik Johnston | 2018-08-22 | 3 | -57/+7 |
* | | | | | | Merge pull request #3378 from NickEckardt/develop | Amber Brown | 2018-09-03 | 2 | -5/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Create 3378.misc | Amber Brown | 2018-09-03 | 1 | -0/+1 |
| * | | | | | Merge branch 'develop' into develop | Amber Brown | 2018-09-03 | 441 | -11570/+24237 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3777 from matrix-org/neilj/fix_register_user_registration | Neil Johnson | 2018-08-31 | 9 | -5/+78 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | assert rather than warn hhs-4 | Neil Johnson | 2018-08-31 | 1 | -3/+2 |
| * | | | | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 6 | -21/+41 |
| * | | | | | fix reference to is_threepid_reserved | Neil Johnson | 2018-08-31 | 1 | -1/+1 |
| * | | | | | typo | Neil Johnson | 2018-08-31 | 1 | -1/+1 |
| * | | | | | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 4 | -6/+24 |
| * | | | | | news fragemnt | Neil Johnson | 2018-08-31 | 1 | -0/+1 |
| * | | | | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 5 | -3/+38 |
|/ / / / / | |||||
* | | | | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 17 | -36/+208 |
* | | | | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init | Richard van der Hoff | 2018-08-30 | 16 | -54/+41 |
|\ \ \ \ \ | |||||
| * | | | | | Fix up tests | Richard van der Hoff | 2018-08-28 | 3 | -6/+10 |
| * | | | | | use abc.abstractproperty | Richard van der Hoff | 2018-08-28 | 1 | -5/+4 |
| * | | | | | changelog | Richard van der Hoff | 2018-08-28 | 1 | -0/+1 |
| * | | | | | Make sure that we close db connections opened during init | Richard van der Hoff | 2018-08-28 | 12 | -48/+31 |
* | | | | | | Merge pull request #3768 from krombel/fix_3445 | Erik Johnston | 2018-08-29 | 2 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | changelog | Krombel | 2018-08-29 | 2 | -1/+1 |
| * | | | | | | fix #3445 | Krombel | 2018-08-29 | 2 | -2/+3 |
|/ / / / / / | |||||
* | | | | | | Update CONTRIBUTING to clarify miscs & Markdown (#3730) | Amber Brown | 2018-08-29 | 2 | -3/+5 |
* | | | | | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 2 | -1/+9 |
|/ / / / / | |||||
* | | | | | Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3 | Erik Johnston | 2018-08-24 | 8 | -13/+14 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact | Erik Johnston | 2018-08-24 | 3 | -4/+5 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_notices | Erik Johnston | 2018-08-24 | 3 | -4/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| * | | | | | | Fix checking if service notice room is already tagged | Erik Johnston | 2018-08-24 | 2 | -4/+4 |
|/ / / / / / | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| * | | | | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 7 | -13/+13 |
|/ / / / / | |||||
* | | | | | Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags hhs-2 | Erik Johnston | 2018-08-24 | 3 | -4/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| * | | | | | Ensure we wake up /sync when we add tag to notice room | Erik Johnston | 2018-08-24 | 2 | -2/+13 |
| * | | | | | Make content of tag an empty object rather than null | Erik Johnston | 2018-08-24 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1 | Erik Johnston | 2018-08-24 | 2 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| * | | | | | Fix bug when federation_domain_whitelist is an emtpy list | Erik Johnston | 2018-08-24 | 1 | -1/+1 |
* | | | | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse | Erik Johnston | 2018-08-24 | 2 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| * | | | | | | Fix bug where we broke sync when using limit_usage_by_mau | Erik Johnston | 2018-08-24 | 1 | -0/+4 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3751 from matrix-org/rav/twisted_17 | Richard van der Hoff | 2018-08-24 | 2 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | changelog | Richard van der Hoff | 2018-08-24 | 1 | -0/+1 |
| * | | | | | Pin to twisted 17.1 or later | Richard van der Hoff | 2018-08-24 | 1 | -1/+1 |
* | | | | | | Merge pull request #3749 from matrix-org/erikj/add_trial_users | Erik Johnston | 2018-08-24 | 8 | -5/+272 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| * | | | | | Unit tests | Erik Johnston | 2018-08-23 | 2 | -3/+227 |
| * | | | | | Implement trail users | Erik Johnston | 2018-08-23 | 5 | -2/+44 |
|/ / / / / | |||||
* | | | | | Merge pull request #3747 from matrix-org/erikj/fix_multiple_sends_notice | Erik Johnston | 2018-08-23 | 3 | -1/+72 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| * | | | | | Fix bug where we resent "limit exceeded" server notices | Erik Johnston | 2018-08-23 | 2 | -1/+71 |
|/ / / / / | |||||
* | | | | | Merge pull request #3734 from matrix-org/travis/worker-docs | Travis Ralston | 2018-08-23 | 2 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Create 3734.misc | Travis Ralston | 2018-08-21 | 1 | -0/+1 |
| * | | | | | Reference that the federation_reader needs the HTTP replication port set | Travis Ralston | 2018-08-21 | 1 | -1/+1 |
* | | | | | | Merge pull request #3746 from matrix-org/erikj/mau_fixups | Erik Johnston | 2018-08-23 | 3 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| * | | | | | | Actually run the tests | Erik Johnston | 2018-08-23 | 1 | -0/+0 |
| * | | | | | | Add missing yield | Erik Johnston | 2018-08-23 | 1 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3680 from matrix-org/neilj/server_notices_on_blocking | Erik Johnston | 2018-08-22 | 10 | -32/+408 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Erik Johnston | 2018-08-22 | 116 | -764/+1624 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-22 | 3 | -4/+12 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Use recaptcha_ajax.js directly from Google | Richard van der Hoff | 2018-08-22 | 2 | -196/+1 |
| * | | | | | Merge tag 'v0.33.3' | Richard van der Hoff | 2018-08-22 | 200 | -3529/+5653 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | changelog for 0.33.3 v0.33.3 github/release-v0.33.3 release-v0.33.3 | Richard van der Hoff | 2018-08-22 | 2 | -1/+9 |
| | * | | | | bump version to 0.33.3 | Richard van der Hoff | 2018-08-22 | 1 | -1/+1 |
| | * | | | | Update attributions and PR links in changelog | Richard van der Hoff | 2018-08-22 | 1 | -2/+2 |
| * | | | | | Merge pull request #3685 from matrix-org/revert-3677-master | Richard van der Hoff | 2018-08-13 | 3 | -2/+196 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert "Use recaptcha_ajax.js directly from Google" | Richard van der Hoff | 2018-08-13 | 3 | -2/+196 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 3 | -196/+2 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge pull request #3724 from Half-Shot/hs/guest-fetch-event | Erik Johnston | 2018-08-22 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 3724.feature | Will Hunt | 2018-08-20 | 1 | -0/+1 |
| * | | | | | | | Allow guests to access /rooms/:roomId/event/:eventId | Will Hunt | 2018-08-20 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 9 | -44/+78 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Rename WorkerProfileHandler to BaseProfileHandler | Erik Johnston | 2018-08-22 | 2 | -5/+12 |
| * | | | | | | | | Add assert to ensure handler is only run on master | Erik Johnston | 2018-08-22 | 1 | -0/+2 |
| * | | | | | | | | Remove redundant vars | Erik Johnston | 2018-08-22 | 1 | -3/+0 |
| * | | | | | | | | Add some fixmes | Erik Johnston | 2018-08-17 | 2 | -0/+6 |
| * | | | | | | | | Call UserDirectoryHandler methods directly | Erik Johnston | 2018-08-17 | 4 | -104/+8 |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-17 | 244 | -2980/+3681 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 3 | -11/+21 |
| * | | | | | | | | | Remote profile cache should remain in master worker | Erik Johnston | 2018-08-17 | 1 | -4/+2 |
| * | | | | | | | | | Docstrings | Erik Johnston | 2018-08-09 | 1 | -1/+11 |
| * | | | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-09 | 67 | -408/+1156 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update workers.rst with new paths | Erik Johnston | 2018-08-07 | 1 | -0/+1 |
| * | | | | | | | | | | Allow ratelimiting on workers | Erik Johnston | 2018-08-07 | 1 | -29/+29 |
| * | | | | | | | | | | Allow profile changes to happen on workers | Erik Johnston | 2018-08-07 | 5 | -8/+106 |
* | | | | | | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 13 | -277/+437 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2018-08-20 | 208 | -3244/+4271 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Remove redundant room_version checks | Erik Johnston | 2018-08-20 | 2 | -15/+4 |
| * | | | | | | | | | | | | Revert spurious change | Erik Johnston | 2018-08-20 | 1 | -2/+2 |
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| * | | | | | | | | | | | | Fix tests | Erik Johnston | 2018-08-09 | 6 | -5/+46 |
| * | | | | | | | | | | | | Add fast path in state res for zero prev events | Erik Johnston | 2018-08-09 | 1 | -1/+6 |
| * | | | | | | | | | | | | Choose state algorithm based on room version | Erik Johnston | 2018-08-09 | 4 | -16/+105 |
| * | | | | | | | | | | | | Add constants for room versions | Erik Johnston | 2018-08-09 | 1 | -2/+7 |
| * | | | | | | | | | | | | Refactor state module | Erik Johnston | 2018-08-09 | 2 | -296/+325 |
* | | | | | | | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spelling | Richard van der Hoff | 2018-08-22 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Create 3735.misc | Travis Ralston | 2018-08-21 | 1 | -0/+1 |
| * | | | | | | | | | | | | | limt -> limit | Travis Ralston | 2018-07-31 | 1 | -1/+1 |