Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Create 4309.bugfix | Nathan Pennie | 2018-12-19 | 1 | -0/+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 | 2 | -1/+2 |
* | create support user (#4141) | Neil Johnson | 2018-12-14 | 20 | -47/+371 |
* | Settings Fix deleting e2e room keys on xenial (#4295) | Amber Brown | 2018-12-14 | 2 | -1/+2 |
* | Improved welcome page (#4294) | Nad Chishtie | 2018-12-14 | 2 | -25/+63 |
* | Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_link | Richard van der Hoff | 2018-12-11 | 2 | -1/+2 |
|\ | |||||
| * | Update CONTRIBUTING.rst | Michael Kaye | 2018-12-11 | 1 | -1/+1 |
| * | changelog | Michael Kaye | 2018-12-07 | 1 | -0/+1 |
| * | Update link to kernel.org DCO usage | Michael Kaye | 2018-12-07 | 1 | -1/+1 |
* | | Merge branch 'release-v0.34.0' into develop | Richard van der Hoff | 2018-12-11 | 43 | -98/+146 |
|\ \ | |||||
| * | | 0.34.0rc2 v0.34.0rc2 | Richard van der Hoff | 2018-12-11 | 5 | -4/+17 |
| * | | remove changelog files | Richard van der Hoff | 2018-12-11 | 34 | -36/+0 |
| * | | Merge pull request #4290 from matrix-org/rav/remove_webclient | Richard van der Hoff | 2018-12-11 | 6 | -58/+44 |
| |\ \ | |||||
| | * | | Stop installing Matrix Console by default | Richard van der Hoff | 2018-12-11 | 6 | -58/+44 |
| * | | | Merge pull request #4289 from matrix-org/rav/welcome_page | Richard van der Hoff | 2018-12-11 | 3 | -0/+30 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'rav/disable_pager_in_ci' into rav/welcome_page | Richard van der Hoff | 2018-12-11 | 2 | -2/+3 |
| | |\ \ \ | |||||
| | * | | | | Add a welcome page to the static resources | Richard van der Hoff | 2018-12-11 | 3 | -0/+30 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #4291 from matrix-org/rav/disable_pager_in_ci | Richard van der Hoff | 2018-12-11 | 2 | -2/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Disable pager for ci script | Richard van der Hoff | 2018-12-11 | 2 | -2/+3 |
| | |/ / | |||||
| * | | | fix upgrade.rst link again v0.34.0rc1 | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 |
| * | | | Fix link to upgrade notes | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 |
| * | | | fix typo in changelog | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 |
| * | | | Prepare 0.34.0rc1 | Richard van der Hoff | 2018-12-04 | 2 | -2/+56 |
| |/ / | |||||
* | | | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-11 | 2 | -1/+3 |
* | | | Merge pull request #4279 from matrix-org/hs/fix-config-cors | Will Hunt | 2018-12-10 | 2 | -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 | 2 | -1/+6 |
| * | | | Make /config more CORS-y | Will Hunt | 2018-12-09 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #4283 from matrix-org/erikj/isort_df | Erik Johnston | 2018-12-10 | 2 | -2/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Newsfile | Erik Johnston | 2018-12-10 | 1 | -0/+1 |
| * | | Make isort tox check print diff when it fails | Erik Johnston | 2018-12-10 | 1 | -2/+2 |
|/ / | |||||
* | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 6 | -15/+39 |
* | | Update the example systemd config to use a virtualenv (#4273) | Richard van der Hoff | 2018-12-07 | 3 | -22/+32 |
* | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 9 | -2/+258 |
* | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 5 | -32/+184 |
* | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 7 | -169/+4 |
* | | drop undocumented dependency on dateutil (#4266) | Richard van der Hoff | 2018-12-06 | 2 | -7/+7 |
* | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 5 | -0/+140 |
|/ | |||||
* | Merge pull request #4260 from matrix-org/rav/python3 | Richard van der Hoff | 2018-12-04 | 3 | -53/+82 |
|\ | |||||
| * | Notes on upgrading to python3, and README updates. | Richard van der Hoff | 2018-12-04 | 3 | -53/+82 |
* | | Merge pull request #4261 from matrix-org/rav/docker/remove_log_file | Richard van der Hoff | 2018-12-04 | 2 | -3/+2 |
|\ \ | |||||
| * | | Remove obsolete settings from docker homeserver.yaml | Richard van der Hoff | 2018-12-04 | 2 | -3/+2 |
| |/ | |||||
* | | Merge pull request #4005 from matrix-org/michaelkaye/move_to_docker_label | Richard van der Hoff | 2018-12-04 | 1 | -8/+4 |
|\ \ | |/ |/| | |||||
| * | Use labels to tag builds with their SHA1 version. | Michael Kaye | 2018-10-04 | 1 | -8/+4 |
* | | Add an option to enable recording IPs for appservice users (#3831) | Travis Ralston | 2018-12-04 | 3 | -9/+26 |
* | | Fix non-ASCII pushrules (#4248) | Amber Brown | 2018-12-04 | 2 | -12/+24 |
* | | Merge pull request #4210 from axelsimon/patch-1 | Richard van der Hoff | 2018-12-04 | 1 | -2/+2 |
|\ \ | |||||
| * | | Replace mentions of Vector with Riot | axel simon | 2018-11-20 | 1 | -2/+2 |
* | | | Add an option to disable search for homeservers which may not be interested i... | Travis Ralston | 2018-12-04 | 4 | -1/+21 |
* | | | Add note to UPGRADE.rst about removing riot.im from list of trusted identity ... | Aaron Raimist | 2018-12-04 | 2 | -0/+10 |
* | | | add more detail to logging regarding "More than one row matched" error (#4234) | Ben Parsons | 2018-12-04 | 2 | -6/+7 |
* | | | Fix UnicodeDecodeError when postgres is not configured in english (#4253) | Richard van der Hoff | 2018-12-04 | 3 | -8/+47 |
* | | | Merge pull request #4244 from aaronraimist/drop-sent-txt | Richard van der Hoff | 2018-12-04 | 7 | -74/+4 |
|\ \ \ | |||||
| * | | | Add changelog | Aaron Raimist | 2018-12-01 | 1 | -0/+1 |
| * | | | Drop sent_transactions | Aaron Raimist | 2018-12-01 | 6 | -74/+3 |
* | | | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205) | Richard van der Hoff | 2018-12-04 | 4 | -3/+99 |
* | | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3 | Richard van der Hoff | 2018-12-04 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | changelog | Amber Brown | 2018-12-03 | 1 | -0/+1 |
| * | | | | fix type error | Amber Brown | 2018-12-03 | 1 | -1/+1 |
* | | | | | 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 |