summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* remove to_asciiRichard van der Hoff2020-05-153-38/+12
* Remove `exception_to_unicode`Richard van der Hoff2020-05-152-48/+3
* 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
|\ \
| * | 1.13.0rc2 v1.13.0rc2Richard van der Hoff2020-05-141-3/+2
| * | 1.13.0rc2Richard van der Hoff2020-05-145-4/+17
| * | 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
* | | 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
|\| |
| * | 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
| * | 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
* | | 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
|\| |
| * | 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
* | | 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
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | |\ \ \
| | * | | | 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
| * | | | | 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
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | 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 pull request #7428 from matrix-org/rav/cross_signing_keys_cacheRichard 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 developRichard van der Hoff2020-05-068-9/+170
|\| | | | |
| * | | | | 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
* | | | | 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
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 the room handler to async/await. (#7396)Patrick Cloke2020-05-042-24/+19
|/ / / / /
* | | | | 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
| |/ / |/| |
| * | 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
|/ /
* | 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 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
|\| | |
| * | | Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-224-30/+106
| * | | Query missing cross-signing keys on local sig upload (#7289)Andrew Morgan2020-04-223-18/+180
| * | | Fix changelog fileRichard van der Hoff2020-04-212-1/+1
| * | | Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-214-0/+17
* | | | 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
|\| | |
| * | | Revert "Query missing cross-signing keys on local sig upload"Richard van der Hoff2020-04-203-141/+12
* | | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-203-12/+141
|\| | |
| * | | Always send the user updates to their own device list (#7160)David Baker2020-04-203-3/+19
| * | | Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-173-12/+141
| * | | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-142-7/+12
* | | | 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
* | | | Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-155-2/+116
* | | | Fix a potentially-huge sql query (#7274)Richard van der Hoff2020-04-152-7/+17
* | | | Fix the parameters of a test fixture (#7243)Zay11Zay2020-04-142-1/+2
* | | | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-142-7/+12
* | | | Add setting to nginx configuration to allow larger file uploads (#7251)Ryan Hovland2020-04-132-0/+4
* | | | Check on room creation if the user is allowed to publish the room to the room...PeerD2020-04-132-0/+8
* | | | typosMatthew Hodgson2020-04-112-2/+2
* | | | Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-094-4/+299
* | | | Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-098-10/+110
* | | | Unblacklist /upgrade creates a new room (#7228)Andrew Morgan2020-04-092-2/+1
* | | | Add matrix-synapse-shared-secret-auth as an example password provider (#7248)Andrew Morgan2020-04-092-0/+2
* | | | Revert "Unblacklist /upgrade creates a new room (#7228)" (#7254)Andrew Morgan2020-04-092-1/+2
* | | | Unblacklist /upgrade creates a new room (#7228)Andrew Morgan2020-04-092-2/+1
* | | | Fix --help commandline argument (#7249)Richard van der Hoff2020-04-092-16/+9
* | | | Make it clearer to the user that they haven't overridden onLogin/Register (#7...Andrew Morgan2020-04-093-3/+3
* | | | Upgrade jQuery to 3.x on fallback login/registration screens (#7236)Andrew Morgan2020-04-099-16/+15
* | | | Fix bad merge of CHANGES.mdRichard van der Hoff2020-04-081-5/+1
* | | | Remove redundant checks on `daemonize` from synctl (#7233)Richard van der Hoff2020-04-082-9/+12
* | | | Make systemd-with-workers doc official (#7234)Richard van der Hoff2020-04-0810-194/+134
* | | | Fix changelog for #7235Brendan Abolivier2020-04-082-1/+1
* | | | Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-084-4/+32
* | | | bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-076-13/+234
* | | | Merge pull request #7239 from matrix-org/rav/replication_cleanupRichard van der Hoff2020-04-074-32/+36
|\ \ \ \
| * | | | changelogRichard van der Hoff2020-04-071-0/+1
| * | | | Handle one-word replication commands correctlyRichard van der Hoff2020-04-071-3/+11
| * | | | Fix warnings about not calling superclass constructorRichard van der Hoff2020-04-071-15/+24
| * | | | Remove vestigal references to SYNC replication commandRichard van der Hoff2020-04-072-14/+0
* | | | | Convert delete_url_cache_media to async/await. (#7241)Patrick Cloke2020-04-072-2/+3
* | | | | Add typing information to federation_server. (#7219)Patrick Cloke2020-04-073-66/+109
* | | | | Fix typo in the login fallback javascript (#7235)Brendan Abolivier2020-04-072-1/+2
|/ / / /
* | | | Remove sent outbound device list pokes from the database (#7192)Richard van der Hoff2020-04-073-2/+24
* | | | Fix race in replication (#7226)Erik Johnston2020-04-074-49/+68
* | | | Move server command handling out of TCP protocol (#7187)Erik Johnston2020-04-074-269/+237
* | | | Add information about .well-known to Debian installation. (#7227)Patrick Cloke2020-04-063-7/+18
* | | | Remove stream before/after debug log lines (#7207)Andrew Morgan2020-04-062-2/+1
* | | | Improve error responses when a remote server doesn't allow you to access its ...Andrew Morgan2020-04-063-24/+33
* | | | Move client command handling out of TCP protocol (#7185)Erik Johnston2020-04-0612-371/+378
* | | | Server notices: Dissociate room creation/lookup from invite (#7199)Brendan Abolivier2020-04-044-22/+154
* | | | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-035-83/+131
* | | | Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-034-9/+30
* | | | Add some benchmarks for LruCache (#6446)Amber Brown2020-04-035-5/+91
* | | | Convert http.HTTPStatus objects to their int equivalent (#7188)Andrew Morgan2020-04-032-1/+9
* | | | Reduce the number of calls to `resource.getrusage` (#7183)Richard van der Hoff2020-04-032-39/+64
* | | | Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-036-72/+99
|\ \ \ \
| * | | | Update docstring per review commentsRichard van der Hoff2020-04-031-1/+1
| * | | | review commentRichard van der Hoff2020-04-021-1/+1
| * | | | changelogRichard van der Hoff2020-03-311-0/+1
| * | | | Only run one background update at a timeRichard van der Hoff2020-03-313-27/+68
| * | | | Make do_next_background_update return a boolRichard van der Hoff2020-03-312-10/+8
| * | | | Set a logging context while running the bg updatesRichard van der Hoff2020-03-311-4/+7
| * | | | Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-312-5/+6
| * | | | Remove unused `start_background_update`Richard van der Hoff2020-03-312-26/+9
* | | | | Remove some `run_in_background` calls in replication code (#7203)Richard van der Hoff2020-04-032-8/+9
* | | | | Merge branch 'master' into developRichard van der Hoff2020-04-034-7/+62
|\ \ \ \ \
| * | | | | Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white...Richard van der Hoff2020-04-034-1/+28
| * | | | | Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)""Richard van der Hoff2020-04-033-22/+32
| | |_|/ / | |/| | |
| * | | | Merge tag 'v1.12.3'Richard van der Hoff2020-04-035-10/+46
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | tweak changelog v1.12.3 github/release-v1.12.3 release-v1.12.3Richard van der Hoff2020-04-031-5/+2
| | * | | 1.12.3Richard van der Hoff2020-04-034-4/+16
| | * | | Fix the debian build in a better way. (#7212)Richard van der Hoff2020-04-034-9/+36
| * | | | Merge tag 'v1.12.2'Richard van der Hoff2020-04-034-2/+20
| |\| | |
| | * | | Fix changelog wording v1.12.2 github/release-v1.12.2 release-v1.12.2Andrew Morgan2020-04-021-1/+1
| | * | | 1.12.2Andrew Morgan2020-04-023-1/+17
| | * | | Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan2020-04-021-1/+3
| | * | | 1.12.1Andrew Morgan2020-04-023-1/+13
| * | | | Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_log...Richard van der Hoff2020-04-034-28/+1
| * | | | Revert "Improve the UX of the login fallback when using SSO (#7152)"Richard van der Hoff2020-04-033-32/+22
* | | | | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-033-2/+15
* | | | | Merge branch 'master' into developAndrew Morgan2020-04-024-4/+26
|\| | | |
| * | | | Merge tag 'v1.12.1'Andrew Morgan2020-04-026-13/+55
| |\ \ \ \
| | * | | | 1.12.1 v1.12.1 github/release-v1.12.1 release-v1.12.1Andrew Morgan2020-04-023-1/+13
| | |/ / /
| | * | | Note where bugs were introduced v1.12.1rc1Andrew Morgan2020-03-311-3/+3
| | * | | 1.12.1rc1Andrew Morgan2020-03-315-4/+12
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 14:39:06 +0000