summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1Richard van der Hoff2019-08-175-5/+28
* Drop dependency on sdnotify (#5871)Richard van der Hoff2019-08-173-11/+38
* add attributionRichard van der Hoff2019-08-161-1/+1
* Add changelog entry.Chris Moos2019-08-161-0/+1
* Fix issue with Synapse not starting up. Fixes #5866.Chris Moos2019-08-161-1/+1
* Merge tag 'v1.3.0'Brendan Abolivier2019-08-15237-2739/+4310
|\
| * 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0Brendan Abolivier2019-08-155-6/+14
| * Remove libsqlite3-dev from required build dependencies. (#5766)Andrew Morgan2019-08-153-5/+4
| * Merge pull request #5851 from matrix-org/rei/roomdir_maybedeferredreivilibre2019-08-152-2/+10
| |\
| | * Update changelog.d/5851.bugfix reivilibre2019-08-141-2/+2
| | * NewsfileOlivier Wilkinson (reivilibre)2019-08-141-0/+2
| | * Wrap `get_local_public_room_list` call in `maybeDeferred` because itOlivier Wilkinson (reivilibre)2019-08-141-2/+8
| |/
| * 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-1363-62/+75
| * Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupBrendan Abolivier2019-08-132-1/+2
| |\
| | * changelogAmber H. Brown2019-08-141-0/+1
| | * fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
| |/
| * Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-134-21/+55
| |\
| | * Remove redundant returnErik Johnston2019-08-131-1/+0
| | * Clarify docstringErik Johnston2019-08-131-1/+1
| | * NewsfileErik Johnston2019-08-011-0/+1
| | * Handle pusher being deleted during processing.Erik Johnston2019-08-013-21/+55
| * | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-1310-91/+188
| * | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-134-171/+222
| |\ \
| | * | Make default well known cache global again.Erik Johnston2019-08-131-1/+4
| | * | NewsfileErik Johnston2019-08-121-0/+1
| | * | Move well known lookup into a separate clasErik Johnston2019-08-073-173/+216
| | * | Add a lower bound for TTL on well known results.Erik Johnston2019-08-062-2/+6
| * | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-132-128/+143
| |\ \ \
| | * | | NewsfileErik Johnston2019-08-061-0/+1
| | * | | Don't unnecessarily block notifying of new events.Erik Johnston2019-08-061-128/+142
| * | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visErik Johnston2019-08-122-4/+1
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-08-121-0/+1
| | * | | | Whitelist history visbility sytests for worker modeErik Johnston2019-08-121-4/+0
| * | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptErik Johnston2019-08-122-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Changelogs should end in '.' or '!'Erik Johnston2019-08-121-1/+1
| | * | | | Fix curl command typo in purge_remote_media.shThomas Citharel2019-08-092-1/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-123-101/+183
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | changelogRichard van der Hoff2019-07-301-0/+1
| | * | | Handle loops in redaction eventsRichard van der Hoff2019-07-302-60/+106
| | * | | recursively fetch redactionsRichard van der Hoff2019-07-301-32/+36
| | * | | split _get_events_from_db out of _enqueue_eventsRichard van der Hoff2019-07-291-32/+51
| | * | | Return dicts from _fetch_event_listRichard van der Hoff2019-07-291-15/+27
| * | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-062-6/+38
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-08-061-0/+1
| | * | | | Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| | | |/ / | | |/| |
| * / | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-062-3/+12
| |/ / /
| * | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-018-11/+119
| |\ \ \
| | * | | LintBrendan Abolivier2019-08-013-17/+10
| | * | | Sample configBrendan Abolivier2019-08-011-0/+10
| | * | | ChangelogBrendan Abolivier2019-08-011-0/+1
| | * | | Add testsBrendan Abolivier2019-08-011-0/+37
| | * | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+76
| * | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-012-4/+4
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-08-011-0/+1
| | * | | | Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
| * | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-012-21/+22
| * | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-012-1/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | NewsfileErik Johnston2019-08-011-0/+1
| | * | | | Handle incorrectly encoded query params correctlyErik Johnston2019-08-011-1/+6
| | | |_|/ | | |/| |
| * | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-012-2/+10
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | Validate well-known state events are state events.Erik Johnston2019-07-311-2/+9
| * | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-012-0/+10
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix spelling.Erik Johnston2019-08-012-2/+4
| | |/ / /
| | * | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | Don't allow clients to send tombstones that reference the same roomErik Johnston2019-07-311-0/+7
| * | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-012-1/+4
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
| | |/ / /
| * | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-013-32/+61
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | * | | | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| | * | | | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
| * | | | | Merge pull request #5804 from matrix-org/erikj/match_against_state_keyErik Johnston2019-08-012-1/+8
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | Explicitly check that tombstone is a state event before notifying.Erik Johnston2019-07-311-1/+7
| |/ / / /
| * | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-312-1/+3
| * | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
| * | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownErik Johnston2019-07-314-17/+20
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | Share SSL options for well-known requestsErik Johnston2019-07-313-17/+19
| * | | | | Remove DelayedCall debugging from test runs (#5787)Amber Brown2019-07-312-6/+1
| * | | | | Merge pull request #5796 from matrix-org/erikj/disable_codecov_reportErik Johnston2019-07-312-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | Disable codecov reports to GH comments.Erik Johnston2019-07-311-2/+1
| |/ / / /
| * | | | Merge pull request #5793 from matrix-org/erikj/fix_bg_updateBrendan Abolivier2019-07-303-1/+23
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | NewsfileErik Johnston2019-07-301-0/+1
| | * | | Don't recreate columnErik Johnston2019-07-302-1/+22
| * | | | Merge pull request #5792 from matrix-org/erikj/fix_bg_updateErik Johnston2019-07-303-1/+2
| |\| | |
| | * | | NewsfileErik Johnston2019-07-301-0/+1
| | * | | Fix current_state_events membership background update.Erik Johnston2019-07-302-1/+1
| |/ / /
| * | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keysErik Johnston2019-07-302-4/+4
| |\ \ \
| | * | | NewsfileErik Johnston2019-07-301-0/+1
| | * | | Unwrap errorErik Johnston2019-07-301-1/+2
| | * | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
| |/ / /
| * | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-302-1/+37
| |\ \ \
| | * | | NewsfileErik Johnston2019-07-231-0/+1
| | * | | Add unit test for current state membership bg updateErik Johnston2019-07-231-1/+36
| * | | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-308-37/+9
| | |_|/ | |/| |
| * | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-308-14/+298
| | |/ | |/|
| * | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-292-0/+7
| |\ \
| | * | NewsfileErik Johnston2019-07-261-0/+1
| | * | Fix room summary when rejected events are in stateErik Johnston2019-07-261-0/+6
| * | | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-293-35/+124
| |\ \ \
| | * | | Expand commentErik Johnston2019-07-291-0/+5
| | * | | Remove lost commentErik Johnston2019-07-291-7/+0
| | |/ /
| | * | NewsfileErik Johnston2019-07-241-0/+1
| | * | Remove join when calculating room summaries.Erik Johnston2019-07-241-13/+21
| | * | Remove join on room_memberships when fetching rooms for user.Erik Johnston2019-07-241-22/+36
| | * | Add function to get all forgotten rooms for userErik Johnston2019-07-242-0/+68
| | |/
| * | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-293-4/+6
| |\ \
| | * | NewsfileErik Johnston2019-07-291-0/+1
| | * | Update old deps unit test to use old sqlite3Erik Johnston2019-07-291-2/+3
| | * | Fix current_state bg update to work on old SQLiteErik Johnston2019-07-291-2/+2
| * | | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-303-2/+3
| * | | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-293-74/+137
| * | | Fix debian packages for sid being called buster. (#5775)Erik Johnston2019-07-303-1/+8
| |/ /
| * | Merge pull request #5780 from matrix-org/baboliver/loopingcall-argsBrendan Abolivier2019-07-292-2/+5
| |\ \
| | * | ChangelogBrendan Abolivier2019-07-291-0/+1
| | * | Add kwargs and docBrendan Abolivier2019-07-291-2/+4
| | * | Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
| |/ /
| * | Merge branch 'master' into developRichard van der Hoff2019-07-266-4/+38
| |\ \
| * \ \ Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-263-4/+38
| |\ \ \
| * | | | Convert RedactionTestCase to modern test style (#5768)Richard van der Hoff2019-07-262-36/+39
| * | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idRichard van der Hoff2019-07-252-0/+28
| |\ \ \ \
| * | | | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-253-35/+130
| * | | | | Merge branch 'master' into developAndrew Morgan2019-07-253-3/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-2411-32/+101
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-242-13/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Update changelog.d/5743.bugfixErik Johnston2019-07-231-1/+1
| | * | | | | | | NewsfileErik Johnston2019-07-231-0/+1
| | * | | | | | | Log when we receive receipt from a different originErik Johnston2019-07-231-13/+22
| * | | | | | | | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-244-11/+23
| * | | | | | | | Add a prometheus metric for active cache lookups. (#5750)Richard van der Hoff2019-07-243-2/+34
| * | | | | | | | Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-234-4/+46
| * | | | | | | | Replace returnValue with return (#5736)Amber Brown2019-07-23177-1514/+1360
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Opentracing Utils (#5722)Jorik Schellekens2019-07-233-101/+357
| * | | | | | | Merge pull request #5732 from matrix-org/erikj/sdnotifyErik Johnston2019-07-2317-14/+67
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Also update systemd-with-workers contrib examplesErik Johnston2019-07-232-2/+4
| | * | | | | | Update example systemd service fileErik Johnston2019-07-221-1/+3
| | * | | | | | Call startup commands as system triggers.Erik Johnston2019-07-2211-11/+29
| | * | | | | | NewsfileErik Johnston2019-07-221-0/+1
| | * | | | | | Add process hooks to tell systemd our state.Erik Johnston2019-07-222-0/+30
| * | | | | | | Merge pull request #5740 from matrix-org/erikj/worker_flakey_testsErik Johnston2019-07-232-1/+8
| |\ \ \ \ \ \ \
| | * | | | | | | NewsfileErik Johnston2019-07-231-0/+1
| | * | | | | | | Mark flakey tests as blacklisted for worker modeErik Johnston2019-07-231-1/+7
| |/ / / / / / /
| * | | | | | | Merge pull request #5738 from matrix-org/erikj/faster_updateErik Johnston2019-07-232-18/+31
| |\ \ \ \ \ \ \
| | * | | | | | | NewsfileErik Johnston2019-07-231-0/+1
| | * | | | | | | Speed up current state background update.Erik Johnston2019-07-231-18/+30
| * | | | | | | | Merge pull request #5733 from matrix-org/erikj/exlude_sytest_blacklistErik Johnston2019-07-232-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | NewsfileErik Johnston2019-07-221-0/+1
| | * | | | | | | Don't package sytest-blacklist file.Erik Johnston2019-07-221-1/+1
| |/ / / / / / /
| * | | | | | | Fix logging in workers (#5729)Amber Brown2019-07-224-1/+32
| * | | | | | | Merge pull request #5730 from matrix-org/erikj/cache_versionsErik Johnston2019-07-222-2/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Update changelog.d/5730.miscErik Johnston2019-07-221-1/+1
| | * | | | | | | NewsfileErik Johnston2019-07-221-0/+1
| | * | | | | | | Cache get_version_string.Erik Johnston2019-07-221-2/+21
| | |/ / / / / /
| * | | | | | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeJason Robinson2019-07-222-3/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Add `user_type` to returned fields in admin API user list endpointsJason Robinson2019-07-222-3/+4
| | |/ / / / / /
| * | | | | | | Fix stack overflow in Keyring (#5724)Richard van der Hoff2019-07-223-80/+42
| |\ \ \ \ \ \ \
| | * | | | | | | changelogRichard van der Hoff2019-07-191-0/+1
| | * | | | | | | Add a delay to key lookup lock release to fix stack overflowRichard van der Hoff2019-07-191-2/+8
| | * | | | | | | Refactor Keyring._start_key_lookupsRichard van der Hoff2019-07-192-80/+35
| * | | | | | | | Merge tag 'v1.2.0rc1' into developAndrew Morgan2019-07-2254-56/+82
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Demo uses deprecated cli option (#5725)Jorik Schellekens2019-07-222-4/+4
| * | | | | | | | Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-225-24/+230
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Remove deprecated 'verbose' cli arg"Jorik Schellekens2019-07-191-3/+4
| * | | | | | | | | Remove deprecated 'verbose' cli argJorik Schellekens2019-07-191-4/+3
| * | | | | | | | | Merge pull request #5720 from matrix-org/erikj/transactions_upsertErik Johnston2019-07-192-0/+21
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2019-07-191-0/+1
| | * | | | | | | | | Use upsert when updating destination retry intervalErik Johnston2019-07-191-0/+20
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_stateErik Johnston2019-07-192-2/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2019-07-181-0/+1
| | * | | | | | | | | Delegate to cached version when using get_filtered_current_state_idsErik Johnston2019-07-181-2/+6
| * | | | | | | | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_stateErik Johnston2019-07-198-41/+195
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | LoggingTransaction accepts None for callback lists.Erik Johnston2019-07-193-6/+16
| | * | | | | | | | | | Update comment for new columnErik Johnston2019-07-191-0/+3
| | * | | | | | | | | | NewsfileErik Johnston2019-07-181-0/+1
| | * | | | | | | | | | Use the current_state_events.membership columnErik Johnston2019-07-181-17/+37
| | * | | | | | | | | | Track if current_state_events.membership is up to dateErik Johnston2019-07-181-0/+45
| | * | | | | | | | | | Add background update for current_state_events.membership columnErik Johnston2019-07-182-0/+54
| | * | | | | | | | | | Add membership column to current_state_events table.Erik Johnston2019-07-185-20/+41
| * | | | | | | | | | | Don't accept opentracing data from clients. (#5715)Jorik Schellekens2019-07-192-2/+2
| * | | | | | | | | | | Add 'rel' attribute to default welcome page. (#5695)Neil Johnson2019-07-192-2/+3
| * | | | | | | | | | | Update the coding style doc (#5719)Richard van der Hoff2019-07-192-30/+95
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Speed up the PostgreSQL unit tests (#5717)Amber Brown2019-07-192-3/+10
| * | | | | | | | | | Remove non-dedicated logging options and command line arguments (#5678)Amber Brown2019-07-193-75/+13
* | | | | | | | | | | make user creation steps clearerNeil Johnson2019-08-081-5/+4
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | yet more changelog attribution fixes v1.2.1Richard van der Hoff2019-07-261-2/+2
* | | | | | | | | | correct attributions in changelog github/release-v1.2.1 release-v1.2.1Richard van der Hoff2019-07-261-1/+4
* | | | | | | | | | correct attributions in changelogRichard van der Hoff2019-07-261-1/+2
* | | | | | | | | | 1.2.1Richard van der Hoff2019-07-265-4/+30
* | | | | | | | | | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-263-4/+38
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-263-4/+38
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
* | | | | | | | | Fix DoS when there is a cycle in redaction eventsRichard van der Hoff2019-07-261-0/+4
* | | | | | | | | Merge branch 'rav/redactions/cross_room_id' into release-v1.2.1Richard van der Hoff2019-07-252-0/+28
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | log when a redaction attempts to redact an event in a different roomRichard van der Hoff2019-07-252-0/+28
|/ / / / / / /
* / / / / / / 1.2.0 v1.2.0 github/release-v1.2.0 release-v1.2.0Andrew Morgan2019-07-253-3/+12
|/ / / / / /
* | | | | | 1.2.0rc2 v1.2.0rc2Andrew Morgan2019-07-243-2/+10
* | | | | | Fix servlet metric names (#5734)Jorik Schellekens2019-07-2410-31/+92
| |_|_|_|/ |/| | | |
* | | | | Make changelog slightly more readable v1.2.0rc1Andrew Morgan2019-07-221-1/+1
* | | | | 1.2.0rc1Andrew Morgan2019-07-2254-56/+82
| |_|_|/ |/| | |
* | | | Opentracing Documentation (#5703)Jorik Schellekens2019-07-225-24/+230
|/ / /
* | | towncrierNeil Johnson2019-07-181-0/+1
* | | enable aggregations support by defaultNeil Johnson2019-07-181-1/+1
| |/ |/|
* | Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-187-63/+96
* | Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-1820-50/+399
* | Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-185-39/+180
* | Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-182-242/+189
* | Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-175-24/+57
* | Improve `Depends` specs in debian package. (#5675)Richard van der Hoff2019-07-176-3/+33
* | More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-174-27/+198
* | Fix redaction authentication (#5700)Richard van der Hoff2019-07-172-85/+131
* | Refactor `get_events_as_list` (#5699)Richard van der Hoff2019-07-172-48/+75
|/
* Merge pull request #5597 from matrix-org/erikj/admin_api_cmdErik Johnston2019-07-168-13/+357
|\
| * Remove pointless descriptionErik Johnston2019-07-161-1/+0
| * Clean up arg name and remove lying commentErik Johnston2019-07-161-7/+5
| * Fix typo in synapse/app/admin_cmd.pyErik Johnston2019-07-161-1/+1
| * Fix invoking add_argument from homeserver.pyErik Johnston2019-07-151-1/+1
| * s/exfiltrate_user_data/export_user_data/Erik Johnston2019-07-151-1/+1
| * Add FileExfiltrationWriterErik Johnston2019-07-151-1/+69
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-15293-2140/+3248
| |\ | |/ |/|
* | Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-153-0/+26
* | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-156-7/+423
|\ \
| * | Fixup docstringsErik Johnston2019-07-121-7/+5
| * | pep8Erik Johnston2019-07-051-4/+0
| * | Remove FileExfiltrationWriterErik Johnston2019-07-051-63/+0
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi...Erik Johnston2019-07-05217-1407/+1732
| |\ \
| * | | Assume key existence. Update docstringsErik Johnston2019-07-052-9/+11
| * | | Fixup from review comments.Erik Johnston2019-07-042-22/+27
| * | | Apply comment fixups from code reviewErik Johnston2019-07-031-6/+6
* | | | Add a `docker` type to the towncrier configuration (#5673)Richard van der Hoff2019-07-127-14/+27
* | | | Implement access token expiry (#5660)Richard van der Hoff2019-07-1214-31/+253
* | | | fix typo: backgroud -> backgroundAndrew Morgan2019-07-122-5/+5
* | | | fix changelog nameRichard van der Hoff2019-07-121-0/+0
* | | | Update reverse_proxy.rst (#5397)Ulrik Günther2019-07-122-0/+3
* | | | Add missing space in default logging file format generated by the Docker imag...Slavi Pantaleev2019-07-122-1/+2
* | | | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619)Slavi Pantaleev2019-07-122-2/+3
* | | | Add a mechanism for per-test configs (#5657)Richard van der Hoff2019-07-122-1/+55
* | | | Use /src for checking out synapse during sytests (#5664)Amber Brown2019-07-112-0/+4
* | | | Improved docs on setting up Postgresql (#5661)Lrizika2019-07-112-4/+16
* | | | small typo fix (#5655)Andrew Morgan2019-07-112-1/+2
* | | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-116-100/+111
* | | | Add basic opentracing support (#5544)Jorik Schellekens2019-07-1112-12/+633
* | | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-113-8/+5
* | | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-102-1/+2
|\ \ \ \
| * | | | TypoBrendan Abolivier2019-07-101-1/+1
| * | | | Rename changelog fileBrendan Abolivier2019-07-101-0/+0
| * | | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-102-1/+2