| Commit message (Expand) | Author | Age | Files | Lines |
* | version | Amber Brown | 2019-01-11 | 1 | -1/+1 |
* | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 | Richard van der Hoff | 2019-01-10 | 2 | -40/+29 |
|\ |
|
| * | Revert "Fix macaroon_secret_key fallback logic" | Richard van der Hoff | 2019-01-10 | 1 | -3/+3 |
| * | 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 |
* | | | 0.34.1 v0.34.1 | Richard van der Hoff | 2019-01-09 | 1 | -1/+1 |
* | | | Merge branch 'develop' into release-v0.34.1 | Erik Johnston | 2019-01-09 | 2 | -6/+11 |
|\ \ \ |
|
| * | | | Use RequestSendFailed when fail to parse content type headers | Erik Johnston | 2019-01-08 | 1 | -5/+5 |
| * | | | Don't log stack traces for HTTP error responses | Erik Johnston | 2019-01-08 | 1 | -1/+6 |
* | | | | 0.34.1rc1 | Richard van der Hoff | 2019-01-08 | 1 | -1/+1 |
|/ / / |
|
* | | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 4 | -41/+108 |
* | | | Fix synapse.config.__main__ on python 3 (#4356) | Amber Brown | 2019-01-08 | 1 | -1/+1 |
* | | | Add GET account data routes (#4303) | Travis Ralston | 2019-01-07 | 1 | -1/+33 |
* | | | Check jinja version for consent resource (#4327) | Richard van der Hoff | 2019-01-07 | 3 | -28/+74 |
* | | | fix the check for whether `is_url` to match all the other ones in codebase (#... | Michael Telatynski | 2019-01-06 | 1 | -3/+8 |
* | | | fix NPE in /messages by checking if all events were filtered out (#4330) | Matthew Hodgson | 2019-01-02 | 1 | -10/+11 |
* | | | Ensure synchrotrons can access is_support_user in the storage layer | Neil Johnson | 2019-01-02 | 1 | -25/+25 |
* | | | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 4 | -445/+0 |
* | | | Log roomid along with Unknown room (#4297) | Will Hunt | 2018-12-24 | 1 | -1/+1 |
* | | | Merge pull request #4307 from matrix-org/erikj/v2_rooms | Richard van der Hoff | 2018-12-24 | 2 | -1/+5 |
|\ \ \ |
|
| * | | | Add v2 room version | Erik Johnston | 2018-12-18 | 2 | -1/+5 |
* | | | | Return well_known in /login response (#4319) | Richard van der Hoff | 2018-12-24 | 1 | -7/+11 |
* | | | | Add a script to generate a clean config file (#4315) | Richard van der Hoff | 2018-12-22 | 9 | -46/+89 |
* | | | | Fix indentation in default config (#4313) | Richard van der Hoff | 2018-12-22 | 1 | -35/+35 |
* | | | | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 3 | -171/+255 |
* | | | | Make the dependencies more like a standard Python project and hook up the opt... | Amber Brown | 2018-12-22 | 3 | -147/+90 |
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | 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 |
| * | | | | Improved welcome page (#4294) | Nad Chishtie | 2018-12-14 | 1 | -25/+62 |
| * | | | | Settings Fix deleting e2e room keys on xenial (#4295) | Amber Brown | 2018-12-14 | 1 | -1/+1 |
| |/ / / |
|
* | | | | Fixed line length | Nathan Pennie | 2018-12-19 | 1 | -1/+5 |
* | | | | Fix the variable names used for account_data | Nathan Pennie | 2018-12-19 | 1 | -3/+3 |
* | | | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305) | Neil Johnson | 2018-12-18 | 1 | -1/+1 |
* | | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 10 | -33/+159 |
* | | | | Settings Fix deleting e2e room keys on xenial (#4295) | Amber Brown | 2018-12-14 | 1 | -1/+1 |
* | | | | Improved welcome page (#4294) | Nad Chishtie | 2018-12-14 | 1 | -25/+62 |
* | | | | Merge branch 'release-v0.34.0' into develop | Richard van der Hoff | 2018-12-11 | 5 | -51/+68 |
|\| | | |
|
| * | | | 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 | Richard van der Hoff | 2018-12-11 | 3 | -50/+38 |
| * | | | | 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 | Richard van der Hoff | 2018-12-11 | 2 | -0/+29 |
| | |/ / / |
|
| * / / / | Prepare 0.34.0rc1 | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 |
| |/ / / |
|
* | | | | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-11 | 1 | -1/+2 |
* | | | | Move imports to one line | Will Hunt | 2018-12-10 | 1 | -4/+1 |
* | | | | Use `send_cors` | Will Hunt | 2018-12-10 | 1 | -4/+1 |
* | | | | changelog & isort | Will Hunt | 2018-12-09 | 1 | -1/+5 |
* | | | | Make /config more CORS-y | Will Hunt | 2018-12-09 | 1 | -1/+3 |
* | | | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 4 | -14/+37 |
* | | | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 7 | -2/+256 |
* | | | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 3 | -31/+153 |
* | | | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 5 | -154/+3 |
* | | | | drop undocumented dependency on dateutil (#4266) | Richard van der Hoff | 2018-12-06 | 1 | -7/+6 |
* | | | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 3 | -0/+81 |
|/ / / |
|
* | | | 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 i... | Travis Ralston | 2018-12-04 | 3 | -1/+20 |
* | | | 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 |
* | | | Merge pull request #4244 from aaronraimist/drop-sent-txt | Richard van der Hoff | 2018-12-04 | 6 | -74/+3 |
|\ \ \ |
|
| * | | | Drop sent_transactions | Aaron Raimist | 2018-12-01 | 6 | -74/+3 |
* | | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3 | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | 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 |
|/ / / / |
|
* / / / | Workaround for non-ascii event ids (#4241) | Richard van der Hoff | 2018-12-03 | 1 | -1/+3 |
|/ / / |
|
* | | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 3 | -2/+24 |
* | | | Neilj/fix mau initial reserved users (#4211) | Neil Johnson | 2018-11-28 | 1 | -2/+3 |
* | | | Support m.login.sso (#4220) | Richard van der Hoff | 2018-11-27 | 4 | -52/+49 |
* | | | Ignore __pycache__ directories in schema delta dir | Richard van der Hoff | 2018-11-20 | 1 | -1/+1 |
* | | | Remove riot.im from the list of trusted Identity Servers in the default confi... | Neil Johnson | 2018-11-20 | 1 | -1/+3 |
* | | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 1 | -2/+3 |
|\ \ \ |
|
| * | | | 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 |
|\ \ |
|
| * \ | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a... | David Baker | 2018-11-09 | 47 | -416/+763 |
| |\ \ |
|
| * | | | 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 |
* | | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_events | Erik Johnston | 2018-11-09 | 2 | -89/+74 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | 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 |
| * | | | Update synapse/federation/federation_server.py | Richard van der Hoff | 2018-11-09 | 1 | -1/+1 |
| * | | | Drop PDUs of unknown rooms | Erik Johnston | 2018-11-08 | 1 | -1/+23 |
* | | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparison | Erik Johnston | 2018-11-08 | 1 | -1/+4 |
|\ \ \ \ |
|
| * | | | | 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 |
| |/ / / |
|
* | | | | 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 |
|/ / / |
|
* | | | Fix URL preview bugs (type error when loading cache from db, content-type inc... | Amber Brown | 2018-11-08 | 2 | -10/+20 |
* | | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 4 | -3/+21 |
* | | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 2 | -10/+33 |
* | | | 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 |
* | | | 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 | Erik Johnston | 2018-11-02 | 3 | -7/+4 |
* | | | | 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 |
|\ \ \ \ |
|
| * | | | | Add unique indexes to a couple of tables | Richard van der Hoff | 2018-11-02 | 3 | -6/+88 |
| * | | | | Remove redundant database locks for device list updates | Richard van der Hoff | 2018-11-02 | 1 | -5/+40 |
* | | | | | 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 | 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 | 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 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | 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 |
| * | | | | | | | 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 |
| * | | | | | | | | 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 |
| * | | | | | | | | Incorporate Dave's work for GDPR login flows | Travis Ralston | 2018-10-03 | 4 | -0/+40 |
* | | | | | | | | | 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 | 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 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | 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 |
* | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | 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 erikj/purge_stat... | Erik Johnston | 2018-10-26 | 59 | -948/+2189 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| * | | | | | | | | | | pep8 | Erik Johnston | 2018-10-19 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat... | Erik Johnston | 2018-10-19 | 49 | -250/+1763 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | 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 |
| * | | | | | | | | | | | 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 |
* | | | | | | | | | | | 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 | 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 | Richard van der Hoff | 2018-10-27 | 1 | -44/+81 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 7 | -38/+323 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | Factor _generate_room_id out of create_room | Richard van der Hoff | 2018-10-25 | 1 | -22/+23 |
* | | | | | | | | | | | 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 |
* | | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 5 | -15/+140 |
|\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... | Erik Johnston | 2018-10-25 | 46 | -443/+1124 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | 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 matthew/autocrea... | Neil Johnson | 2018-10-25 | 83 | -676/+2779 |
|\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / /
| |/| | | | | | | | | |
|
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid... | Richard van der Hoff | 2018-10-24 | 12 | -67/+665 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | 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 | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | * | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 6 | -61/+659 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | 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 |
| * | | | | | | | | | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+4 |
| |/ / / / / / / / / / / |
|
| * | | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 7 | -141/+141 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | 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 |
| | * | | | | | | | | | | | Run PusherPool.start as a background process | Richard van der Hoff | 2018-10-22 | 1 | -5/+7 |
| | * | | | | | | | | | | | Make on_started synchronous too | Richard van der Hoff | 2018-10-22 | 3 | -11/+21 |
| | * | | | | | | | | | | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 7 | -50/+14 |
| | * | | | | | | | | | | | Give pushers their own background logcontext | Richard van der Hoff | 2018-10-22 | 2 | -58/+54 |
| | * | | | | | | | | | | | move get_all_pushers call down | Richard van der Hoff | 2018-10-22 | 1 | -3/+9 |
| | * | | | | | | | | | | | Factor PusherPool._start_pusher out of _start_pushers | Richard van der Hoff | 2018-10-22 | 1 | -18/+33 |
| | * | | | | | | | | | | | Rename _refresh_pusher | Richard van der Hoff | 2018-10-22 | 2 | -3/+4 |
| * | | | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 3 | -64/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | 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 |
| | |_|_|_|_|/ / / / / /
| |/| | | | | | | | | | |
|
| * | | | | | | | | | | | 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 | Richard van der Hoff | 2018-10-20 | 1 | -8/+22 |
| | | |_|_|/ / / / / / /
| | |/| | | | | | | | | |
|
| * | | | | | | | | | | | 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 | Richard van der Hoff | 2018-10-19 | 2 | -10/+5 |
| | |/ / / / / / / / / / |
|
| * / / / / / / / / / / | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on... | Amber Brown | 2018-10-20 | 9 | -71/+70 |
| |/ / / / / / / / / / |
|
| * | | | | | | | | | | 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 | 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 |
| |\| | | | | | | | |
|