Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
* | Fix the tests | Amber Brown | 2018-08-15 | 7 | -60/+49 |
* | Use a producer to stream back responses | Richard van der Hoff | 2018-08-15 | 1 | -4/+13 |
* | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 9 | -30/+38 |
|\ | |||||
| * | remove changelog referencing another PR | Neil Johnson | 2018-08-15 | 1 | -1/+0 |
| * | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 |
| * | Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap... | Neil Johnson | 2018-08-15 | 4 | -6/+6 |
| |\ | |||||
| | * | update error codes | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| | * | update resource limit error codes | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | * | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 2 | -4/+3 |
| * | | update admin email to uri | Neil Johnson | 2018-08-15 | 2 | -2/+2 |
| |/ | |||||
| * | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 5 | -11/+11 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 18 | -76/+373 |
| |\ | |||||
| * | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| * | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| * | | set admin email via config | Neil Johnson | 2018-08-13 | 1 | -0/+1 |
| * | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 7 | -22/+45 |
* | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name | Neil Johnson | 2018-08-15 | 2 | -3/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro... | Neil Johnson | 2018-08-14 | 8 | -22/+115 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Rename MAU prometheus metric | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| * | | | pep8 | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| * | | | combine mau metrics into one group | Neil Johnson | 2018-08-14 | 1 | -4/+3 |
* | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 6 | -20/+79 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 |
| * | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 6 | -20/+77 |
* | | | | Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... | Neil Johnson | 2018-08-14 | 4 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | fix setup_test_homeserver to be postgres compatible | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| * | | | | Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved... | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| * | | | | adding missing yield | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| * | | | | in case max_mau is less than I think | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 7 | -20/+112 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 |
| * | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 4 | -18/+19 |
| * | | | fix errant parenthesis | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| * | | | fix imports | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| * | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 3 | -12/+48 |
| * | | | Where server is disabled, block ability for locked out users to read new mess... | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
| * | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 2 | -13/+18 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 6 | -1/+22 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 98 | -405/+819 |
| |\ \ \ \ | |||||
| * | | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 2 | -5/+53 |
* | | | | | | Dockerised sytest (#3660) | Amber Brown | 2018-08-14 | 4 | -0/+53 |
* | | | | | | Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgres | Amber Brown | 2018-08-14 | 2 | -16/+29 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po... | Amber Brown | 2018-08-14 | 56 | -292/+404 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 3 | -37/+174 |
* | | | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base | Jan Christian Grünhage | 2018-08-14 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | update docker base-image to alpine 3.8 | Jan Christian Grünhage | 2018-08-09 | 2 | -1/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Name changelog after PR, not bug | Richard van der Hoff | 2018-08-13 | 1 | -0/+0 |
* | | | | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 3 | -196/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use recaptcha_ajax.js directly from Google | Andrej Shadura | 2018-08-10 | 3 | -196/+2 |
* | | | | | | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 7 | -45/+22 |
* | | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 7 | -22/+45 |
* | | | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 49 | -59/+227 |
| | | * | | | | Fixes test_reap_monthly_active_users so it passes under postgres | Neil Johnson | 2018-08-11 | 1 | -0/+1 |
| | | * | | | | fix sqlite/postgres incompatibility in reap_monthly_active_users | Neil Johnson | 2018-08-11 | 1 | -16/+28 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-tests | Amber Brown | 2018-08-11 | 76 | -2280/+1631 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix up a forced long line | Amber Brown | 2018-08-11 | 1 | -1/+2 |
| * | | | | | | changelog | Amber Brown | 2018-08-10 | 1 | -0/+1 |
| * | | | | | | Run black. | black | 2018-08-10 | 75 | -2280/+1629 |
* | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into develop | Richard van der Hoff | 2018-08-10 | 2 | -43/+69 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
| * | | | | | | | Fix linearizer cancellation on twisted < 18.7 | Richard van der Hoff | 2018-08-10 | 1 | -43/+68 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | log *after* reloading log config | Richard van der Hoff | 2018-08-10 | 1 | -2/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 33 | -34/+35 |
* | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 15 | -16/+113 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | more generic conversion of str/bytes to unicode | Jeroen | 2018-08-09 | 1 | -1/+1 |
| * | | | | | include private functions from twisted | Jeroen | 2018-08-09 | 1 | -2/+35 |
| * | | | | | updated docstring for ServerContextFactory | Jeroen | 2018-08-08 | 1 | -1/+1 |
| * | | | | | fix isort | Jeroen | 2018-07-29 | 1 | -2/+3 |
| * | | | | | fix accidental removal of hs | Jeroen | 2018-07-27 | 1 | -1/+1 |
| * | | | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 156 | -5187/+7015 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... | Jeroen | 2018-07-14 | 347 | -1985/+2111 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 88 | -205/+1673 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | take idna implementation from twisted | Jeroen | 2018-06-26 | 1 | -2/+2 |
| * | | | | | | | | towncrier changelog | Jeroen | 2018-06-26 | 1 | -0/+1 |
| * | | | | | | | | allow self-signed certificates | Jeroen | 2018-06-26 | 3 | -35/+36 |
| * | | | | | | | | formatting changes for pep8 | Jeroen | 2018-06-25 | 4 | -5/+8 |
| * | | | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 15 | -13/+71 |
* | | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 6 | -1/+22 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 |
| * | | | | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 14 | -22/+245 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 6 | -7/+115 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| * | | | | | | | | | Ability to disable client/server Synapse via conf toggle | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs | Neil Johnson | 2018-08-08 | 16 | -157/+226 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 5 | -1/+21 |
* | | | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 61 | -56/+75 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | 0.33.2 changelog v0.33.2 github/release-v0.33.2 release-v0.33.2 | Amber Brown | 2018-08-09 | 1 | -0/+6 |
| * | | | | | | | | | | | | | 0.33.2 | Amber Brown | 2018-08-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | fix the changelog & template | Amber Brown | 2018-08-09 | 2 | -50/+50 |
| * | | | | | | | | | | | | | fix changelog | Amber Brown | 2018-08-07 | 1 | -1/+4 |
| * | | | | | | | | | | | | | fix for rc1 v0.33.2rc1 | Amber Brown | 2018-08-07 | 2 | -3/+3 |
| * | | | | | | | | | | | | | changelog | Amber Brown | 2018-08-07 | 59 | -54/+64 |
| * | | | | | | | | | | | | | version | Amber Brown | 2018-08-07 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 6 | -274/+396 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | Rename POST param to METHOD | Erik Johnston | 2018-08-08 | 2 | -13/+22 |
| * | | | | | | | | | | | | | | Fixup logging and docstrings | Erik Johnston | 2018-08-08 | 2 | -2/+40 |
| * | | | | | | | | | | | | | | Fix isort | Erik Johnston | 2018-08-06 | 1 | -4/+1 |
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r... | Erik Johnston | 2018-08-03 | 67 | -647/+1073 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-31 | 1 | -0/+0 |
| * | | | | | | | | | | | | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 2 | -195/+108 |
| * | | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 2 | -86/+40 |
| * | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | Erik Johnston | 2018-07-31 | 1 | -0/+208 |
* | | | | | | | | | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 14 | -52/+71 |
* | | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 4 | -1/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | fix metric name | Richard van der Hoff | 2018-08-07 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 3 | -1/+32 |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 14 | -22/+244 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 3 | -15/+5 |
| * | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-06 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Check m.room.create for sane room_versions | Richard van der Hoff | 2018-08-06 | 2 | -4/+32 |
| * | | | | | | | | | | | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 4 | -8/+25 |
| * | | | | | | | | | | | | | | sanity check response from make_join | Richard van der Hoff | 2018-08-03 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 3 | -4/+63 |
| * | | | | | | | | | | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 7 | -5/+83 |
| * | | | | | | | | | | | | | | Docstrings for BaseFederationServlet | Richard van der Hoff | 2018-08-03 | 1 | -0/+47 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #3662 from matrix-org/neilj/reserved_users | Neil Johnson | 2018-08-08 | 6 | -7/+115 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u... | Neil Johnson | 2018-08-08 | 16 | -156/+225 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 18 | -163/+414 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | typos | Neil Johnson | 2018-08-08 | 2 | -3/+3 |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3658 from matrix-org/rav/fix_event_persisted_position_met... | Richard van der Hoff | 2018-08-07 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metric | Richard van der Hoff | 2018-08-07 | 1 | -3/+8 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* / | | | | | | | | | | | | fix event lag graph | Richard van der Hoff | 2018-08-07 | 1 | -8/+16 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 2 | -31/+59 |
* | | | | | | | | | | | | Merge pull request #3644 from matrix-org/michaelkaye/refactor_docker_location... | Michael Kaye | 2018-08-03 | 9 | -112/+139 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| * | | | | | | | | | | | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| * | | | | | | | | | | | Update README.rst | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| * | | | | | | | | | | | Update README.rst | Michael Kaye | 2018-08-03 | 1 | -3/+10 |
| * | | | | | | | | | | | Add news entry | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| * | | | | | | | | | | | Address SPAG issues | Michael Kaye | 2018-08-02 | 1 | -2/+4 |
| * | | | | | | | | | | | Do not include docker files in python build | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| * | | | | | | | | | | | Refactor docker locations and README. | Michael Kaye | 2018-08-02 | 7 | -110/+126 |
| | | * | | | | | | | | | Ability to whitelist specific threepids against monthly active user limiting | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | * | | | | | | | | | mock config.max_mau_value | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | * | | | | | | | | | prevent total number of reserved users being too large | Neil Johnson | 2018-08-07 | 1 | -1/+3 |
| | | * | | | | | | | | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 4 | -13/+99 |
| | | * | | | | | | | | | WIP building out mau reserved users | Neil Johnson | 2018-08-06 | 1 | -1/+15 |
| | | * | | | | | | | | | add default mau_limits_reserved_threepids | Neil Johnson | 2018-08-06 | 1 | -0/+1 |
| | | * | | | | | | | | | load mau limit threepids | Neil Johnson | 2018-08-06 | 1 | -0/+3 |
| | |/ / / / / / / / / | |||||
| | * | | | / / / / / | Fix postgres compatibility bug | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | update comments to reflect new sig | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | make use of _simple_select_one_onecol, improved comments | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | * | | | | | | remove unused import | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | * | | | | | | bug fixes | Neil Johnson | 2018-08-03 | 5 | -27/+10 |
| | * | | | | | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 5 | -53/+66 |
| | * | | | | | | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 3 | -3/+3 |
| | * | | | | | | fix py3 test failure | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
| | * | | | | | | Add ability to limit number of monthly active users on the server | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
| | * | | | | | | fix caching and tests | Neil Johnson | 2018-08-03 | 3 | -62/+80 |
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 25 | -379/+450 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment | Amber Brown | 2018-08-03 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | newsfragment | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| * | | | | | | | Mention the word "newsfragment" in CONTRIBUTING.rst | Michael Kaye | 2018-08-02 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 9 | -142/+124 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
| * | | | | | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 5 | -78/+47 |
| * | | | | | | | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 3 | -34/+56 |
| * | | | | | | | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 3 | -32/+22 |
* | | | | | | | | Merge pull request #3638 from matrix-org/rav/refactor_federation_client_excep... | Richard van der Hoff | 2018-08-02 | 2 | -129/+149 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Factor out exception handling in federation_client | Richard van der Hoff | 2018-08-01 | 1 | -129/+148 |
* | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 11 | -21/+77 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge tag 'v0.33.1' | Richard van der Hoff | 2018-08-02 | 9 | -19/+73 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | changelog: this is a security release v0.33.1 github/release-v0.33.1 release-v0.33.1 | Richard van der Hoff | 2018-08-02 | 1 | -2/+2 |
| | * | | | | | | | | fix changelog typos | Richard van der Hoff | 2018-08-02 | 1 | -1/+1 |
| | * | | | | | | | | Prepare 0.33.1 | Richard van der Hoff | 2018-08-02 | 4 | -3/+11 |
| | * | | | | | | | | Merge pull request #3642 from matrix-org/rav/another_room_id_check | Richard van der Hoff | 2018-08-02 | 5 | -7/+25 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | changelogs | Richard van der Hoff | 2018-08-02 | 2 | -1/+2 |
| | | * | | | | | | | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 3 | -6/+23 |
| | * | | | | | | | | | Merge pull request #3641 from matrix-org/rav/room_id_check | Richard van der Hoff | 2018-08-02 | 5 | -12/+40 |
| | |\| | | | | | | | | |||||
| | | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-02 | 1 | -0/+1 |
| | | * | | | | | | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 3 | -62/+26 |
| | | * | | | | | | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 3 | -1/+64 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3594 from matrix-org/richvdh-patch-1 | Richard van der Hoff | 2018-07-24 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update ISSUE_TEMPLATE.md | Richard van der Hoff | 2018-07-24 | 1 | -2/+3 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3377 from Valodim/note-affinity | Richard van der Hoff | 2018-07-19 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | add note that the affinity package is required for the cpu_affinity setting | Vincent Breitmoser | 2018-06-09 | 1 | -0/+2 |
* | | | | | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 3 | -89/+101 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update docs | Erik Johnston | 2018-08-01 | 2 | -4/+6 |
| * | | | | | | | | | | _persist_auth_tree no longer returns anything | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_... | Erik Johnston | 2018-07-30 | 37 | -108/+787 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-27 | 1 | -0/+1 |
| * | | | | | | | | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 2 | -85/+94 |
| | | | | | * | | | | | | update generate_monthly_active_users, and reap_monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -2/+2 |
| | | | | | * | | | | | | typo | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| | | | | | * | | | | | | wip attempt at caching | Neil Johnson | 2018-08-02 | 1 | -9/+47 |
| | | | | | * | | | | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 7 | -61/+97 |
| | | | | | * | | | | | | remove unused count_monthly_users | Neil Johnson | 2018-08-02 | 2 | -90/+0 |
| | | | | | * | | | | | | fix test, update constructor call | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| | | | | | * | | | | | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 5 | -11/+99 |
| | | | | | * | | | | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-02 | 2 | -1/+3 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | self.db_conn unused | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | | | | | | * | | | | | | normalise reaping query | Neil Johnson | 2018-08-01 | 1 | -3/+38 |
| | | | | | * | | | | | | | Revert "change monthly_active_users table to be a single column" | Neil Johnson | 2018-08-02 | 3 | -7/+13 |
| | | | | | |/ / / / / / | |||||
| | | | | | * | | | | | | change monthly_active_users table to be a single column | Neil Johnson | 2018-08-01 | 3 | -13/+7 |
| | | | | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-01 | 48 | -279/+625 |
| | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 11 | -16/+275 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | count_monthly_users is now async | Neil Johnson | 2018-08-01 | 1 | -1/+2 |
| * | | | | | | | | | | | | improve clarity | Neil Johnson | 2018-08-01 | 2 | -5/+6 |
| * | | | | | | | | | | | | fix isort | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| * | | | | | | | | | | | | fix test for py3 | Neil Johnson | 2018-08-01 | 1 | -0/+4 |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i... | Neil Johnson | 2018-08-01 | 27 | -198/+5193 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | fix known broken test | Neil Johnson | 2018-08-01 | 1 | -25/+20 |
| * | | | | | | | | | | | | | count_monthly_users() async | Neil Johnson | 2018-08-01 | 1 | -4/+7 |
| * | | | | | | | | | | | | | remove need to plot limit_usage_by_mau | Neil Johnson | 2018-08-01 | 2 | -7/+6 |
| * | | | | | | | | | | | | | remove errant print | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| * | | | | | | | | | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 4 | -38/+46 |
| * | | | | | | | | | | | | | only need to loop if mau limiting is enabled | Neil Johnson | 2018-08-01 | 1 | -1/+2 |
| * | | | | | | | | | | | | | mau limts | Neil Johnson | 2018-07-31 | 1 | -0/+1 |
| * | | | | | | | | | | | | | coding style | Neil Johnson | 2018-07-31 | 7 | -9/+12 |
| * | | | | | | | | | | | | | fix user_ips counting | Neil Johnson | 2018-07-31 | 1 | -9/+33 |
| * | | | | | | | | | | | | | remove errant logging | Neil Johnson | 2018-07-30 | 1 | -1/+0 |
| * | | | | | | | | | | | | | actually close conn | Neil Johnson | 2018-07-30 | 1 | -4/+8 |
| * | | | | | | | | | | | | | monthly_active_tests | Neil Johnson | 2018-07-30 | 1 | -0/+48 |
| * | | | | | | | | | | | | | factor out metrics from __init__ to app/homeserver | Neil Johnson | 2018-07-30 | 2 | -25/+32 |
| * | | | | | | | | | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 7 | -3/+166 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-found | Richard van der Hoff | 2018-08-01 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Update 2952.bugfix | Richard van der Hoff | 2018-08-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | return NotFoundError if room not found | Serban Constantin | 2018-07-31 | 3 | -3/+7 |
* | | | | | | | | | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 17 | -67/+122 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3543 from bebehei/docker | Jan Christian Grünhage | 2018-08-01 | 4 | -10/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | [Docker] Use sorted multiline package lists | Benedikt Heine | 2018-07-19 | 2 | -3/+20 |
| * | | | | | | | | | | | | [Docker] Build docker image via compose | Benedikt Heine | 2018-07-17 | 2 | -7/+2 |
* | | | | | | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layer | Richard van der Hoff | 2018-08-01 | 2 | -14/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-31 | 1 | -0/+1 |
| * | | | | | | | | | | | | | rename replication_layer to federation_client | Richard van der Hoff | 2018-07-31 | 1 | -14/+14 |
* | | | | | | | | | | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decorator | Richard van der Hoff | 2018-08-01 | 3 | -67/+166 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | fix invalidation | Richard van der Hoff | 2018-07-27 | 2 | -2/+42 |
| * | | | | | | | | | | | | | Rewrite cache list decorator | Richard van der Hoff | 2018-07-27 | 3 | -67/+126 |
* | | | | | | | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failures | Travis Ralston | 2018-07-31 | 7 | -97/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Remove pdu_failures from transactions | Travis Ralston | 2018-07-30 | 7 | -97/+8 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchy | Richard van der Hoff | 2018-07-31 | 7 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | reinstate explicit include of EventsWorkerStore | Richard van der Hoff | 2018-07-31 | 1 | -1/+3 |
| * | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Make EventStore inherit from EventFederationStore | Richard van der Hoff | 2018-07-26 | 6 | -7/+9 |
| | | | | | | | * | | | | | | clean up | Neil Johnson | 2018-08-01 | 1 | -15/+3 |
| | | | | | | | * | | | | | | fix comment | Neil Johnson | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | * | | | | | | api into monthly_active_users table | Neil Johnson | 2018-07-31 | 6 | -2/+160 |
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3629 from ptman/patch-1 | Richard van der Hoff | 2018-07-31 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add some documentation for using the dashboard | Paul Tötterman | 2018-07-31 | 1 | -0/+6 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | synapse grafana dashboard | Richard van der Hoff | 2018-07-31 | 1 | -0/+4961 |
* | | | | | | | | | | | | Merge pull request #3626 from krombel/only_import_secrets_when_available | Amber Brown | 2018-07-31 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Only import secrets when available | Krombel | 2018-07-30 | 2 | -4/+4 |
|/ / / / / / / / / / / |