Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4257 from aaronraimist/add-editorconfig | Richard van der Hoff | 2018-12-04 | 3 | -0/+11 |
|\ | |||||
| * | Add a basic .editorconfig | Aaron Raimist | 2018-12-03 | 3 | -0/+11 |
* | | Run the AS senders as background processes (#4189) | Richard van der Hoff | 2018-12-04 | 2 | -12/+26 |
|/ | |||||
* | Workaround for non-ascii event ids (#4241) | Richard van der Hoff | 2018-12-03 | 2 | -1/+4 |
* | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 5 | -3/+36 |
* | Report combined coverage to codecov (#4225) | Amber Brown | 2018-11-28 | 3 | -17/+23 |
* | Neilj/fix mau initial reserved users (#4211) | Neil Johnson | 2018-11-28 | 2 | -2/+5 |
* | Support m.login.sso (#4220) | Richard van der Hoff | 2018-11-27 | 5 | -52/+50 |
* | Check logcontexts before and after each test (#4190) | Richard van der Hoff | 2018-11-27 | 3 | -8/+22 |
* | Fix more logcontext leaks in tests (#4209) | Richard van der Hoff | 2018-11-27 | 2 | -1/+3 |
* | Do a GC after each test to fix logcontext leaks (#4227) | Richard van der Hoff | 2018-11-27 | 3 | -3/+71 |
* | Merge pull request #4214 from matrix-org/rav/ignore_pycache | Amber Brown | 2018-11-20 | 2 | -1/+2 |
|\ | |||||
| * | Ignore __pycache__ directories in schema delta dir | Richard van der Hoff | 2018-11-20 | 2 | -1/+2 |
|/ | |||||
* | Remove riot.im from the list of trusted Identity Servers in the default confi... | Neil Johnson | 2018-11-20 | 3 | -2/+7 |
* | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 6 | -7/+12 |
|\ | |||||
| * | changelog | Richard van der Hoff | 2018-11-19 | 1 | -0/+1 |
| * | Fix logcontext leak in test_url_preview | Richard van der Hoff | 2018-11-19 | 1 | -1/+2 |
| * | Fix logcontext leak in http pusher test | Richard van der Hoff | 2018-11-19 | 1 | -1/+2 |
| * | Fix some tests which leaked logcontexts | Richard van der Hoff | 2018-11-19 | 2 | -3/+4 |
| * | 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 | 41 | -40/+62 |
|\ \ | |||||
| * \ | Merge tag 'v0.33.9' 0.34.0rc2 | Amber Brown | 2018-11-19 | 95 | -969/+2846 |
| |\ \ | |||||
| | * | | towncrier v0.33.9 | Amber Brown | 2018-11-19 | 1 | -0/+6 |
| | * | | 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 | 41 | -40/+56 |
* | | | | Fix fallback auth on Python 3 (#4197) | Amber Brown | 2018-11-19 | 3 | -22/+121 |
| |_|/ |/| | | |||||
* | | | Merge pull request #4182 from aaronraimist/update-issue-template | Richard van der Hoff | 2018-11-19 | 6 | -10/+57 |
|\ \ \ | |||||
| * | | | Fix case | Aaron Raimist | 2018-11-13 | 1 | -1/+1 |
| * | | | Add SUPPORT.md | Aaron Raimist | 2018-11-13 | 1 | -0/+3 |
| * | | | Add changelog | Aaron Raimist | 2018-11-13 | 1 | -0/+1 |
| * | | | Add a pull request template and add multiple issue templates | Aaron Raimist | 2018-11-13 | 4 | -10/+53 |
* | | | | Merge pull request #4200 from aaronraimist/vacuum-full-note | Richard van der Hoff | 2018-11-19 | 2 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | Add changelog | Aaron Raimist | 2018-11-18 | 1 | -0/+1 |
| * | | | | Add a note saying you need to manually reclaim disk space | Aaron Raimist | 2018-11-18 | 1 | -0/+8 |
|/ / / / | |||||
* | | | | Merge pull request #4193 from kivikakk/add-openbsd-prereq | Amber Brown | 2018-11-17 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | add changelog.d entry | Ashe Connor | 2018-11-17 | 1 | -0/+1 |
| * | | | | add jpeg to OpenBSD prereq list | Ashe Connor | 2018-11-17 | 1 | -1/+1 |
* | | | | | Merge pull request #4192 from matrix-org/travis/fix-consent-urls | Travis Ralston | 2018-11-16 | 4 | -4/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix the terms UI auth tests | Travis Ralston | 2018-11-15 | 1 | -1/+1 |
| * | | | | Changelog | Travis Ralston | 2018-11-15 | 1 | -0/+1 |
| * | | | | 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 | 6 | -90/+271 |
* | | | | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 7 | -35/+92 |
* | | | | Use <meta> tags to discover the per-page encoding of html previews (#4183) | Amber Brown | 2018-11-15 | 3 | -9/+100 |
* | | | | Add a coveragerc (#4180) | Amber Brown | 2018-11-15 | 4 | -2/+27 |
* | | | | Merge pull request #4188 from matrix-org/rav/readme-update-1 | Neil Johnson | 2018-11-15 | 2 | -3/+5 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Update README for #1491 fix | Richard van der Hoff | 2018-11-15 | 2 | -3/+5 |
|/ / / | |||||
* | | | Merge pull request #4184 from matrix-org/rav/fix_public_consent | Richard van der Hoff | 2018-11-14 | 3 | -5/+16 |
|\ \ \ | |||||
| * | | | changelog | Richard van der Hoff | 2018-11-14 | 1 | -0/+1 |
| * | | | Add a test for the public T&Cs form | Richard van der Hoff | 2018-11-14 | 2 | -1/+8 |
| * | | | 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 | 3 | -2/+71 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a... | David Baker | 2018-11-09 | 140 | -758/+2475 |
| |\ \ \ | |||||
| * | | | | 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 |
| * | | | | news fragment | 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 | 3 | -89/+75 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | 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 |
| * | | | | Newsfile | Erik Johnston | 2018-11-08 | 1 | -0/+1 |
| * | | | | Drop PDUs of unknown rooms | Erik Johnston | 2018-11-08 | 1 | -1/+23 |
* | | | | | Merge pull request #4168 from matrix-org/babolivier/federation-client-content... | Brendan Abolivier | 2018-11-09 | 1 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Add a Content-Type header on POST requests to the federation client | Brendan Abolivier | 2018-11-09 | 1 | -2/+7 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparison | Erik Johnston | 2018-11-08 | 3 | -1/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Add test to assert set_e2e_device_keys correctly returns False on no-op | Erik Johnston | 2018-11-08 | 1 | -0/+15 |
| * | | | | | Lets convert bytes to unicode instead | Erik Johnston | 2018-11-08 | 1 | -5/+3 |
| * | | | | | Newsfile | Erik Johnston | 2018-11-08 | 1 | -0/+1 |
| * | | | | | Fix noop checks when updating device keys | Erik Johnston | 2018-11-08 | 1 | -0/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #4163 from matrix-org/rav/fix_consent_on_py3 | Richard van der Hoff | 2018-11-08 | 3 | -6/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | fix parse_string docstring | Richard van der Hoff | 2018-11-08 | 1 | -5/+4 |
| * | | | | changelog | Richard van der Hoff | 2018-11-08 | 1 | -0/+1 |
| * | | | | Fix encoding error for consent form on python3 | hera | 2018-11-08 | 1 | -1/+3 |
|/ / / / | |||||
* | | | | Port hash_password to Python 3 (#4161) | Amber Brown | 2018-11-08 | 3 | -8/+36 |
* | | | | Fix URL preview bugs (type error when loading cache from db, content-type inc... | Amber Brown | 2018-11-08 | 5 | -10/+187 |
* | | | | Merge pull request #4155 from rubo77/purge-api | Richard van der Hoff | 2018-11-07 | 4 | -0/+212 |
|\ \ \ \ | |||||
| * | | | | add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/ | rubo77 | 2018-11-07 | 4 | -0/+212 |
* | | | | | Remove some boilerplate in tests (#4156) | Amber Brown | 2018-11-07 | 11 | -216/+162 |
|/ / / / | |||||
* | | | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 10 | -11/+65 |
* | | | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 4 | -52/+71 |
* | | | | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 5 | -6/+140 |
* | | | | Add some tests for the HTTP pusher (#4149) | Amber Brown | 2018-11-06 | 2 | -0/+160 |
* | | | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 10 | -45/+62 |
* | | | | Set the encoding to UTF8 in the default logconfig (#4138) | Amber Brown | 2018-11-03 | 2 | -0/+2 |
* | | | | Merge pull request #4137 from matrix-org/erikj/clean_up_events | Erik Johnston | 2018-11-02 | 6 | -10/+8 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2018-11-02 | 1 | -0/+1 |
| * | | | | Clean up event accesses and tests | Erik Johnston | 2018-11-02 | 5 | -10/+7 |
* | | | | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 5 | -5/+155 |
* | | | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_locking | Richard van der Hoff | 2018-11-02 | 4 | -11/+129 |
|\ \ \ \ \ | |||||
| * | | | | | changelog | Richard van der Hoff | 2018-11-02 | 1 | -0/+1 |
| * | | | | | 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 | 2 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Changelog | Travis Ralston | 2018-11-01 | 1 | -0/+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 | 3 | -2/+103 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-11-02 | 1 | -0/+1 |
| * | | | | | | Fix None exception in state res v2 | Erik Johnston | 2018-11-02 | 2 | -2/+102 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3778 from z3ntu/patch-1 | Richard van der Hoff | 2018-11-01 | 2 | -2/+5 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | changelog.d entry somehow got lost | Luca Weiss | 2018-09-11 | 1 | -0/+1 |
| * | | | | | Fix build of Docker image with docker-compose | Luca Weiss | 2018-09-11 | 1 | -2/+4 |
* | | | | | | Merge pull request #4004 from matrix-org/travis/login-terms | Travis Ralston | 2018-11-01 | 9 | -27/+277 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | The tests also need a version parameter | Travis Ralston | 2018-10-31 | 1 | -1/+1 |
| * | | | | | 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 | 91 | -1262/+2561 |
| |\ \ \ \ \ | |||||
| * | | | | | | pep8 | Travis Ralston | 2018-10-24 | 2 | -6/+3 |
| * | | | | | | It helps to import things | Travis Ralston | 2018-10-24 | 1 | -0/+16 |
| * | | | | | | Move test to where the other integration tests are | Travis Ralston | 2018-10-24 | 2 | -97/+109 |
| * | | | | | | Fix test | Travis Ralston | 2018-10-24 | 1 | -25/+50 |
| * | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 90 | -971/+2312 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix terms UI auth test | Travis Ralston | 2018-10-18 | 1 | -2/+5 |
| * | | | | | | | Test for terms UI auth | Travis Ralston | 2018-10-18 | 1 | -0/+70 |
| * | | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 43 | -163/+308 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | 13 | -3/+1447 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 |
| * | | | | | | | | | Update documentation and templates for new consent | Travis Ralston | 2018-10-12 | 2 | -10/+18 |
| * | | | | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-12 | 85 | -190/+313 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Changelog | Travis Ralston | 2018-10-03 | 1 | -0/+1 |
| * | | | | | | | | | | 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 | 3 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-11-01 | 1 | -0/+1 |
| * | | | | | | | | | | | Add STATE_V2_TEST room version | Erik Johnston | 2018-11-01 | 2 | -2/+7 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-11-01 | 31 | -31/+64 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'release-v0.33.8' | Amber Brown | 2018-11-01 | 108 | -1814/+4145 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | changelog v0.33.8 github/release-v0.33.8 release-v0.33.8 | Amber Brown | 2018-11-01 | 1 | -0/+6 |
| | * | | | | | | | | | version | Amber Brown | 2018-11-01 | 1 | -1/+1 |
| | * | | | | | | | | | changelog v0.33.8rc2 | Amber Brown | 2018-10-31 | 2 | -1/+10 |
| | * | | | | | | | | | version bump | Amber Brown | 2018-10-31 | 1 | -1/+1 |
| | * | | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 3 | -3/+112 |
| | * | | | | | | | | | changelog v0.33.8rc1 | Amber Brown | 2018-10-29 | 30 | -30/+47 |
| | * | | | | | | | | | 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 | 3 | -14/+141 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 | 3 | -14/+142 |
* | | | | | | | | | | | | Merge pull request #4125 from MazeChaZer/fix-typo-in-docker-compose | Richard van der Hoff | 2018-10-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix typo in docker-compose.yml | Jonas Schürmann | 2018-10-31 | 1 | -1/+1 |
* | | | | | | | | | | | | | Log some bits about event creation (#4121) | Richard van der Hoff | 2018-10-31 | 3 | -0/+8 |
* | | | | | | | | | | | | | Merge pull request #4124 from matrix-org/rav/fix_tox | Richard van der Hoff | 2018-10-31 | 3 | -19/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-10-30 | 1 | -0/+1 |
| * | | | | | | | | | | | | Attempt to fix tox installs | Richard van der Hoff | 2018-10-30 | 2 | -19/+14 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120) | Amber Brown | 2018-10-31 | 3 | -106/+13 |
* | | | | | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 5 | -113/+2 |
* | | | | | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 3 | -3/+112 |
* | | | | | | | | | | | | Remove the unused /pull federation API (#4118) | Amber Brown | 2018-10-31 | 3 | -14/+1 |
* | | | | | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groups | Erik Johnston | 2018-10-30 | 5 | -48/+138 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 | 115 | -1683/+3799 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 | 70 | -301/+2020 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Batch process handling state groups | Erik Johnston | 2018-10-19 | 2 | -101/+92 |
| * | | | | | | | | | | | | | Fix up comments | Erik Johnston | 2018-10-12 | 1 | -3/+3 |
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-04 | 1 | -0/+1 |
| * | | | | | | | | | | | | | 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 | 10 | -13/+182 |
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #4109 from matrix-org/erikj/repl_devices | Erik Johnston | 2018-10-29 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-29 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Deduplicate device updates sent over replication | Erik Johnston | 2018-10-29 | 1 | -1/+5 |
* | | | | | | | | | | | | | | Merge pull request #4111 from matrix-org/erikj/repl_names | Erik Johnston | 2018-10-29 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-29 | 1 | -0/+1 |
| |/ / / / / / / / / / / / / | |||||
| * / / / / / / / / / / / / | 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 | 6 | -113/+1 |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar | Richard van der Hoff | 2018-10-29 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Remember to copy the avatar on room upgrades | Richard van der Hoff | 2018-10-26 | 2 | -1/+3 |
* | | | | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_pls | Richard van der Hoff | 2018-10-29 | 2 | -44/+82 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 2 | -44/+82 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 9 | -47/+325 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | fix broken test | Richard van der Hoff | 2018-10-25 | 1 | -9/+1 |
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-10-25 | 1 | -0/+1 |
| * | | | | | | | | | | | | 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 | 2 | -1/+2 |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 6 | -202/+378 |
* | | | | | | | | | | | | Merge pull request #4089 from dekonnection/master | Richard van der Hoff | 2018-10-25 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Make Docker image listening on ipv6 as well as ipv4 | Cédric Laudrel | 2018-10-25 | 2 | -2/+3 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 11 | -485/+714 |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-10-25 | 2 | -2/+12 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #4072 from steamp0rt/patch-1 | Richard van der Hoff | 2018-10-23 | 2 | -2/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | README.rst: fix minor grammar | Richard van der Hoff | 2018-10-22 | 1 | -3/+3 |
| | * | | | | | | | | | | Whoops! | steamport | 2018-10-19 | 1 | -1/+1 |
| | * | | | | | | | | | | I HATE RST | steamport | 2018-10-19 | 1 | -0/+1 |
| | * | | | | | | | | | | Fix | steamport | 2018-10-19 | 1 | -3/+4 |
| | * | | | | | | | | | | Fix formatting. | steamport | 2018-10-19 | 1 | -0/+1 |
| | * | | | | | | | | | | Add CL | steamport | 2018-10-19 | 1 | -0/+1 |
| | * | | | | | | | | | | Add Caddy example to README | steamport | 2018-10-19 | 1 | -0/+6 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 8 | -15/+256 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... | Erik Johnston | 2018-10-25 | 91 | -948/+2364 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Use allow/deny | Erik Johnston | 2018-10-25 | 3 | -11/+11 |
| * | | | | | | | | | | | | Use match rather than search | Erik Johnston | 2018-10-24 | 1 | -2/+3 |
| * | | | | | | | | | | | | Add tests for alias creation rules | Erik Johnston | 2018-10-19 | 1 | -0/+48 |
| * | | | | | | | | | | | | Add tests for config generation | Erik Johnston | 2018-10-19 | 1 | -0/+67 |
| * | | | | | | | | | | | | Anchor returned regex to start and end of string | Erik Johnston | 2018-10-19 | 1 | -2/+6 |
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-19 | 1 | -0/+1 |
| * | | | | | | | | | | | | 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 | 6 | -33/+94 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 | 4 | -18/+51 |
| * | | | | | | | | | | | | 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 | 50 | -383/+1704 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | remove white space | Neil Johnson | 2018-10-23 | 2 | -3/+1 |
| * | | | | | | | | | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 5 | -27/+55 |
* | | | | | | | | | | | | | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin | Neil Johnson | 2018-10-25 | 6 | -23/+101 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea... | Neil Johnson | 2018-10-25 | 142 | -1205/+4207 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | oops, run the check_isort build | Richard van der Hoff | 2018-10-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Only cache the wheels | Richard van der Hoff | 2018-10-25 | 1 | -2/+10 |
* | | | | | | | | | | | | | | Combine the pep8 and check_isort builds into one | Richard van der Hoff | 2018-10-25 | 1 | -4/+1 |
* | | | | | | | | | | | | | | disable coverage checking | Richard van der Hoff | 2018-10-25 | 1 | -4/+1 |
* | | | | | | | | | | | | | | only fetch develop for check-newsfragments | Richard van der Hoff | 2018-10-24 | 1 | -4/+4 |
* | | | | | | | | | | | | | | Disable newsfragment checks on branch builds | Richard van der Hoff | 2018-10-24 | 1 | -1/+3 |
* | | | | | | | | | | | | | | reduce git clone depth | Richard van der Hoff | 2018-10-24 | 1 | -0/+4 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | fix branch regexp | Richard van der Hoff | 2018-10-24 | 1 | -1/+1 |
* | | | | | | | | | | | | | also build on release branches | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 |
* | | | | | | | | | | | | | Disable travis-ci branch builds for most branches | Richard van der Hoff | 2018-10-24 | 1 | -0/+6 |
* | | | | | | | | | | | | | Merge pull request #4083 from matrix-org/rav/fix_event_filter_validation | Richard van der Hoff | 2018-10-24 | 3 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid... | Richard van der Hoff | 2018-10-24 | 21 | -81/+1344 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 12 | -20/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 12 | -20/+21 |
* | | | | | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 9 | -61/+1323 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | isort | Erik Johnston | 2018-10-24 | 1 | -4/+1 |
| * | | | | | | | | | | | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| * | | | | | | | | | | | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 5 | -13/+13 |
| * | | | | | | | | | | | | | | Update event_auth table for rejected events | Erik Johnston | 2018-10-16 | 1 | -15/+21 |