summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
* | | | | | | | | | | | | | | Log some bits about event creation (#4121)Richard van der Hoff2018-10-313-0/+8
* | | | | | | | | | | | | | | Merge pull request #4124 from matrix-org/rav/fix_toxRichard van der Hoff2018-10-313-19/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | changelogRichard van der Hoff2018-10-301-0/+1
| * | | | | | | | | | | | | | Attempt to fix tox installsRichard van der Hoff2018-10-302-19/+14
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120)Amber Brown2018-10-313-106/+13
* | | | | | | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119)Amber Brown2018-10-315-113/+2
* | | | | | | | | | | | | | Fix search 500ing (#4122)Amber Brown2018-10-313-3/+112
* | | | | | | | | | | | | | Remove the unused /pull federation API (#4118)Amber Brown2018-10-313-14/+1
* | | | | | | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groupsErik Johnston2018-10-305-48/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Move _find_unreferenced_groupsErik Johnston2018-10-292-81/+83
| * | | | | | | | | | | | | | Fix set operations thinkoErik Johnston2018-10-291-3/+4
| * | | | | | | | | | | | | | Don't make temporary listErik Johnston2018-10-291-3/+2
| * | | | | | | | | | | | | | Make SQL a bit cleanerErik Johnston2018-10-291-3/+2
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-26115-1683/+3799
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | pep8Erik Johnston2018-10-191-1/+1
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-1970-301/+2020
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Batch process handling state groupsErik Johnston2018-10-192-101/+92
| * | | | | | | | | | | | | | | Fix up commentsErik Johnston2018-10-121-3/+3
| * | | | | | | | | | | | | | | NewsfileErik Johnston2018-10-041-0/+1
| * | | | | | | | | | | | | | | Add state_group index to event_to_state_groupsErik Johnston2018-10-043-1/+27
| * | | | | | | | | | | | | | | Delete unreferened state groups during purgeErik Johnston2018-10-042-6/+77
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Write some tests for the email pusher (#4095)Amber Brown2018-10-3010-13/+182
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #4109 from matrix-org/erikj/repl_devicesErik Johnston2018-10-292-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | NewsfileErik Johnston2018-10-291-0/+1
| * | | | | | | | | | | | | | Deduplicate device updates sent over replicationErik Johnston2018-10-291-1/+5
* | | | | | | | | | | | | | | Merge pull request #4111 from matrix-org/erikj/repl_namesErik Johnston2018-10-292-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | NewsfileErik Johnston2018-10-291-0/+1
| |/ / / / / / / / / / / / / /
| * / / / / / / / / / / / / / Don't truncate command name in metricsErik Johnston2018-10-291-2/+2
|/ / / / / / / / / / / / / /
* | | | / / / / / / / / / / Delete the disused & unspecced identicon functionality (#4106)Amber Brown2018-10-296-113/+1
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatarRichard van der Hoff2018-10-292-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remember to copy the avatar on room upgradesRichard van der Hoff2018-10-262-1/+3
* | | | | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_plsRichard van der Hoff2018-10-292-44/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Better handling of odd PLs during room upgradesRichard van der Hoff2018-10-272-44/+82
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgradesRichard van der Hoff2018-10-299-47/+325
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | optimise state copyingRichard van der Hoff2018-10-261-7/+5
| * | | | | | | | | | | | | Address review commentsRichard van der Hoff2018-10-262-12/+25
| * | | | | | | | | | | | | fix broken testRichard van der Hoff2018-10-251-9/+1
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-10-251-0/+1
| * | | | | | | | | | | | | restrict PLs in old roomRichard van der Hoff2018-10-251-1/+43
| * | | | | | | | | | | | | copy stateRichard van der Hoff2018-10-251-11/+26
| * | | | | | | | | | | | | preserve PLsRichard van der Hoff2018-10-251-1/+7
| * | | | | | | | | | | | | preserve room visibilityRichard van der Hoff2018-10-252-4/+6
| * | | | | | | | | | | | | Basic initial support for room upgradesRichard van der Hoff2018-10-255-0/+208
| * | | | | | | | | | | | | Allow power_level_content_override=None for _send_events_for_new_roomRichard van der Hoff2018-10-251-5/+6
| * | | | | | | | | | | | | Make room_member_handler a member of RoomCreationHandlerRichard van der Hoff2018-10-252-8/+7
| * | | | | | | | | | | | | Factor _generate_room_id out of create_roomRichard van der Hoff2018-10-251-22/+23
* | | | | | | | | | | | | | Make the replication logger quieter (#4108)Amber Brown2018-10-292-1/+2
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-266-202/+378
* | | | | | | | | | | | | Merge pull request #4089 from dekonnection/masterRichard van der Hoff2018-10-252-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Make Docker image listening on ipv6 as well as ipv4Cédric Laudrel2018-10-252-2/+3
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-2511-485/+714
* | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-10-252-2/+12
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #4072 from steamp0rt/patch-1Richard van der Hoff2018-10-232-2/+12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | README.rst: fix minor grammarRichard van der Hoff2018-10-221-3/+3
| | * | | | | | | | | | | Whoops!steamport2018-10-191-1/+1
| | * | | | | | | | | | | I HATE RSTsteamport2018-10-191-0/+1
| | * | | | | | | | | | | Fixsteamport2018-10-191-3/+4
| | * | | | | | | | | | | Fix formatting.steamport2018-10-191-0/+1
| | * | | | | | | | | | | Add CLsteamport2018-10-191-0/+1
| | * | | | | | | | | | | Add Caddy example to READMEsteamport2018-10-191-0/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_listErik Johnston2018-10-258-15/+256
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-2591-948/+2364
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use allow/denyErik Johnston2018-10-253-11/+11
| * | | | | | | | | | | | | Use match rather than searchErik Johnston2018-10-241-2/+3
| * | | | | | | | | | | | | Add tests for alias creation rulesErik Johnston2018-10-191-0/+48
| * | | | | | | | | | | | | Add tests for config generationErik Johnston2018-10-191-0/+67
| * | | | | | | | | | | | | Anchor returned regex to start and end of stringErik Johnston2018-10-191-2/+6
| * | | | | | | | | | | | | NewsfileErik Johnston2018-10-191-0/+1
| * | | | | | | | | | | | | Add config option to control alias creationErik Johnston2018-10-195-15/+135
* | | | | | | | | | | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-256-33/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | add new lineNeil Johnson2018-10-251-0/+1
| * | | | | | | | | | | | | improve commentsNeil Johnson2018-10-251-6/+6
| * | | | | | | | | | | | | fix style inconsistenciesNeil Johnson2018-10-244-18/+51
| * | | | | | | | | | | | | commit transaction before closingNeil Johnson2018-10-241-0/+1
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-2450-383/+1704
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | remove white spaceNeil Johnson2018-10-232-3/+1
| * | | | | | | | | | | | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-235-27/+55
* | | | | | | | | | | | | | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoinNeil Johnson2018-10-256-23/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-25142-1205/+4207
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | oops, run the check_isort buildRichard van der Hoff2018-10-251-1/+1
* | | | | | | | | | | | | | | Only cache the wheelsRichard van der Hoff2018-10-251-2/+10
* | | | | | | | | | | | | | | Combine the pep8 and check_isort builds into oneRichard van der Hoff2018-10-251-4/+1
* | | | | | | | | | | | | | | disable coverage checkingRichard van der Hoff2018-10-251-4/+1
* | | | | | | | | | | | | | | only fetch develop for check-newsfragmentsRichard van der Hoff2018-10-241-4/+4
* | | | | | | | | | | | | | | Disable newsfragment checks on branch buildsRichard van der Hoff2018-10-241-1/+3
* | | | | | | | | | | | | | | reduce git clone depthRichard van der Hoff2018-10-241-0/+4
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | fix branch regexpRichard van der Hoff2018-10-241-1/+1
* | | | | | | | | | | | | | also build on release branchesRichard van der Hoff2018-10-241-0/+1
* | | | | | | | | | | | | | Disable travis-ci branch builds for most branchesRichard van der Hoff2018-10-241-0/+6
* | | | | | | | | | | | | | Merge pull request #4083 from matrix-org/rav/fix_event_filter_validationRichard van der Hoff2018-10-243-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid...Richard van der Hoff2018-10-2421-81/+1344
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-2412-20/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix a number of flake8 errorsRichard van der Hoff2018-10-2412-20/+21
* | | | | | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-249-61/+1323
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | isortErik Johnston2018-10-241-4/+1
| * | | | | | | | | | | | | | | CommentErik Johnston2018-10-241-2/+5
| * | | | | | | | | | | | | | | Rename resolve_events_with_factoryErik Johnston2018-10-245-13/+13
| * | | | | | | | | | | | | | | Update event_auth table for rejected eventsErik Johnston2018-10-161-15/+21
| * | | | | | | | | | | | | | | Fix up use of resolve_events_with_factoryErik Johnston2018-10-161-13/+10
| * | | | | | | | | | | | | | | NewsfileErik Johnston2018-10-161-0/+1
| * | | | | | | | | | | | | | | Add some state res v2 testsErik Johnston2018-10-162-0/+666
| * | | | | | | | | | | | | | | User event.sender rather than alias event.user_idErik Johnston2018-10-161-1/+1
| * | | | | | | | | | | | | | | Add v2 state res algorithm.Erik Johnston2018-10-163-24/+616
| | * | | | | | | | | | | | | | Allow backslashes in event field filtersRichard van der Hoff2018-10-243-2/+16
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-248-141/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix start_pushers vs _start_pushers confusionRichard van der Hoff2018-10-241-3/+3
| * | | | | | | | | | | | | | | sanity-check the is_processing flagRichard van der Hoff2018-10-242-8/+14
| * | | | | | | | | | | | | | | ChangelogRichard van der Hoff2018-10-221-0/+1
| * | | | | | | | | | | | | | | Run PusherPool.start as a background processRichard van der Hoff2018-10-221-5/+7
| * | | | | | | | | | | | | | | Make on_started synchronous tooRichard van der Hoff2018-10-223-11/+21
| * | | | | | | | | | | | | | | Remove redundant run_as_background_process() from pusherpoolRichard van der Hoff2018-10-227-50/+14
| * | | | | | | | | | | | | | | Give pushers their own background logcontextRichard van der Hoff2018-10-222-58/+54
| * | | | | | | | | | | | | | | move get_all_pushers call downRichard van der Hoff2018-10-221-3/+9
| * | | | | | | | | | | | | | | Factor PusherPool._start_pusher out of _start_pushersRichard van der Hoff2018-10-221-18/+33
| * | | | | | | | | | | | | | | Rename _refresh_pusherRichard van der Hoff2018-10-222-3/+4
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creationErik Johnston2018-10-244-64/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | NewsfileErik Johnston2018-10-191-0/+1
| * | | | | | | | | | | | | | Clean up room alias creationErik Johnston2018-10-193-64/+55
* | | | | | | | | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-233-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Comments helpTravis Ralston2018-10-231-0/+5
| * | | | | | | | | | | | | | | isortTravis Ralston2018-10-121-1/+1
| * | | | | | | | | | | | | | | More sane handling of group errors and pep8Travis Ralston2018-10-121-4/+5
| * | | | | | | | | | | | | | | Merge branch 'develop' into travis/fix-federated-group-requestsTravis Ralston2018-10-12120-924/+1167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove debugging statementTravis Ralston2018-09-261-1/+0
| * | | | | | | | | | | | | | | ChangelogTravis Ralston2018-09-261-0/+1
| * | | | | | | | | | | | | | | Handle HttpResponseException more safely for federated groupsTravis Ralston2018-09-261-2/+11
| * | | | | | | | | | | | | | | Fix exception documentation in matrixfederationclient.pyTravis Ralston2018-09-261-6/+6
* | | | | | | | | | | | | | | | Give some more things logcontexts (#4077)Richard van der Hoff2018-10-233-7/+12
* | | | | | | | | | | | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-236-80/+97
* | | | | | | | | | | | | | | | Merge pull request #3698 from spantaleev/add-matrix-docker-ansible-deployRichard van der Hoff2018-10-232-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add information about the matrix-docker-ansible-deploy playbookSlavi Pantaleev2018-10-142-0/+7
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontextsRichard van der Hoff2018-10-222-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Run MAU queries as background processesRichard van der Hoff2018-10-202-8/+23
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutilRichard van der Hoff2018-10-223-10/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Make psutil an explicit dependencyRichard van der Hoff2018-10-193-10/+6
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | uh, Matrix is called Matrix these days...Matthew Hodgson2018-10-211-2/+4
* | | | | | | | | | | | | | | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-2027-518/+511
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'rav/fix_email_templates_4065' into developRichard van der Hoff2018-10-192-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove notes on fallback for email_templatesRichard van der Hoff2018-10-192-8/+0
* | | | | | | | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065Richard van der Hoff2018-10-193-28/+21
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Calculate absolute path for email templatesRichard van der Hoff2018-10-193-28/+21
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Fix manhole on py3 (pt 2) (#4067)Amber Brown2018-10-192-0/+3
* | | | | | | | | | | | | Make the metrics less racy (#4061)Amber Brown2018-10-193-16/+22
* | | | | | | | | | | | | Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3Richard van der Hoff2018-10-192-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | changelogAmber Brown2018-10-191-0/+1
| * | | | | | | | | | | | make a bytestringAmber Brown2018-10-191-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #4057 from matrix-org/rav/use_correct_pythonAmber Brown2018-10-192-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use the right python when starting workersRichard van der Hoff2018-10-182-1/+3
|/ / / / / / / / / / / /
* | | | | | | | | / / / Merge branch 'master' into developRichard van der Hoff2018-10-181-0/+17
|\| | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Add warnings about the upgrade to 0.33.7 github/release-v0.33.7 release-v0.33.7Richard van der Hoff2018-10-181-0/+17
* | | | | | | | | | | remove redundant changelog fileRichard van der Hoff2018-10-181-1/+0
* | | | | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-10-1824-18/+101
|\| | | | | | | | | |
| * | | | | | | | | | 0.33.7 v0.33.7Richard van der Hoff2018-10-182-3/+6
| * | | | | | | | | | fix changelog formatting v0.33.7rc2Richard van der Hoff2018-10-171-1/+4
| * | | | | | | | | | v0.33.7rc2Richard van der Hoff2018-10-171-1/+1
| * | | | | | | | | | prep changelogRichard van der Hoff2018-10-173-13/+25
| * | | | | | | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-175-35/+26
| * | | | | | | | | | Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_dataRichard van der Hoff2018-10-1713-6/+53
| |\ \ \ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 00:23:21 +0000