summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-05-2679-581/+1453
|\
| * Simplify reap_monthly_active_users (#7558)Richard van der Hoff2020-05-232-59/+42
| * Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-228-136/+162
| * Fix missing CORS headers on OPTION responses (#7560)Erik Johnston2020-05-223-1/+30
| * Add option to move event persistence off master (#7517)Erik Johnston2020-05-2222-73/+382
| * Return 200 OK for all OPTIONS requests (#7534)Patrick Cloke2020-05-225-11/+85
| * Add ability to wait for replication streams (#7542)Erik Johnston2020-05-2224-112/+304
| * Convert sending mail to async/await. (#7557)Erik Johnston2020-05-225-76/+60
| * Use a non-empty RelayState for user interactive auth with SAML. (#7552)Patrick Cloke2020-05-222-1/+5
| * On upgrade room only send canonical alias once. (#7547)Erik Johnston2020-05-222-55/+61
| * Fix exception reporting due to HTTP request errors. (#7556)Erik Johnston2020-05-224-4/+24
| * synapse.metrics: implement detailed memory usage reporting on PyPy (#7536)Ivan Shapovalov2020-05-222-1/+79
| * Refresh apt cache when building dh_virtualenv docker image (#7555)Richard van der Hoff2020-05-222-2/+5
| * Fix stacktrace mangling in `patch_inline_callbacks` (#7554)Richard van der Hoff2020-05-222-2/+8
| * mypy for synapse.http.site (#7553)Richard van der Hoff2020-05-223-3/+8
| * Fix some DETECTED VIOLATIONS in the config file (#7550)Richard van der Hoff2020-05-228-55/+72
| * Retry to sync out of sync device lists (#7453)Brendan Abolivier2020-05-214-20/+158
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-05-21239-2944/+7364
|\|
| * Stub out GET presence requests in the frontend proxy (#7545)Richard van der Hoff2020-05-212-17/+5
| * Ensure worker config exists in systemd service (#7528)David Vo2020-05-212-1/+2
| * add a commentRichard van der Hoff2020-05-211-0/+3
| * Fix bug in persist events when dealing with non member types. (#7548)Erik Johnston2020-05-212-2/+3
| * Update CONTRIBUTING.md (#7541)Richard van der Hoff2020-05-201-15/+4
| * Remove Ubuntu Cosmic and Disco which are both EOL. (#7539)Patrick Cloke2020-05-202-2/+1
| * Hash passwords earlier in the password reset process (#7538)Patrick Cloke2020-05-205-11/+33
| * Minor clarifications to the TURN docs (#7533)Richard van der Hoff2020-05-202-15/+43
| * Merge branch 'master' into developPatrick Cloke2020-05-196-32/+58
| |\
| | * Merge tag 'v1.13.0'Patrick Cloke2020-05-19257-5032/+12281
| | |\
| | | * Update changelog based on feedback. v1.13.0 github/release-v1.13.0 release-v1.13.0Patrick Cloke2020-05-191-1/+1
| | | * Move warnings in the changelog and re-iterate changes to branches.Patrick Cloke2020-05-191-18/+32
| | | * 1.13.0Patrick Cloke2020-05-194-4/+16
| | | * update dh-virtualenv (#7526)Richard van der Hoff2020-05-195-11/+11
| * | | synctl warns when no process is stopped and avoids start (#6598)Romain Bouyé2020-05-192-3/+29
| * | | Improve API doc readability (#7527)Paul Tötterman2020-05-191-10/+11
| * | | Omit displayname or avatar_url if they aren't set instead of returning null (...Aaron Raimist2020-05-192-2/+7
| * | | Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-185-32/+40
| |\ \ \ | | | |/ | | |/|
| | * | 1.13.0rc3 v1.13.0rc3Patrick Cloke2020-05-183-2/+10
| * | | Allow ReplicationRestResource to be added to workers (#7515)Erik Johnston2020-05-183-5/+13
| * | | Merge pull request #7519 from matrix-org/rav/kill_py2_codeRichard van der Hoff2020-05-1816-196/+48
| |\ \ \
| | * | | changelogRichard van der Hoff2020-05-151-0/+1
| | * | | remove miscellaneous PY2 codeRichard van der Hoff2020-05-156-67/+24
| | * | | remove `builtins.buffer` code from storage codeRichard van der Hoff2020-05-154-31/+5
| | * | | remove redundant `__func__`Richard van der Hoff2020-05-152-13/+4
| | * | | remove to_asciiRichard van der Hoff2020-05-153-38/+12
| | * | | Remove `exception_to_unicode`Richard van der Hoff2020-05-152-48/+3
| * | | | fix mypy for tests/replication (#7518)Richard van der Hoff2020-05-184-14/+9
| * | | | Add type hints to room member handlers (#7513)Patrick Cloke2020-05-154-139/+176
| * | | | Fix limit logic for AccountDataStream (#7384)Richard van der Hoff2020-05-154-31/+217
| * | | | Fix a couple of small typosAndrew Morgan2020-05-152-3/+3
| * | | | Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-156-41/+105
| * | | | Add a worker store for search insertion. (#7516)Erik Johnston2020-05-153-47/+52
| * | | | Prevent 0-member/null room_version rooms from appearing in group room queries...Andrew Morgan2020-05-152-14/+79
| * | | | Move event stream handling out of slave store. (#7491)Erik Johnston2020-05-158-116/+161
| * | | | Add type hints to event_auth code. (#7505)Patrick Cloke2020-05-153-32/+48
| * | | | Fix a small typo in the arguments of simple_update in update_remote_profile_c...Andrew Morgan2020-05-152-1/+2
| * | | | Formatting for reverse-proxy docs (#7514)Richard van der Hoff2020-05-152-68/+79
| |/ / /
| * | | Add Caddy 2 example (#7463)Jeff Peeler2020-05-152-1/+12
| * | | Update the room member handler to use async/await. (#7507)Patrick Cloke2020-05-153-74/+59
| * | | Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-155-41/+14
| * | | Ignore incoming presence updates when presence is disabled (#7508)Andrew Morgan2020-05-152-2/+5
| * | | Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-147-5/+137
| * | | Merge branch 'master' into developRichard van der Hoff2020-05-149-65/+294
| |\ \ \ | | | |/ | | |/|
| | * | remove spurious changelog filesRichard van der Hoff2020-05-142-2/+0
| | * | Notes on using git (#7496)Richard van der Hoff2020-05-145-58/+261
| | * | Update reverse_proxy.mdRichard van der Hoff2020-05-051-4/+4
| | * | Add a section about support to the top of the README (#7392)Brendan Abolivier2020-05-012-0/+12
| | * | Make it clearer that #synapse:matrix.org is our support channel (#7379)Brendan Abolivier2020-05-014-3/+19
| * | | Enforce MSC2209: auth rules for notifications in power level event (#7502)Patrick Cloke2020-05-144-3/+65
| * | | Workaround for failure to wrap reason in Failure (#7473)Andrew Morgan2020-05-142-0/+8
| * | | Fix b'GET' in prometheus metrics (#7503)Richard van der Hoff2020-05-142-2/+5
| * | | Allow expired accounts to logout (#7443)Andrew Morgan2020-05-145-22/+140
| * | | Move EventStream handling into default ReplicationDataHandler (#7493)Erik Johnston2020-05-145-36/+40
| * | | Add `instance_map` config and route replication calls (#7495)Erik Johnston2020-05-143-6/+33
| * | | Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-147-68/+95
| |\ \ \
| * | | | Allow censoring of events to happen on workers. (#7492)Erik Johnston2020-05-134-8/+4
| * | | | Fix copypasted comment (#7477)Paul Tötterman2020-05-132-1/+2
| * | | | Clean up replication unit tests. (#7490)Erik Johnston2020-05-138-51/+16
| * | | | SpellingErik Johnston2020-05-132-2/+2
| * | | | Shuffle persist event data store functions. (#7440)Erik Johnston2020-05-1319-1235/+1376
| * | | | Have all instances correctly respond to REPLICATE command. (#7475)Erik Johnston2020-05-134-48/+51
| * | | | Fix Redis reconnection logic (#7482)Erik Johnston2020-05-133-2/+15
| * | | | Update documentation about SSO mapping providers (#7458)Patrick Cloke2020-05-123-77/+147
| * | | | Fix new flake8 errors (#7470)Erik Johnston2020-05-127-12/+19
| * | | | Convert federation handler to async/await. (#7459)Patrick Cloke2020-05-113-21/+17
| * | | | Convert search code to async/await. (#7460)Patrick Cloke2020-05-112-24/+21
| * | | | Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-1132-146/+620
| * | | | Remove unused store method get_hosts_in_room (#7448)Andrew Morgan2020-05-112-10/+1
| * | | | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-11150-320/+582
| |\ \ \ \
| * | | | | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-086-60/+95
| * | | | | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-0821-12/+2163
| * | | | | Add room details admin endpoint (#7317)Manuel Stahl2020-05-077-1/+165
| * | | | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-0710-18/+65
| |\ \ \ \ \
| * | | | | | Fixes typo (bellow -> below) (#7449)Patrick Cloke2020-05-073-2/+3
| * | | | | | Add more type hints to SAML handler. (#7445)Patrick Cloke2020-05-073-12/+18
| * | | | | | Support any process writing to cache invalidation stream. (#7436)Erik Johnston2020-05-0726-231/+226
| * | | | | | Merge pull request #7398 from Starbix/alpine-3.11Brendan Abolivier2020-05-072-1/+2
| |\ \ \ \ \ \
| | * | | | | | Update runtime docker image to Alpine v3.11Cédric Laubacher2020-05-032-1/+2
| * | | | | | | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-0614-150/+264
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #7428 from matrix-org/rav/cross_signing_keys_cacheRichard van der Hoff2020-05-062-77/+22
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-068-9/+170
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #7429 from matrix-org/rav/upsert_for_device_listRichard van der Hoff2020-05-064-48/+115
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/upsert_for_device_listRichard van der Hoff2020-05-0674-777/+1242
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix typing annotations in synapse/federation (#7382)Richard van der Hoff2020-05-054-21/+34
| * | | | | | | | | | | Fix catchup-on-reconnect for the Federation Stream (#7374)Richard van der Hoff2020-05-0511-48/+158
| * | | | | | | | | | | Add MultiWriterIdGenerator. (#7281)Erik Johnston2020-05-044-2/+353
| * | | | | | | | | | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-045-5/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Convert the room handler to async/await. (#7396)Patrick Cloke2020-05-042-24/+19
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rav/matrix_hacks' into matrix-org-hotfixesRichard van der Hoff2020-05-203-19/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | inline some config referencesRichard van der Hoff2020-05-203-19/+23
* | | | | | | | | | | | | Merge branch 'rav/matrix_hacks' into matrix-org-hotfixesRichard van der Hoff2020-05-201-2/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Fix field name in stubbed out presence servletRichard van der Hoff2020-05-201-2/+2
* | | | | | | | | | | | | Merge branch 'rav/matrix_hacks' into matrix-org-hotfixesRichard van der Hoff2020-05-201-16/+3
|\| | | | | | | | | | | |
| * | | | | | | | | | | | stub out GET presence requestsRichard van der Hoff2020-05-201-16/+3
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into matrix-o...Patrick Cloke2020-05-189-35/+47
|\| | | | | | | | | | |
| * | | | | | | | | | | Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-184-31/+31
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | 1.13.0rc2 v1.13.0rc2Richard van der Hoff2020-05-141-3/+2
| * | | | | | | | | | 1.13.0rc2Richard van der Hoff2020-05-145-4/+17
* | | | | | | | | | | Merge branch 'release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-14159-295/+401
|\| | | | | | | | | |
| * | | | | | | | | | Stop `get_joined_users` corruption from custom statuses (#7376)Richard van der Hoff2020-05-143-2/+52
| * | | | | | | | | | Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-134-65/+29
| * | | | | | | | | | Fix new flake8 errors (#7489)Patrick Cloke2020-05-137-12/+19
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Don't UPGRADE database rows v1.13.0rc1Andrew Morgan2020-05-111-1/+1
| * | | | | | | | | RST indentingAndrew Morgan2020-05-111-2/+2
| * | | | | | | | | Put rollback instructions in upgrade notesAndrew Morgan2020-05-111-0/+19
| * | | | | | | | | Fix changelog typoAndrew Morgan2020-05-111-1/+1
| * | | | | | | | | Oh yeah, RSTAndrew Morgan2020-05-111-2/+1
| * | | | | | | | | Absolute URL it is thenAndrew Morgan2020-05-111-1/+2
| * | | | | | | | | Fix upgrade notes linkAndrew Morgan2020-05-111-1/+1
| * | | | | | | | | Provide summary of upgrade issues in changelog. Fix )Andrew Morgan2020-05-112-12/+33
| * | | | | | | | | Move next version notes from changelog to upgrade notesAndrew Morgan2020-05-112-14/+15
| * | | | | | | | | Changelog fixesAndrew Morgan2020-05-111-3/+3
| * | | | | | | | | 1.13.0rc1Andrew Morgan2020-05-11144-143/+139
| * | | | | | | | | Documentation on setting up redis (#7446)Neil Johnson2020-05-112-60/+108
* | | | | | | | | | Merge remote-tracking branch 'origin/release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-1111-107/+284
|\| | | | | | | | |
| * | | | | | | | | Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-086-102/+280
| * | | | | | | | | Fix errors from malformed log line (#7454)Richard van der Hoff2020-05-072-1/+2
| * | | | | | | | | Drop support for redis.dbid (#7450)Richard van der Hoff2020-05-073-4/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Revert emergency registration patchesRichard van der Hoff2020-05-111-0/+12
* | | | | | | | | Revert emergency registration patchesRichard van der Hoff2020-05-113-27/+1
* | | | | | | | | Merge remote-tracking branch 'origin/clokep/no-validate-ui-auth-sess' into ma...Richard van der Hoff2020-05-073-1/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Propagate changes to the client dict to the database.Patrick Cloke2020-05-072-1/+24
| * | | | | | | | | Disable a failing test.Patrick Cloke2020-05-071-0/+3
* | | | | | | | | | Merge commit '4d3ebc' into matrix-org-hotfixesRichard van der Hoff2020-05-071-12/+0
|\| | | | | | | | |
| * | | | | | | | | Disable validation that a UI authentication session has not been modified dur...Patrick Cloke2020-05-071-12/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-0717-124/+233
|\| | | | | | | |
| * | | | | | | | Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-074-1/+31
| * | | | | | | | Improve per-block CPU and DB usage metrics (#7426)Patrick Cloke2020-05-062-12/+27
| * | | | | | | | Port group attestation renewal slow down from matrix-org-hotfixes (#7442)Andrew Morgan2020-05-062-4/+3
| * | | | | | | | Make redis go faster with hiredis (#7439)Richard van der Hoff2020-05-062-1/+4
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-067-106/+168
| * | | | | | | Merge pull request #7423 from matrix-org/erikj/faster_device_lists_fetchErik Johnston2020-05-064-10/+26
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'release-v1.13.0' into erikj/faster_device_lists_fetchRichard van der Hoff2020-05-0566-691/+847
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge pull request #7427 from matrix-org/rav/fix_dropped_messagesRichard van der Hoff2020-05-063-34/+70
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-052-1/+2
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-0566-690/+847
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
* | | | | | | | | | fix bad mergeRichard van der Hoff2020-05-061-19/+3
* | | | | | | | | | Merge branch 'rav/cross_signing_keys_cache' into matrix-org-hotfixesRichard van der Hoff2020-05-062-77/+22
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Make get_e2e_cross_signing_key delegate to get_e2e_cross_signing_keys_bulkRichard van der Hoff2020-05-062-54/+7
| * | | | | | | | | Fix batching for fetching cross-signing keysRichard van der Hoff2020-05-061-23/+15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-0666-689/+860
|\| | | | | | | |
| * | | | | | | | Move logs about discarded RDATA to debug (#7421)Brendan Abolivier2020-05-052-1/+2
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Add backwards compatibility codepath to LoggingContext. (#7408)Patrick Cloke2020-05-052-0/+42
| * | | | | | | Fix bug in EventContext.deserialize. (#7393)Erik Johnston2020-05-054-8/+126
| | |_|_|/ / / | |/| | | | |
| * | | | | | Fix ordering in MANIFEST.inBrendan Abolivier2020-05-041-6/+6
| * | | | | | Merge pull request #7404 from matrix-org/babolivier/fix_manifestBrendan Abolivier2020-05-042-3/+5
| |\ \ \ \ \ \
| | * | | | | | Fix MANIFEST.inBrendan Abolivier2020-05-042-3/+5
| * | | | | | | Fix redis password support. (#7401)Erik Johnston2020-05-043-0/+7
| | |_|_|/ / / | |/| | | | |
| * | | | | | Convert synapse.server_notices to async/await. (#7394)Patrick Cloke2020-05-013-11/+8
| * | | | | | Convert the synapse.notifier module to async/await. (#7395)Patrick Cloke2020-05-012-10/+8
| * | | | | | Wait for current_state_events_membership before populate_stats_process_rooms ...Richard van der Hoff2020-05-013-1/+37
| * | | | | | Thread through instance name to replication client. (#7369)Erik Johnston2020-05-0112-41/+101
| |/ / / / /
| * | | | | Use `stream.current_token()` and remove `stream_positions()` (#7172)Erik Johnston2020-05-0119-154/+30
| * | | | | async/await is_server_admin (#7363)Andrew Morgan2020-05-0122-438/+410
| * | | | | Further improvements to requesting the public rooms list on a homeserver whic...Andrew Morgan2020-05-013-23/+71
* | | | | | Merge rav/upsert_for_device_list into matrix-org-hotfixesRichard van der Hoff2020-05-064-48/+115
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | use an upsert to update device_lists_outbound_last_successRichard van der Hoff2020-05-064-18/+72
| * | | | | Better type annotations for simple_upsert_txnRichard van der Hoff2020-05-061-30/+43
| |/ / / /
* | | | | Merge rav/fix_dropped_messages into matrix-org-hotfixesRichard van der Hoff2020-05-053-38/+73
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | changelogRichard van der Hoff2020-05-051-0/+1
| * | | | Wait for a POSITION on the right connection before accepting RDATARichard van der Hoff2020-05-052-19/+38
| * | | | Wait to subscribe before sending REPLICATERichard van der Hoff2020-05-052-20/+35
| |/ / /
* | | | Merge erikj/faster_device_lists_fetch into matrix-org-hotfixesRichard van der Hoff2020-05-054-10/+26
|\ \ \ \ | | |/ / | |/| |
| * | | Update changelog.d/7423.miscRichard van der Hoff2020-05-051-1/+1
| * | | NewsfileErik Johnston2020-05-051-0/+1
| * | | Speed up fetching device lists changes in sync.Erik Johnston2020-05-053-10/+25
| |/ /
* | | Fix redis password supportErik Johnston2020-05-041-0/+3
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2020-05-0170-384/+1900
|\| |
| * | Workaround for assertion errors from db_query_to_update_function (#7378)Richard van der Hoff2020-05-012-2/+2
| * | Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-3014-125/+434
| * | Apply federation check for /publicRooms with filter list (#7367)Andrew Morgan2020-04-302-1/+6
| * | Add instance name to RDATA/POSITION commands (#7364)Erik Johnston2020-04-2910-50/+95
| * | Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352)Erik Johnston2020-04-296-25/+114
| * | Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-2914-67/+658
| * | Fix fallback value for account_threepid_delegates.email (#7316)Andrew Morgan2020-04-292-3/+9
| * | Clean up admin api docs (#7361)Andrew Morgan2020-04-282-18/+43
| * | Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-286-36/+100
| * | Add some replication tests (#7278)Erik Johnston2020-04-283-11/+299
| * | Fix typo 'datbases' in ConfigErrorAndrew Morgan2020-04-281-1/+1
| * | Fix collation for postgres for unit tests (#7359)Richard van der Hoff2020-04-282-1/+5
| * | Run replication streamers on workers (#7146)Erik Johnston2020-04-283-22/+25
| * | Fix incorrect metrics reporting for renew_attestations (#7344)Richard van der Hoff2020-04-272-10/+10
| * | Document monitoring workers (#7357)Brendan Abolivier2020-04-272-0/+26
| * | Add some explanation to application_services.md (#7091)lub2020-04-272-0/+5
| * | Don't crash when one of the configuration files is empty (#7341)Brendan Abolivier2020-04-272-0/+7
| * | Add documentation to the sample config about the templates for SSO. (#7343)Patrick Cloke2020-04-243-0/+49
| * | Convert some of the federation handler methods to async/await. (#7338)Patrick Cloke2020-04-242-25/+25
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-04-24312-4008/+9190
|\| |
| * | Merge pull request #7337 from matrix-org/rav/fix_update_limit_assertionRichard van der Hoff2020-04-245-44/+147
| |\ \
| | * | changelogRichard van der Hoff2020-04-241-0/+1
| | * | Fix EventsStream raising assertions when it falls behindRichard van der Hoff2020-04-242-30/+129
| | * | Make it clear that the limit for an update_function is a targetRichard van der Hoff2020-04-231-5/+9
| | * | Remove 'limit' param from `get_repl_stream_updates` APIRichard van der Hoff2020-04-232-9/+8
| * | | Merge branch 'master' into developPatrick Cloke2020-04-233-1/+16
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge tag 'v1.12.4'Patrick Cloke2020-04-2313-59/+360
| | |\
| | | * 1.12.4 v1.12.4 github/release-v1.12.4 release-v1.12.4Patrick Cloke2020-04-233-1/+13
| * | | Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-237-3/+121
| * | | Merge branch 'master' into developBrendan Abolivier2020-04-233-3/+75
| |\| |
| | * | Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"Brendan Abolivier2020-04-237-121/+3
| | * | Merge pull request #7315 from matrix-org/babolivier/request_tokenBrendan Abolivier2020-04-237-3/+121
| | |\ \
| | | * | Config option to inhibit 3PID errors on /requestTokenBrendan Abolivier2020-04-227-3/+121
| | * | | Improve example TURN configuration in documentation (#7284)nataraj-hates-MS-for-stealing-github2020-04-171-1/+1
| | * | | Add some warnings and notes about slow upgrade (#7275)Richard van der Hoff2020-04-152-2/+74
| * | | | Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-2210-159/+199
| * | | | Fix replication metrics when using redis (#7325)Erik Johnston2020-04-223-37/+30
| * | | | Merge tag 'v1.12.4rc1' into developRichard van der Hoff2020-04-227-6/+18
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | formatting for the changelog v1.12.4rc1Richard van der Hoff2020-04-221-1/+1
| | * | | 1.12.4rc1Richard van der Hoff2020-04-226-5/+18
| | * | | 1.12.4rc1Richard van der Hoff2020-04-221-1/+1
| * | | | Another go at fixing one-word commands (#7326)Richard van der Hoff2020-04-223-1/+44
| * | | | fix changelog nameRichard van der Hoff2020-04-221-0/+0
| * | | | Extend StreamChangeCache to support multiple entities per stream ID (#7303)Richard van der Hoff2020-04-226-56/+272
| * | | | Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-226-604/+869
| * | | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-227-18/+197
| |\| | |
| * | | | Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-2212-36/+342
| * | | | Reduce logging verbosity of URL cache cleanup. (#7295)Michael Kaye2020-04-222-2/+8
| * | | | import urllib.parse when using urllib.parse.quote (#7319)Andrew Morgan2020-04-222-1/+2
| * | | | Reduce federation logging on success (#7321)Michael Kaye2020-04-222-8/+15
| * | | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-203-141/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-203-12/+141
| |\ \ \ \ \
| * | | | | | Fix indention in generated config file (#7300)Lars Franke2020-04-203-48/+49
| * | | | | | Reject unknown UI auth sessions (instead of silently generating a new one) (#...Patrick Cloke2020-04-202-65/+95
| * | | | | | On catchup, process each row with its own stream id (#7286)Richard van der Hoff2020-04-203-5/+72
| * | | | | | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-176-37/+66
| * | | | | | Added explicit Python build tools to snap requirements (#7213)James2020-04-172-0/+5
| * | | | | | Improve type checking in `replication.tcp.Stream` (#7291)Richard van der Hoff2020-04-175-122/+143
| * | | | | | Clarify the comments for media_storage_providers options (#7272)Tristan Lins2020-04-173-8/+7
| * | | | | | Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-164-30/+106
| * | | | | | Fix 'generator object is not subscriptable' error (#7290)Richard van der Hoff2020-04-162-1/+3
| * | | | | | Convert auth handler to async/await (#7261)Patrick Cloke2020-04-1510-170/+224
| * | | | | | Add notes to the changelog about an additional SSO template. (#7259)Patrick Cloke2020-04-152-4/+9
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-27 07:41:18 +0000