Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 2 | -43/+32 |
|\ | |||||
| * | Fix macaroon_secret_key fallback logic | Richard van der Hoff | 2019-01-10 | 1 | -3/+3 |
| | | |||||
| * | Skip macaroon check for access tokens in the db | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 |
| | | |||||
| * | Fix fallback to signing key for macaroon-secret-key | Richard van der Hoff | 2019-01-10 | 1 | -2/+2 |
| | | |||||
* | | Prepare 0.34 release | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 |
| | | |||||
* | | Debian packaging via dh_virtualenv | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 |
|\ \ | |||||
| * | | Debian packaging via dh_virtualenv (#4285) | Richard van der Hoff | 2018-12-20 | 2 | -2/+2 |
| | | | |||||
* | | | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog | ||||
* | | | Improved welcome page (#4294) | Nad Chishtie | 2018-12-14 | 1 | -25/+62 |
| | | | | | | | | | | | | | | | | | | | | | * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar. | ||||
* | | | Settings Fix deleting e2e room keys on xenial (#4295) | Amber Brown | 2018-12-14 | 1 | -1/+1 |
|/ / | |||||
* | | 0.34.0rc2 v0.34.0rc2 | Richard van der Hoff | 2018-12-11 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4290 from matrix-org/rav/remove_webclient | Richard van der Hoff | 2018-12-11 | 3 | -50/+38 |
|\ \ | | | | | | | Stop installing Matrix Console by default | ||||
| * | | Stop installing Matrix Console by default | Richard van der Hoff | 2018-12-11 | 3 | -50/+38 |
| | | | | | | | | | | | | This is based on the work done by @krombel in #2601. | ||||
* | | | Merge pull request #4289 from matrix-org/rav/welcome_page | Richard van der Hoff | 2018-12-11 | 2 | -0/+29 |
|\ \ \ | | | | | | | | | Add a welcome page to the static resources | ||||
| * | | | Add a welcome page to the static resources | Richard van der Hoff | 2018-12-11 | 2 | -0/+29 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601. | ||||
* / / | Prepare 0.34.0rc1 | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 |
|/ / | |||||
* | | Add an option to enable recording IPs for appservice users (#3831) | Travis Ralston | 2018-12-04 | 2 | -9/+25 |
| | | |||||
* | | Fix non-ASCII pushrules (#4248) | Amber Brown | 2018-12-04 | 1 | -12/+23 |
| | | |||||
* | | Add an option to disable search for homeservers which may not be interested ↵ | Travis Ralston | 2018-12-04 | 3 | -1/+20 |
| | | | | | | | | | | | | in it (#4230) This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data. | ||||
* | | add more detail to logging regarding "More than one row matched" error (#4234) | Ben Parsons | 2018-12-04 | 1 | -6/+6 |
| | | |||||
* | | Fix UnicodeDecodeError when postgres is not configured in english (#4253) | Richard van der Hoff | 2018-12-04 | 2 | -8/+46 |
| | | | | | | | | This is a bit of a half-assed effort at fixing https://github.com/matrix-org/synapse/issues/4252. Fundamentally the right answer is to drop support for Python 2. | ||||
* | | Merge pull request #4244 from aaronraimist/drop-sent-txt | Richard van der Hoff | 2018-12-04 | 6 | -74/+3 |
|\ \ | | | | | | | Drop sent_transactions | ||||
| * | | Drop sent_transactions | Aaron Raimist | 2018-12-01 | 6 | -74/+3 |
| | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
* | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3 | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix removing pushers on python 3 | ||||
| * | | | fix type error | Amber Brown | 2018-12-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Run the AS senders as background processes (#4189) | Richard van der Hoff | 2018-12-04 | 1 | -12/+24 |
|/ / / | | | | | | | | | | This should fix some "Starting db connection from sentinel context" warnings, and will mean we get metrics for these processes. | ||||
* / / | Workaround for non-ascii event ids (#4241) | Richard van der Hoff | 2018-12-03 | 1 | -1/+3 |
|/ / | | | | | | | | | | | It turns out that we accept events with non-ascii IDs, which would later cause an explosion during state res. Fixes #4226 | ||||
* | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 3 | -2/+24 |
| | | | | | | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent | ||||
* | | Neilj/fix mau initial reserved users (#4211) | Neil Johnson | 2018-11-28 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | * fix transaction wrapping bug that caused get_user_id_by_threepid_txn to fail * towncrier * white space | ||||
* | | Support m.login.sso (#4220) | Richard van der Hoff | 2018-11-27 | 4 | -52/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up the CSS for the fallback login form I was finding this hard to work with, so simplify a bunch of things. Each flow is now a form inside a div of class login_flow. The login_flow class now has a fixed width, as that looks much better than each flow having a differnt width. * Support m.login.sso MSC1721 renames m.login.cas to m.login.sso. This implements the change (retaining support for m.login.cas for older clients). * changelog | ||||
* | | Ignore __pycache__ directories in schema delta dir | Richard van der Hoff | 2018-11-20 | 1 | -1/+1 |
| | | | | | | | | Now that we use py3, compiled python ends up in __pycache__ rather than *.pyc. | ||||
* | | Remove riot.im from the list of trusted Identity Servers in the default ↵ | Neil Johnson | 2018-11-20 | 1 | -1/+3 |
| | | | | | | | | configuration (#4207) | ||||
* | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 1 | -2/+3 |
|\ \ | | | | | | | Fix some logcontext leaks | ||||
| * | | Fix logcontext leak in EmailPusher | Richard van der Hoff | 2018-11-19 | 1 | -2/+3 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2018-11-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | version | Amber Brown | 2018-11-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | release 0.33.9rc1 v0.33.9rc1 github/release-v0.33.9 release-v0.33.9 | Neil Johnson | 2018-11-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix fallback auth on Python 3 (#4197) | Amber Brown | 2018-11-19 | 1 | -22/+16 |
| |/ / |/| | | |||||
* | | | Remove duplicate slashes in generated consent URLs | Travis Ralston | 2018-11-15 | 2 | -3/+3 |
| | | | |||||
* | | | Fix Content-Disposition in media repository (#4176) | Amber Brown | 2018-11-15 | 3 | -90/+110 |
| | | | |||||
* | | | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 3 | -35/+47 |
| | | | |||||
* | | | Use <meta> tags to discover the per-page encoding of html previews (#4183) | Amber Brown | 2018-11-15 | 1 | -9/+22 |
|/ / | |||||
* | | Add a test for the public T&Cs form | Richard van der Hoff | 2018-11-14 | 1 | -1/+1 |
| | | |||||
* | | Fix an internal server error when viewing the public privacy policy | Richard van der Hoff | 2018-11-14 | 1 | -4/+7 |
| | | |||||
* | | Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbers | David Baker | 2018-11-14 | 2 | -2/+70 |
|\ \ | | | | | | | Make e2e backup versions numeric in the DB | ||||
| * \ | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2018-11-09 | 47 | -416/+763 |
| |\ \ | | | | | | | | | | | | | dbkr/e2e_backup_versions_are_numbers | ||||
| * | | | pep8 | David Baker | 2018-11-09 | 1 | -1/+2 |
| | | | | |||||
| * | | | add docs | David Baker | 2018-11-09 | 1 | -1/+4 |
| | | | | |||||
| * | | | Remove unnecessary str() | David Baker | 2018-11-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Cast to int here too | David Baker | 2018-10-30 | 1 | -0/+5 |
| | | | | |||||
| * | | | Cast bacjup version to int when querying | David Baker | 2018-10-30 | 1 | -1/+6 |
| | | | | |||||
| * | | | Convert version back to a string | David Baker | 2018-10-30 | 1 | -0/+1 |
| | | | | |||||
| * | | | Try & make it work on postgres | David Baker | 2018-10-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | Make e2e backup versions numeric in the DB | David Baker | 2018-10-29 | 3 | -2/+55 |
| | | | | | | | | | | | | | | | | | | | | We were doing max(version) which does not do what we wanted on a column of type TEXT. | ||||
* | | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_events | Erik Johnston | 2018-11-09 | 2 | -89/+74 |
|\ \ \ \ | |_|/ / |/| | | | Drop incoming events from federation for unknown rooms | ||||
| * | | | Remove hack to support rejoining rooms | Erik Johnston | 2018-11-09 | 1 | -74/+42 |
| | | | | |||||
| * | | | Simplify to always drop events if server isn't in the room | Erik Johnston | 2018-11-09 | 1 | -14/+9 |
| | | | | |||||
| * | | | Update synapse/federation/federation_server.py | Richard van der Hoff | 2018-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re> | ||||
| * | | | Update synapse/federation/federation_server.py | Richard van der Hoff | 2018-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re> | ||||
| * | | | Drop PDUs of unknown rooms | Erik Johnston | 2018-11-08 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | When we receive events over federation we will need to know the room version to be able to correctly handle them, e.g. once we start changing event formats. Currently, we attempt to handle events in unknown rooms. | ||||
* | | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparison | Erik Johnston | 2018-11-08 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Fix noop checks when updating device keys | ||||
| * | | | | Lets convert bytes to unicode instead | Erik Johnston | 2018-11-08 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | Fix noop checks when updating device keys | Erik Johnston | 2018-11-08 | 1 | -0/+5 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients often reupload their device keys (for some reason) so its important for the server to check for no-ops before sending out device list update notifications. The check is broken in python 3 due to the fact comparing bytes and unicode always fails, and that we write bytes to the DB but get unicode when we read. | ||||
* | | | | fix parse_string docstring | Richard van der Hoff | 2018-11-08 | 1 | -5/+4 |
| | | | | |||||
* | | | | Fix encoding error for consent form on python3 | hera | 2018-11-08 | 1 | -1/+3 |
|/ / / | | | | | | | | | | | | | | | | The form was rendering this as "b'01234....'". -- richvdh | ||||
* | | | Fix URL preview bugs (type error when loading cache from db, content-type ↵ | Amber Brown | 2018-11-08 | 2 | -10/+20 |
| | | | | | | | | | | | | including quotes) (#4157) | ||||
* | | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 4 | -3/+21 |
| | | | | | | | | | | | | So people can still collect consent the old way if they want to. | ||||
* | | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 2 | -10/+33 |
| | | | | | | | | | fixes #4056 | ||||
* | | | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 1 | -1/+1 |
| | | | |||||
* | | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 8 | -44/+60 |
| | | | | | | | | | | | | | | | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions. | ||||
* | | | Set the encoding to UTF8 in the default logconfig (#4138) | Amber Brown | 2018-11-03 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #4137 from matrix-org/erikj/clean_up_events | Erik Johnston | 2018-11-02 | 3 | -7/+4 |
|\ \ \ | | | | | | | | | Clean up event accesses and tests | ||||
| * | | | Clean up event accesses and tests | Erik Johnston | 2018-11-02 | 3 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | This is in preparation to refactor FrozenEvent to support different event formats for different room versions | ||||
* | | | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 2 | -4/+24 |
| | | | | |||||
* | | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_locking | Richard van der Hoff | 2018-11-02 | 3 | -11/+128 |
|\ \ \ \ | | | | | | | | | | | Fix locked upsert on device_lists_remote_cache | ||||
| * | | | | Add unique indexes to a couple of tables | Richard van der Hoff | 2018-11-02 | 3 | -6/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The indexes on device_lists_remote_extremeties can be unique, and they therefore should, to ensure that the db remains consistent. | ||||
| * | | | | Remove redundant database locks for device list updates | Richard van der Hoff | 2018-11-02 | 1 | -5/+40 |
| | | | | | | | | | | | | | | | | | | | | We can rely on the application-level per-user linearizer. | ||||
* | | | | | Merge pull request #4133 from matrix-org/travis/fix-terms-auth | Richard van der Hoff | 2018-11-02 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix logic error that prevented guests from seeing the privacy policy | ||||
| * | | | | | Fix logic error that prevented guests from seeing the privacy policy | Travis Ralston | 2018-11-01 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_none | Erik Johnston | 2018-11-02 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix None exception in state res v2 | ||||
| * | | | | Fix None exception in state res v2 | Erik Johnston | 2018-11-02 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge pull request #4004 from matrix-org/travis/login-terms | Travis Ralston | 2018-11-01 | 5 | -17/+135 |
|\ \ \ \ | |/ / / |/| | | | Add m.login.terms to the registration flow | ||||
| * | | | Include a version query string arg for the consent route | Travis Ralston | 2018-10-31 | 2 | -3/+8 |
| | | | | |||||
| * | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 45 | -879/+1761 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 46 | -503/+1136 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 21 | -106/+472 |
| |\ \ \ \ \ | |||||
| * | | | | | | pep8 | Travis Ralston | 2018-10-15 | 3 | -14/+3 |
| | | | | | | | |||||
| * | | | | | | Ensure the terms params are actually provided | Travis Ralston | 2018-10-15 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Python is hard | Travis Ralston | 2018-10-15 | 1 | -5/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-15 | 10 | -3/+1047 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Update login terms structure for the proposed language support | Travis Ralston | 2018-10-12 | 1 | -4/+7 |
| | | | | | | | | |||||
| * | | | | | | | Rely on the lack of ?u to represent public access | Travis Ralston | 2018-10-12 | 2 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | also general cleanup | ||||
| * | | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-12 | 18 | -125/+224 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use a flag rather than a new route for the public policy | Travis Ralston | 2018-10-03 | 3 | -17/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This also means that the template now has optional parameters, which will need to be documented somehow. | ||||
| * | | | | | | | | Auto-consent to the privacy policy if the user registered with terms | Travis Ralston | 2018-10-03 | 1 | -0/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Make the terms flow requried | Travis Ralston | 2018-10-03 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Flesh out the fallback auth for terms | Travis Ralston | 2018-10-03 | 1 | -7/+67 |
| | | | | | | | | | |||||
| * | | | | | | | | Supply params for terms auth stage | Travis Ralston | 2018-10-03 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/1692 | ||||
| * | | | | | | | | Incorporate Dave's work for GDPR login flows | Travis Ralston | 2018-10-03 | 4 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117 | ||||
* | | | | | | | | | Merge pull request #4128 from matrix-org/erikj/state_res_v2_version | Erik Johnston | 2018-11-01 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add STATE_V2_TEST room version | ||||
| * | | | | | | | | | Add STATE_V2_TEST room version | Erik Johnston | 2018-11-01 | 2 | -2/+7 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-11-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | version | Amber Brown | 2018-11-01 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | version bump | Amber Brown | 2018-10-31 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | version bump | Amber Brown | 2018-10-29 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades | Richard van der Hoff | 2018-10-31 | 2 | -14/+140 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Attempt to move room aliases on room upgrades | ||||
| * | | | | | | | | | Avoid else clause on exception for clarity | Richard van der Hoff | 2018-10-31 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Attempt to move room aliases on room upgrades | Richard van der Hoff | 2018-10-31 | 2 | -14/+141 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Log some bits about event creation (#4121) | Richard van der Hoff | 2018-10-31 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found these helpful in debugging my room upgrade tests. | ||||
* | | | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120) | Amber Brown | 2018-10-31 | 2 | -106/+12 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 4 | -113/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Remove the unused /pull federation API (#4118) | Amber Brown | 2018-10-31 | 2 | -14/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groups | Erik Johnston | 2018-10-30 | 4 | -48/+137 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Delete unreferenced state groups during purge | ||||
| * | | | | | | | | | | Move _find_unreferenced_groups | Erik Johnston | 2018-10-29 | 2 | -81/+83 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix set operations thinko | Erik Johnston | 2018-10-29 | 1 | -3/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Don't make temporary list | Erik Johnston | 2018-10-29 | 1 | -3/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Make SQL a bit cleaner | Erik Johnston | 2018-10-29 | 1 | -3/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-26 | 59 | -948/+2189 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | erikj/purge_state_groups | ||||
| * | | | | | | | | | | pep8 | Erik Johnston | 2018-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-19 | 49 | -250/+1763 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/purge_state_groups | ||||
| * | | | | | | | | | | | Batch process handling state groups | Erik Johnston | 2018-10-19 | 2 | -101/+92 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix up comments | Erik Johnston | 2018-10-12 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add state_group index to event_to_state_groups | Erik Johnston | 2018-10-04 | 3 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to efficiently check for unreferenced state groups during purge. | ||||
| * | | | | | | | | | | | Delete unreferened state groups during purge | Erik Johnston | 2018-10-04 | 2 | -6/+77 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Write some tests for the email pusher (#4095) | Amber Brown | 2018-10-30 | 3 | -6/+14 |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Deduplicate device updates sent over replication | Erik Johnston | 2018-10-29 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently send several kHz of device list updates over replication occisonally, which often causes the replications streams to lag and then get dropped. A lot of those updates will actually be duplicates, since we don't send e.g. device_ids across replication, so let's deduplicate it when we pull them out of the database. | ||||
* | | | | | | | | | | | Don't truncate command name in metrics | Erik Johnston | 2018-10-29 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Delete the disused & unspecced identicon functionality (#4106) | Amber Brown | 2018-10-29 | 4 | -74/+0 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar | Richard van der Hoff | 2018-10-29 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Remember to copy the avatar on room upgrades | ||||
| * | | | | | | | | | | Remember to copy the avatar on room upgrades | Richard van der Hoff | 2018-10-26 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_pls | Richard van der Hoff | 2018-10-29 | 1 | -44/+81 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Better handling of odd PLs during room upgrades | ||||
| * | | | | | | | | | | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 1 | -44/+81 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes handling of rooms where we have permission to send the tombstone, but not other state. We need to (a) fail more gracefully when we can't send the PLs in the old room, and (b) not set the PLs in the new room until we are done with the other stuff. | ||||
* | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 7 | -38/+323 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Room version upgrade support | ||||
| * | | | | | | | | | | optimise state copying | Richard van der Hoff | 2018-10-26 | 1 | -7/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Address review comments | Richard van der Hoff | 2018-10-26 | 2 | -12/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve comments, get old room state from the context we already have | ||||
| * | | | | | | | | | | restrict PLs in old room | Richard van der Hoff | 2018-10-25 | 1 | -1/+43 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | copy state | Richard van der Hoff | 2018-10-25 | 1 | -11/+26 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | preserve PLs | Richard van der Hoff | 2018-10-25 | 1 | -1/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | preserve room visibility | Richard van der Hoff | 2018-10-25 | 2 | -4/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 5 | -0/+208 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently just creates a new, empty, room, and sends a tombstone in the old room. | ||||
| * | | | | | | | | | | Allow power_level_content_override=None for _send_events_for_new_room | Richard van der Hoff | 2018-10-25 | 1 | -5/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Make room_member_handler a member of RoomCreationHandler | Richard van der Hoff | 2018-10-25 | 2 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save passing it into `_send_events_for_new_room` | ||||
| * | | | | | | | | | | Factor _generate_room_id out of create_room | Richard van der Hoff | 2018-10-25 | 1 | -22/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we're going to need this for room upgrades. | ||||
* | | | | | | | | | | | Make the replication logger quieter (#4108) | Amber Brown | 2018-10-29 | 1 | -1/+1 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 2 | -0/+215 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 9 | -420/+603 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit. | ||||
* | | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 5 | -15/+140 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add config option to control alias creation | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-25 | 46 | -443/+1124 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/alias_disallow_list | ||||
| * | | | | | | | | | | Use allow/deny | Erik Johnston | 2018-10-25 | 1 | -6/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Use match rather than search | Erik Johnston | 2018-10-24 | 1 | -2/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Anchor returned regex to start and end of string | Erik Johnston | 2018-10-19 | 1 | -2/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add config option to control alias creation | Erik Johnston | 2018-10-19 | 5 | -15/+135 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_init | Neil Johnson | 2018-10-25 | 4 | -31/+84 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | fix race condiftion in calling initialise_reserved_users | ||||
| * | | | | | | | | | | add new line | Neil Johnson | 2018-10-25 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | improve comments | Neil Johnson | 2018-10-25 | 1 | -6/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | fix style inconsistencies | Neil Johnson | 2018-10-24 | 2 | -15/+47 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | commit transaction before closing | Neil Johnson | 2018-10-24 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 31 | -368/+994 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | remove white space | Neil Johnson | 2018-10-23 | 1 | -2/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 3 | -25/+45 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-10-25 | 83 | -676/+2779 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | matthew/autocreate_autojoin | ||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Richard van der Hoff | 2018-10-24 | 12 | -67/+665 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rav/fix_event_filter_validation | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a number of flake8 errors | ||||
| | | * | | | | | | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broadly three things here: * disable W504 which seems a bit whacko * remove a bunch of `as e` expressions from exception handlers that don't use them * use `r""` for strings which include backslashes Also, we don't use pep8 any more, so we can get rid of the duplicate config there. | ||||
| | * | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 6 | -61/+659 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | Add v2 state resolution algorithm | ||||
| | | * | | | | | | | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 4 | -11/+11 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Update event_auth table for rejected events | Erik Johnston | 2018-10-16 | 1 | -15/+21 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Fix up use of resolve_events_with_factory | Erik Johnston | 2018-10-16 | 1 | -13/+10 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | User event.sender rather than alias event.user_id | Erik Johnston | 2018-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Add v2 state res algorithm. | Erik Johnston | 2018-10-16 | 3 | -24/+616 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hook this up to the vdh test room version. | ||||
| * | | | | | | | | | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+4 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which meant that single backslashes were not allowed in event field filters. The intention here is to allow single-backslashes, but disallow double-backslashes. | ||||
| * | | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 7 | -141/+141 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the way logcontexts and threads work in the pushers | ||||
| | * | | | | | | | | | | | Fix start_pushers vs _start_pushers confusion | Richard van der Hoff | 2018-10-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | sanity-check the is_processing flag | Richard van der Hoff | 2018-10-24 | 2 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and rename it, for even more sanity | ||||
| | * | | | | | | | | | | | Run PusherPool.start as a background process | Richard van der Hoff | 2018-10-22 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't do anything with the result, so this is needed to give this code a logcontext. | ||||
| | * | | | | | | | | | | | Make on_started synchronous too | Richard van der Hoff | 2018-10-22 | 3 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings it into line with on_new_notifications and on_new_receipts. It requires a little bit of hoop-jumping in EmailPusher to load the throttle params before the first loop. | ||||
| | * | | | | | | | | | | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 7 | -50/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough. | ||||
| | * | | | | | | | | | | | Give pushers their own background logcontext | Richard van der Hoff | 2018-10-22 | 2 | -58/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each pusher has its own loop which runs for as long as it has work to do. This should run in its own background thread with its own logcontext, as other similar loops elsewhere in the system do - which means that CPU usage is consistently attributed to that loop, rather than to whatever request happened to start the loop. | ||||
| | * | | | | | | | | | | | move get_all_pushers call down | Richard van der Hoff | 2018-10-22 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplifies the interface to _start_pushers | ||||
| | * | | | | | | | | | | | Factor PusherPool._start_pusher out of _start_pushers | Richard van der Hoff | 2018-10-22 | 1 | -18/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and use it from start_pusher_by_id. This mostly simplifies start_pusher_by_id. | ||||
| | * | | | | | | | | | | | Rename _refresh_pusher | Richard van der Hoff | 2018-10-22 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is public (or at least, called from outside the class), so ought to have a better name. | ||||
| * | | | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 3 | -64/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | Clean up room alias creation | ||||
| | * | | | | | | | | | | | Clean up room alias creation | Erik Johnston | 2018-10-19 | 3 | -64/+55 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 2 | -8/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle HttpResponseException more safely for federated groups | ||||
| | * | | | | | | | | | | | Comments help | Travis Ralston | 2018-10-23 | 1 | -0/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | isort | Travis Ralston | 2018-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | More sane handling of group errors and pep8 | Travis Ralston | 2018-10-12 | 1 | -4/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'develop' into travis/fix-federated-group-requests | Travis Ralston | 2018-10-12 | 49 | -314/+590 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Remove debugging statement | Travis Ralston | 2018-09-26 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Handle HttpResponseException more safely for federated groups | Travis Ralston | 2018-09-26 | 1 | -2/+11 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix exception documentation in matrixfederationclient.py | Travis Ralston | 2018-09-26 | 1 | -6/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Give some more things logcontexts (#4077) | Richard van der Hoff | 2018-10-23 | 2 | -7/+11 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 5 | -80/+96 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap calls to deferToThread() in a thing which uses a child logcontext to attribute CPU usage to the right request. While we're in the area, remove the logcontext_tracer stuff, which is never used, and afaik doesn't work. Fixes #4064 | ||||
| * | | | | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontexts | Richard van der Hoff | 2018-10-22 | 1 | -8/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Run MAU queries as background processes | ||||
| | * | | | | | | | | | | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 1 | -8/+22 |
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3820 | ||||
| * | | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutil | Richard van der Hoff | 2018-10-22 | 2 | -10/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Make psutil an explicit dependency | ||||
| | * | | | | | | | | | | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 2 | -10/+5 |
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of #4027, we require psutil to be installed, so it should be in our dependency list. We can also remove some of the conditional import code introduced by #992. Fixes #4062. | ||||
| * / / / / / / / / / / | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase ↵ | Amber Brown | 2018-10-20 | 9 | -71/+70 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on py3) (#4068) | ||||
| * | | | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 | Richard van der Hoff | 2018-10-19 | 2 | -28/+20 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | Calculate absolute path for email templates | ||||
| | * | | | | | | | | | Calculate absolute path for email templates | Richard van der Hoff | 2018-10-19 | 2 | -28/+20 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix manhole on py3 (pt 2) (#4067) | Amber Brown | 2018-10-19 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 2 | -16/+21 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | make a bytestring | Amber Brown | 2018-10-19 | 1 | -2/+2 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 11 | -5/+369 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | 0.33.7 v0.33.7 | Richard van der Hoff | 2018-10-18 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-17 | 4 | -35/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id. | ||||
| | * | | | | | | | | Put the warning blob at the top of the file | Richard van der Hoff | 2018-10-17 | 1 | -6/+9 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 10 | -4/+365 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the example email templates into the synapse package so that they can be used as package data, which should mean that all of the packaging mechanisms (pip, docker, debian, arch, etc) should now come with the example templates. In order to grandfather in people who relied on the templates being in the old place, check for that situation and fall back to using the defaults if the templates directory does not exist. | ||||
| | * | | | | | | | | version bump | Amber Brown | 2018-10-15 | 1 | -1/+1 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Fix bug where we raised StopIteration in a generator | Erik Johnston | 2018-10-17 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This made python 3.7 unhappy | ||||
| * | | | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @Half-Shot !!! | ||||
| * | | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 4 | -35/+25 |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id. | ||||
| * | | | | | | | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 3 | -61/+63 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve logging: log things in the right order, include destination and txids in all log lines, don't log successful responses twice - Fix the docstring on TransportLayerClient.send_transaction - Don't use treq.request, which is overcomplicated for our purposes: just use a twisted.web.client.Agent. - simplify the logic for setting up the bodyProducer - fix bytes/str confusions | ||||
| * | | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 8 | -0/+1044 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | E2E backups | ||||
| | * | | | | | | missed one | David Baker | 2018-10-12 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| | | | | | | | | |||||
| | * | | | | | | Misc PR feedback bits | David Baker | 2018-10-12 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Don't mangle exceptions | David Baker | 2018-10-12 | 1 | -4/+2 |
| | | | | | | | | |||||
| | * | | | | | | Split /room_keys/version into 2 servlets | David Baker | 2018-10-12 | 1 | -9/+21 |
| | | | | | | | | |||||
| | * | | | | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 3 | -29/+22 |
| | | | | | | | | |||||
| | * | | | | | | Fix mergefail | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | isort | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 115 | -1523/+2315 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Apparently this blank line is Very Important | David Baker | 2018-10-09 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | be python3 compatible | David Baker | 2018-10-09 | 1 | -2/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Don't reuse backup versions | David Baker | 2018-10-05 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't actually delete the keys, just mark the versions as deleted in the db rather than actually deleting them, then we won't reuse versions. Fixes https://github.com/vector-im/riot-web/issues/7448 | ||||
| | * | | | | | | | WIP e2e key backups | David Baker | 2018-09-13 | 2 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continues from uhoreg's branch This just fixed the errcode on /room_keys/version if no backup and updates the schema delta to be on the latest so it gets run | ||||
| | * | | | | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 4 | -4/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 116 | -1483/+3715 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | allow session_data to be any JSON instead of just a string | Hubert Chathi | 2018-08-21 | 1 | -2/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | allow auth_data to be any JSON instead of a string | Hubert Chathi | 2018-08-21 | 1 | -2/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | use parse_string | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | 404 nicely if you try to interact with a missing current version | Matthew Hodgson | 2018-08-12 | 1 | -16/+35 |
| | | | | | | | | | | |||||
| | * | | | | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | flake8 | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 3 | -8/+36 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | don't needlessly return user_id | Matthew Hodgson | 2018-08-12 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix flakes | Matthew Hodgson | 2018-08-12 | 2 | -4/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix typos | Matthew Hodgson | 2018-08-12 | 2 | -2/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 2 | -9/+113 |
| | | | | | | | | | |