summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* changelog github/matthew/fix-4329 matthew/fix-4329Matthew Hodgson2018-12-271-0/+1
* fix NPE in /messages by checking if all events were filtered outMatthew Hodgson2018-12-271-10/+11
* Log roomid along with Unknown room (#4297)Will Hunt2018-12-242-1/+2
* Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-243-1/+6
|\
| * NewsfileErik Johnston2018-12-181-0/+1
| * Add v2 room versionErik Johnston2018-12-182-1/+5
* | Return well_known in /login response (#4319)Richard van der Hoff2018-12-243-7/+15
* | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5Richard van der Hoff2018-12-232-1/+24
|\ \
| * | Fix test_metrics.py compatibility prometheus_client 0.5Maarten de Vries2018-12-212-1/+24
* | | Merge pull request #4316 from matrix-org/rav/fix_docker_uploadRichard van der Hoff2018-12-212-2/+3
|\ \ \
| * | | Fix circleci config for synapse:latest docker uploadRichard van der Hoff2018-12-212-2/+3
| |/ /
* | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-2211-46/+157
* | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-222-35/+36
* | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-228-272/+590
* | | Make the dependencies more like a standard Python project and hook up the opt...Amber Brown2018-12-227-158/+111
|/ /
* | Merge branch 'master' into developRichard van der Hoff2018-12-201-2/+7
|\ \
| * | Mention updating extensions github/release-v0.34.0 release-v0.34.0Richard van der Hoff2018-12-201-2/+7
* | | Merge branch 'master' into developRichard van der Hoff2018-12-201-3/+4
|\| |
| * | clarify that installing -py3 removes the old pkgRichard van der Hoff2018-12-201-3/+4
* | | Merge branch 'master' into developRichard van der Hoff2018-12-201-1/+8
|\| |
| * | buster is a thingRichard van der Hoff2018-12-201-1/+8
* | | Merge branch 'master' into developRichard van der Hoff2018-12-2042-29/+2514
|\| |
| * | Clarify that py2 packages will continue to exist v0.34.0Richard van der Hoff2018-12-201-0/+4
| * | document supported python 3 versionsRichard van der Hoff2018-12-202-5/+9
| * | more changelog fixRichard van der Hoff2018-12-201-1/+1
| * | minor changelog tweaksRichard van der Hoff2018-12-201-4/+4
| * | fix UPGRADE formattingRichard van der Hoff2018-12-201-6/+6
| * | Prepare 0.34 releaseRichard van der Hoff2018-12-207-24/+18
| * | Update log config for debian packagesRichard van der Hoff2018-12-201-0/+1
| * | Debian packaging via dh_virtualenvRichard van der Hoff2018-12-2041-2/+2481
| |\ \
| | * | Debian packaging via dh_virtualenv (#4285)Richard van der Hoff2018-12-2036-509/+310
| | * | import from package-debian-synapseAmber Brown2018-12-2038-0/+2678
| * | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-202-1/+3
| * | | Improved welcome page (#4294)Nad Chishtie2018-12-142-25/+63
| * | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-142-1/+2
| |/ /
* | | Merge pull request #4309 from KB1RD/KB1RD-fixesRichard van der Hoff2018-12-192-3/+8
|\ \ \
| * | | Create 4309.bugfixNathan Pennie2018-12-191-0/+1
| * | | Fixed line lengthNathan Pennie2018-12-191-1/+5
| * | | Fix the variable names used for account_dataNathan Pennie2018-12-191-3/+3
|/ / /
* | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305)Neil Johnson2018-12-182-1/+2
* | | create support user (#4141)Neil Johnson2018-12-1420-47/+371
* | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-142-1/+2
* | | Improved welcome page (#4294)Nad Chishtie2018-12-142-25/+63
* | | Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_linkRichard van der Hoff2018-12-112-1/+2
|\ \ \
| * | | Update CONTRIBUTING.rstMichael Kaye2018-12-111-1/+1
| * | | changelogMichael Kaye2018-12-071-0/+1
| * | | Update link to kernel.org DCO usageMichael Kaye2018-12-071-1/+1
* | | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-1143-98/+146
|\ \ \ \ | | |/ / | |/| |
| * | | 0.34.0rc2 v0.34.0rc2Richard van der Hoff2018-12-115-4/+17
| * | | remove changelog filesRichard van der Hoff2018-12-1134-36/+0
| * | | Merge pull request #4290 from matrix-org/rav/remove_webclientRichard van der Hoff2018-12-116-58/+44
| |\ \ \
| | * | | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-116-58/+44
| * | | | Merge pull request #4289 from matrix-org/rav/welcome_pageRichard van der Hoff2018-12-113-0/+30
| |\ \ \ \
| | * \ \ \ Merge branch 'rav/disable_pager_in_ci' into rav/welcome_pageRichard van der Hoff2018-12-112-2/+3
| | |\ \ \ \
| | * | | | | Add a welcome page to the static resourcesRichard van der Hoff2018-12-113-0/+30
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #4291 from matrix-org/rav/disable_pager_in_ciRichard van der Hoff2018-12-112-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Disable pager for ci scriptRichard van der Hoff2018-12-112-2/+3
| | |/ / /
| * | | | fix upgrade.rst link again v0.34.0rc1Richard van der Hoff2018-12-041-1/+1
| * | | | Fix link to upgrade notesRichard van der Hoff2018-12-041-1/+1
| * | | | fix typo in changelogRichard van der Hoff2018-12-041-1/+1
| * | | | Prepare 0.34.0rc1Richard van der Hoff2018-12-042-2/+56
| |/ / /
* | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-112-1/+3
* | | | Merge pull request #4279 from matrix-org/hs/fix-config-corsWill Hunt2018-12-102-1/+2
|\ \ \ \
| * | | | Move imports to one lineWill Hunt2018-12-101-4/+1
| * | | | Use `send_cors`Will Hunt2018-12-101-4/+1
| * | | | changelog & isortWill Hunt2018-12-092-1/+6
| * | | | Make /config more CORS-yWill Hunt2018-12-091-1/+3
| | |/ / | |/| |
* | | | Merge pull request #4283 from matrix-org/erikj/isort_dfErik Johnston2018-12-102-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | NewsfileErik Johnston2018-12-101-0/+1
| * | | Make isort tox check print diff when it failsErik Johnston2018-12-101-2/+2
|/ / /
* | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-076-15/+39
* | | Update the example systemd config to use a virtualenv (#4273)Richard van der Hoff2018-12-073-22/+32
* | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-079-2/+258
* | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-075-32/+184
* | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-067-169/+4
* | | drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-062-7/+7
* | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-055-0/+140
|/ /
* | Merge pull request #4260 from matrix-org/rav/python3Richard van der Hoff2018-12-043-53/+82
|\ \
| * | Notes on upgrading to python3, and README updates.Richard van der Hoff2018-12-043-53/+82
* | | Merge pull request #4261 from matrix-org/rav/docker/remove_log_fileRichard van der Hoff2018-12-042-3/+2
|\ \ \
| * | | Remove obsolete settings from docker homeserver.yamlRichard van der Hoff2018-12-042-3/+2
| |/ /
* | | Merge pull request #4005 from matrix-org/michaelkaye/move_to_docker_labelRichard van der Hoff2018-12-041-8/+4
|\ \ \ | |/ / |/| |
| * | Use labels to tag builds with their SHA1 version.Michael Kaye2018-10-041-8/+4
* | | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-043-9/+26
* | | Fix non-ASCII pushrules (#4248)Amber Brown2018-12-042-12/+24
* | | Merge pull request #4210 from axelsimon/patch-1Richard van der Hoff2018-12-041-2/+2
|\ \ \
| * | | Replace mentions of Vector with Riotaxel simon2018-11-201-2/+2
| | |/ | |/|
* | | Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-044-1/+21
* | | Add note to UPGRADE.rst about removing riot.im from list of trusted identity ...Aaron Raimist2018-12-042-0/+10
* | | add more detail to logging regarding "More than one row matched" error (#4234)Ben Parsons2018-12-042-6/+7
* | | Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-043-8/+47
* | | Merge pull request #4244 from aaronraimist/drop-sent-txtRichard van der Hoff2018-12-047-74/+4
|\ \ \
| * | | Add changelogAaron Raimist2018-12-011-0/+1
| * | | Drop sent_transactionsAaron Raimist2018-12-016-74/+3
* | | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205)Richard van der Hoff2018-12-044-3/+99
* | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3Richard van der Hoff2018-12-042-1/+2
|\ \ \ \
| * | | | changelogAmber Brown2018-12-031-0/+1
| * | | | fix type errorAmber Brown2018-12-031-1/+1
* | | | | Merge pull request #4257 from aaronraimist/add-editorconfigRichard van der Hoff2018-12-043-0/+11
|\ \ \ \ \
| * | | | | Add a basic .editorconfigAaron Raimist2018-12-033-0/+11
| |/ / / /
* / / / / Run the AS senders as background processes (#4189)Richard van der Hoff2018-12-042-12/+26
|/ / / /
* / / / Workaround for non-ascii event ids (#4241)Richard van der Hoff2018-12-032-1/+4
|/ / /
* | | Neilj/fix autojoin (#4223)Neil Johnson2018-11-285-3/+36
* | | Report combined coverage to codecov (#4225)Amber Brown2018-11-283-17/+23
* | | Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-282-2/+5
* | | Support m.login.sso (#4220)Richard van der Hoff2018-11-275-52/+50
* | | Check logcontexts before and after each test (#4190)Richard van der Hoff2018-11-273-8/+22
* | | Fix more logcontext leaks in tests (#4209)Richard van der Hoff2018-11-272-1/+3
* | | Do a GC after each test to fix logcontext leaks (#4227)Richard van der Hoff2018-11-273-3/+71
* | | Merge pull request #4214 from matrix-org/rav/ignore_pycacheAmber Brown2018-11-202-1/+2
|\ \ \
| * | | Ignore __pycache__ directories in schema delta dirRichard van der Hoff2018-11-202-1/+2
|/ / /
* | | Remove riot.im from the list of trusted Identity Servers in the default confi...Neil Johnson2018-11-203-2/+7
* | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixesRichard van der Hoff2018-11-206-7/+12
|\ \ \
| * | | changelogRichard van der Hoff2018-11-191-0/+1
| * | | Fix logcontext leak in test_url_previewRichard van der Hoff2018-11-191-1/+2
| * | | Fix logcontext leak in http pusher testRichard van der Hoff2018-11-191-1/+2
| * | | Fix some tests which leaked logcontextsRichard van der Hoff2018-11-192-3/+4
| * | | Fix logcontext leak in EmailPusherRichard van der Hoff2018-11-191-2/+3
* | | | Merge remote-tracking branch 'origin/master' into developAmber Brown2018-11-1941-40/+62
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tag 'v0.33.9' 0.34.0rc2Amber Brown2018-11-1995-969/+2846
| |\ \ \
| | * | | towncrier v0.33.9Amber Brown2018-11-191-0/+6
| | * | | versionAmber Brown2018-11-191-1/+1
| | * | | release 0.33.9rc1 v0.33.9rc1 github/release-v0.33.9 release-v0.33.9Neil Johnson2018-11-1441-40/+56
* | | | | Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-193-22/+121
| |_|/ / |/| | |
* | | | Merge pull request #4182 from aaronraimist/update-issue-templateRichard van der Hoff2018-11-196-10/+57
|\ \ \ \
| * | | | Fix caseAaron Raimist2018-11-131-1/+1
| * | | | Add SUPPORT.mdAaron Raimist2018-11-131-0/+3
| * | | | Add changelogAaron Raimist2018-11-131-0/+1
| * | | | Add a pull request template and add multiple issue templatesAaron Raimist2018-11-134-10/+53
* | | | | Merge pull request #4200 from aaronraimist/vacuum-full-noteRichard van der Hoff2018-11-192-0/+9
|\ \ \ \ \
| * | | | | Add changelogAaron Raimist2018-11-181-0/+1
| * | | | | Add a note saying you need to manually reclaim disk spaceAaron Raimist2018-11-181-0/+8
|/ / / / /
* | | | | Merge pull request #4193 from kivikakk/add-openbsd-prereqAmber Brown2018-11-172-1/+2
|\ \ \ \ \
| * | | | | add changelog.d entryAshe Connor2018-11-171-0/+1
| * | | | | add jpeg to OpenBSD prereq listAshe Connor2018-11-171-1/+1
* | | | | | Merge pull request #4192 from matrix-org/travis/fix-consent-urlsTravis Ralston2018-11-164-4/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix the terms UI auth testsTravis Ralston2018-11-151-1/+1
| * | | | | ChangelogTravis Ralston2018-11-151-0/+1
| * | | | | Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-152-3/+3
|/ / / / /
* | | | | Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-156-90/+271
* | | | | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-157-35/+92
* | | | | Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-153-9/+100
* | | | | Add a coveragerc (#4180)Amber Brown2018-11-154-2/+27
* | | | | Merge pull request #4188 from matrix-org/rav/readme-update-1Neil Johnson2018-11-152-3/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update README for #1491 fixRichard van der Hoff2018-11-152-3/+5
|/ / / /
* | | | Merge pull request #4184 from matrix-org/rav/fix_public_consentRichard van der Hoff2018-11-143-5/+16
|\ \ \ \
| * | | | changelogRichard van der Hoff2018-11-141-0/+1
| * | | | Add a test for the public T&Cs formRichard van der Hoff2018-11-142-1/+8
| * | | | Fix an internal server error when viewing the public privacy policyRichard van der Hoff2018-11-141-4/+7
|/ / / /
* | | | Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbersDavid Baker2018-11-143-2/+71
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a...David Baker2018-11-09140-758/+2475
| |\ \ \ \
| * | | | | pep8David Baker2018-11-091-1/+2
| * | | | | add docsDavid Baker2018-11-091-1/+4
| * | | | | Remove unnecessary str()David Baker2018-11-091-1/+1
| * | | | | Cast to int here tooDavid Baker2018-10-301-0/+5
| * | | | | Cast bacjup version to int when queryingDavid Baker2018-10-301-1/+6
| * | | | | Convert version back to a stringDavid Baker2018-10-301-0/+1
| * | | | | news fragmentDavid Baker2018-10-301-0/+1
| * | | | | Try & make it work on postgresDavid Baker2018-10-301-2/+2
| * | | | | Make e2e backup versions numeric in the DBDavid Baker2018-10-293-2/+55
* | | | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_eventsErik Johnston2018-11-093-89/+75
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove hack to support rejoining roomsErik Johnston2018-11-091-74/+42
| * | | | | Simplify to always drop events if server isn't in the roomErik Johnston2018-11-091-14/+9
| * | | | | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| * | | | | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| * | | | | NewsfileErik Johnston2018-11-081-0/+1
| * | | | | Drop PDUs of unknown roomsErik Johnston2018-11-081-1/+23
* | | | | | Merge pull request #4168 from matrix-org/babolivier/federation-client-content...Brendan Abolivier2018-11-091-2/+7
|\ \ \ \ \ \
| * | | | | | Add a Content-Type header on POST requests to the federation clientBrendan Abolivier2018-11-091-2/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparisonErik Johnston2018-11-083-1/+20
|\ \ \ \ \ \
| * | | | | | Add test to assert set_e2e_device_keys correctly returns False on no-opErik Johnston2018-11-081-0/+15
| * | | | | | Lets convert bytes to unicode insteadErik Johnston2018-11-081-5/+3
| * | | | | | NewsfileErik Johnston2018-11-081-0/+1
| * | | | | | Fix noop checks when updating device keysErik Johnston2018-11-081-0/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4163 from matrix-org/rav/fix_consent_on_py3Richard van der Hoff2018-11-083-6/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix parse_string docstringRichard van der Hoff2018-11-081-5/+4
| * | | | | changelogRichard van der Hoff2018-11-081-0/+1
| * | | | | Fix encoding error for consent form on python3hera2018-11-081-1/+3
|/ / / / /
* | | | | Port hash_password to Python 3 (#4161)Amber Brown2018-11-083-8/+36
* | | | | Fix URL preview bugs (type error when loading cache from db, content-type inc...Amber Brown2018-11-085-10/+187
* | | | | Merge pull request #4155 from rubo77/purge-apiRichard van der Hoff2018-11-074-0/+212
|\ \ \ \ \
| * | | | | add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/rubo772018-11-074-0/+212
* | | | | | Remove some boilerplate in tests (#4156)Amber Brown2018-11-0711-216/+162
|/ / / / /
* | | | | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-0610-11/+65
* | | | | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-054-52/+71
* | | | | Tests for user consent resource (#4140)Amber Brown2018-11-065-6/+140
* | | | | Add some tests for the HTTP pusher (#4149)Amber Brown2018-11-062-0/+160
* | | | | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-0610-45/+62
* | | | | Set the encoding to UTF8 in the default logconfig (#4138)Amber Brown2018-11-032-0/+2
* | | | | Merge pull request #4137 from matrix-org/erikj/clean_up_eventsErik Johnston2018-11-026-10/+8
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-11-021-0/+1
| * | | | | Clean up event accesses and testsErik Johnston2018-11-025-10/+7
* | | | | | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-035-5/+155
* | | | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_lockingRichard van der Hoff2018-11-024-11/+129
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-11-021-0/+1
| * | | | | | Add unique indexes to a couple of tablesRichard van der Hoff2018-11-023-6/+88
| * | | | | | Remove redundant database locks for device list updatesRichard van der Hoff2018-11-021-5/+40
* | | | | | | Merge pull request #4133 from matrix-org/travis/fix-terms-authRichard van der Hoff2018-11-022-1/+2
|\ \ \ \ \ \ \
| * | | | | | | ChangelogTravis Ralston2018-11-011-0/+1
| * | | | | | | Fix logic error that prevented guests from seeing the privacy policyTravis Ralston2018-11-011-1/+1
* | | | | | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_noneErik Johnston2018-11-023-2/+103
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | NewsfileErik Johnston2018-11-021-0/+1
| * | | | | | | Fix None exception in state res v2Erik Johnston2018-11-022-2/+102
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3778 from z3ntu/patch-1Richard van der Hoff2018-11-012-2/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | changelog.d entry somehow got lostLuca Weiss2018-09-111-0/+1
| * | | | | | Fix build of Docker image with docker-composeLuca Weiss2018-09-111-2/+4
* | | | | | | Merge pull request #4004 from matrix-org/travis/login-termsTravis Ralston2018-11-019-27/+277
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | The tests also need a version parameter Travis Ralston2018-10-311-1/+1
| * | | | | | Include a version query string arg for the consent routeTravis Ralston2018-10-312-3/+8
| * | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-3191-1262/+2561
| |\ \ \ \ \ \
| * | | | | | | pep8Travis Ralston2018-10-242-6/+3
| * | | | | | | It helps to import thingsTravis Ralston2018-10-241-0/+16
| * | | | | | | Move test to where the other integration tests areTravis Ralston2018-10-242-97/+109
| * | | | | | | Fix testTravis Ralston2018-10-241-25/+50
| * | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-2490-971/+2312
| |\ \ \ \ \ \ \
| * | | | | | | | Fix terms UI auth testTravis Ralston2018-10-181-2/+5
| * | | | | | | | Test for terms UI authTravis Ralston2018-10-181-0/+70
| * | | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1843-163/+308
| |\ \ \ \ \ \ \ \
| * | | | | | | | | pep8Travis Ralston2018-10-153-14/+3
| * | | | | | | | | Ensure the terms params are actually providedTravis Ralston2018-10-151-0/+1
| * | | | | | | | | Python is hardTravis Ralston2018-10-151-5/+6
| * | | | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1513-3/+1447
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update login terms structure for the proposed language supportTravis Ralston2018-10-121-4/+7
| * | | | | | | | | | Rely on the lack of ?u to represent public accessTravis Ralston2018-10-122-10/+6
| * | | | | | | | | | Update documentation and templates for new consentTravis Ralston2018-10-122-10/+18
| * | | | | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1285-190/+313
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ChangelogTravis Ralston2018-10-031-0/+1
| * | | | | | | | | | | Use a flag rather than a new route for the public policyTravis Ralston2018-10-033-17/+25
| * | | | | | | | | | | Auto-consent to the privacy policy if the user registered with termsTravis Ralston2018-10-031-0/+6
| * | | | | | | | | | | Make the terms flow requriedTravis Ralston2018-10-031-4/+4
| * | | | | | | | | | | Flesh out the fallback auth for termsTravis Ralston2018-10-031-7/+67
| * | | | | | | | | | | Supply params for terms auth stageTravis Ralston2018-10-031-0/+9
| * | | | | | | | | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-034-0/+40
* | | | | | | | | | | | Merge pull request #4128 from matrix-org/erikj/state_res_v2_versionErik Johnston2018-11-013-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | NewsfileErik Johnston2018-11-011-0/+1
| * | | | | | | | | | | | Add STATE_V2_TEST room versionErik Johnston2018-11-012-2/+7
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-11-0131-31/+64
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'release-v0.33.8'Amber Brown2018-11-01108-1814/+4145
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | changelog v0.33.8 github/release-v0.33.8 release-v0.33.8Amber Brown2018-11-011-0/+6
| | * | | | | | | | | | versionAmber Brown2018-11-011-1/+1
| | * | | | | | | | | | changelog v0.33.8rc2Amber Brown2018-10-312-1/+10
| | * | | | | | | | | | version bumpAmber Brown2018-10-311-1/+1
| | * | | | | | | | | | Fix search 500ing (#4122)Amber Brown2018-10-313-3/+112
| | * | | | | | | | | | changelog v0.33.8rc1Amber Brown2018-10-2930-30/+47
| | * | | | | | | | | | version bumpAmber Brown2018-10-291-1/+1
* | | | | | | | | | | | Merge pull request #4101 from matrix-org/rav/aliases_for_upgradesRichard van der Hoff2018-10-313-14/+141
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid else clause on exception for clarityRichard van der Hoff2018-10-311-2/+1
| * | | | | | | | | | | | Attempt to move room aliases on room upgradesRichard van der Hoff2018-10-313-14/+142
* | | | | | | | | | | | | Merge pull request #4125 from MazeChaZer/fix-typo-in-docker-composeRichard van der Hoff2018-10-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix typo in docker-compose.ymlJonas Schürmann2018-10-311-1/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-21 07:19:27 +0000