summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Use upsert when inserting read receipts (#7607)Dagfinn Ilmari Mannsåker2020-06-011-9/+4
* | Fix 'FederationGroupsRoomsServlet' API when group has room server is not in. ...Erik Johnston2020-05-291-8/+12
* | Make inflight background metrics more efficient. (#7597)Erik Johnston2020-05-291-34/+70
* | Merge branch 'master' into developBrendan Abolivier2020-05-281-1/+1
|\ \
| * | 1.14.0Brendan Abolivier2020-05-281-1/+1
* | | Merge pull request #7584 from matrix-org/erikj/save_and_send_fed_token_in_bgErik Johnston2020-05-272-7/+36
|\ \ \
| * | | Ensure we persist and ack the same tokenErik Johnston2020-05-271-5/+7
| * | | Remove spurious changeErik Johnston2020-05-271-2/+0
| * | | Speed up processing of federation stream RDATA rows.Erik Johnston2020-05-273-2/+31
| |/ /
* | | allow emails to be passed through SAML (#7385)Christopher Cooper2020-05-271-2/+10
* | | Merge tag 'v1.14.0rc2' into developBrendan Abolivier2020-05-275-7/+48
|\| |
| * | 1.14.0rc2Brendan Abolivier2020-05-271-1/+1
| * | Fix sample config docs error (#7581)Jason Robinson2020-05-271-1/+1
| * | Fix up commentsErik Johnston2020-05-271-2/+2
| * | Fix specifying cache factors via env vars with * in name. (#7580)Erik Johnston2020-05-271-5/+39
| * | Don't apply cache factor to event cache. (#7578)Erik Johnston2020-05-271-0/+4
| * | Ensure ReplicationStreamer is always started when replication enabled. (#7579)Erik Johnston2020-05-271-0/+3
* | | Fix incorrect placeholder syntax in database prepartion code (#7575)Andrew Morgan2020-05-271-3/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into developBrendan Abolivier2020-05-262-63/+46
|\ \ \ | |/ / |/| |
| * | Convert identity handler to async/await. (#7561)Patrick Cloke2020-05-262-63/+46
* | | Not full release yet, this is rc1Brendan Abolivier2020-05-261-1/+1
* | | 1.14.0Brendan Abolivier2020-05-261-1/+1
|/ /
* | Replace device_27_unique_idx bg update with a fg one (#7562)Richard van der Hoff2020-05-265-62/+94
* | Fix incorrect exception handling in KeyUploadServlet.on_POST (#7563)Richard van der Hoff2020-05-261-1/+1
* | Fix recording of federation stream token (#7564)Richard van der Hoff2020-05-261-24/+44
* | Simplify reap_monthly_active_users (#7558)Richard van der Hoff2020-05-231-59/+41
* | Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-223-19/+32
* | Fix missing CORS headers on OPTION responses (#7560)Erik Johnston2020-05-221-1/+1
* | Add option to move event persistence off master (#7517)Erik Johnston2020-05-2220-73/+378
* | Return 200 OK for all OPTIONS requests (#7534)Patrick Cloke2020-05-223-11/+31
* | Add ability to wait for replication streams (#7542)Erik Johnston2020-05-2218-104/+288
* | Convert sending mail to async/await. (#7557)Erik Johnston2020-05-223-74/+57
* | Use a non-empty RelayState for user interactive auth with SAML. (#7552)Patrick Cloke2020-05-221-1/+4
* | On upgrade room only send canonical alias once. (#7547)Erik Johnston2020-05-221-55/+60
* | Fix exception reporting due to HTTP request errors. (#7556)Erik Johnston2020-05-223-4/+23
* | synapse.metrics: implement detailed memory usage reporting on PyPy (#7536)Ivan Shapovalov2020-05-221-1/+78
* | Fix stacktrace mangling in `patch_inline_callbacks` (#7554)Richard van der Hoff2020-05-221-2/+7
* | mypy for synapse.http.site (#7553)Richard van der Hoff2020-05-221-3/+6
* | Fix some DETECTED VIOLATIONS in the config file (#7550)Richard van der Hoff2020-05-226-29/+36
* | Retry to sync out of sync device lists (#7453)Brendan Abolivier2020-05-212-19/+95
* | Stub out GET presence requests in the frontend proxy (#7545)Richard van der Hoff2020-05-211-17/+4
* | 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-211-2/+2
* | Hash passwords earlier in the password reset process (#7538)Patrick Cloke2020-05-204-11/+32
* | Merge branch 'master' into developPatrick Cloke2020-05-191-1/+1
|\ \
| * | 1.13.0Patrick Cloke2020-05-191-1/+1
* | | Omit displayname or avatar_url if they aren't set instead of returning null (...Aaron Raimist2020-05-191-2/+6
* | | Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-184-32/+31
|\| |
| * | 1.13.0rc3 v1.13.0rc3Patrick Cloke2020-05-181-1/+1
| * | Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-183-31/+30
* | | Allow ReplicationRestResource to be added to workers (#7515)Erik Johnston2020-05-182-5/+12
* | | Merge pull request #7519 from matrix-org/rav/kill_py2_codeRichard van der Hoff2020-05-1814-189/+45
|\ \ \
| * | | remove miscellaneous PY2 codeRichard van der Hoff2020-05-156-67/+24
| * | | remove `builtins.buffer` code from storage codeRichard van der Hoff2020-05-153-24/+3
| * | | 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
* | | | Add type hints to room member handlers (#7513)Patrick Cloke2020-05-152-139/+173
* | | | Fix limit logic for AccountDataStream (#7384)Richard van der Hoff2020-05-152-31/+99
* | | | Fix a couple of small typosAndrew Morgan2020-05-152-3/+3
* | | | Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-154-36/+94
* | | | Add a worker store for search insertion. (#7516)Erik Johnston2020-05-152-47/+51
* | | | Prevent 0-member/null room_version rooms from appearing in group room queries...Andrew Morgan2020-05-151-14/+78
* | | | Move event stream handling out of slave store. (#7491)Erik Johnston2020-05-157-116/+160
* | | | Add type hints to event_auth code. (#7505)Patrick Cloke2020-05-151-32/+46
* | | | Fix a small typo in the arguments of simple_update in update_remote_profile_c...Andrew Morgan2020-05-151-1/+1
|/ / /
* | | Update the room member handler to use async/await. (#7507)Patrick Cloke2020-05-152-74/+58
* | | Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-151-26/+4
* | | Ignore incoming presence updates when presence is disabled (#7508)Andrew Morgan2020-05-151-2/+4
* | | Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-145-4/+70
* | | Enforce MSC2209: auth rules for notifications in power level event (#7502)Patrick Cloke2020-05-142-3/+31
* | | Workaround for failure to wrap reason in Failure (#7473)Andrew Morgan2020-05-141-0/+7
* | | Fix b'GET' in prometheus metrics (#7503)Richard van der Hoff2020-05-141-2/+4
* | | Allow expired accounts to logout (#7443)Andrew Morgan2020-05-142-20/+36
* | | Move EventStream handling into default ReplicationDataHandler (#7493)Erik Johnston2020-05-144-36/+39
* | | Add `instance_map` config and route replication calls (#7495)Erik Johnston2020-05-142-6/+32
* | | Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-144-22/+21
|\| |
| * | 1.13.0rc2Richard van der Hoff2020-05-141-1/+1
| * | Stop `get_joined_users` corruption from custom statuses (#7376)Richard van der Hoff2020-05-141-1/+2
| * | Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-132-20/+18
| * | Fix new flake8 errors (#7489)Patrick Cloke2020-05-135-11/+17
* | | Allow censoring of events to happen on workers. (#7492)Erik Johnston2020-05-133-8/+3
* | | Fix copypasted comment (#7477)Paul Tötterman2020-05-131-1/+1
* | | SpellingErik Johnston2020-05-132-2/+2
* | | Shuffle persist event data store functions. (#7440)Erik Johnston2020-05-1317-1234/+1373
* | | Have all instances correctly respond to REPLICATE command. (#7475)Erik Johnston2020-05-133-48/+50
* | | Fix Redis reconnection logic (#7482)Erik Johnston2020-05-132-2/+14
* | | Fix new flake8 errors (#7470)Erik Johnston2020-05-125-11/+17
* | | Convert federation handler to async/await. (#7459)Patrick Cloke2020-05-112-21/+16
* | | Convert search code to async/await. (#7460)Patrick Cloke2020-05-111-24/+20
* | | Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-1121-124/+402
* | | Remove unused store method get_hosts_in_room (#7448)Andrew Morgan2020-05-111-10/+0
* | | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-117-20/+65
|\| |
| * | 1.13.0rc1Andrew Morgan2020-05-111-1/+1
| * | Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-083-14/+62
| * | Fix errors from malformed log line (#7454)Richard van der Hoff2020-05-071-1/+1
| * | Drop support for redis.dbid (#7450)Richard van der Hoff2020-05-072-4/+1
* | | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-082-47/+69
* | | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-0815-12/+1323
* | | Add room details admin endpoint (#7317)Manuel Stahl2020-05-073-1/+58
* | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-075-18/+49
|\| |
| * | Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-072-1/+18
| * | Improve per-block CPU and DB usage metrics (#7426)Patrick Cloke2020-05-061-12/+26
| * | Port group attestation renewal slow down from matrix-org-hotfixes (#7442)Andrew Morgan2020-05-061-4/+2
| * | Make redis go faster with hiredis (#7439)Richard van der Hoff2020-05-061-1/+3
* | | Fixes typo (bellow -> below) (#7449)Patrick Cloke2020-05-072-2/+2
* | | Add more type hints to SAML handler. (#7445)Patrick Cloke2020-05-071-12/+16
* | | Support any process writing to cache invalidation stream. (#7436)Erik Johnston2020-05-0723-225/+223
* | | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-067-117/+208
|\| |
| * | Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-062-73/+114
| * | Merge pull request #7423 from matrix-org/erikj/faster_device_lists_fetchErik Johnston2020-05-063-10/+25
| |\ \
| | * \ Merge branch 'release-v1.13.0' into erikj/faster_device_lists_fetchRichard van der Hoff2020-05-0542-577/+562
| | |\ \
| | * | | Speed up fetching device lists changes in sync.Erik Johnston2020-05-053-10/+25
| * | | | Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-0542-576/+562
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | 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-061-77/+21
|\ \ \ \ \
| * | | | | Make get_e2e_cross_signing_key delegate to get_e2e_cross_signing_keys_bulkRichard van der Hoff2020-05-061-54/+6
| * | | | | 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-063-3/+47
|\| | | |
| * | | | Move logs about discarded RDATA to debug (#7421)Brendan Abolivier2020-05-051-1/+1
| | |/ / | |/| |
| * | | Add backwards compatibility codepath to LoggingContext. (#7408)Patrick Cloke2020-05-051-0/+41
| * | | Fix bug in EventContext.deserialize. (#7393)Erik Johnston2020-05-051-2/+5
* | | | Merge branch 'develop' into rav/upsert_for_device_listRichard van der Hoff2020-05-0646-651/+794
|\ \ \ \
| * | | | Fix typing annotations in synapse/federation (#7382)Richard van der Hoff2020-05-051-15/+31
| * | | | Fix catchup-on-reconnect for the Federation Stream (#7374)Richard van der Hoff2020-05-057-36/+63
| * | | | Add MultiWriterIdGenerator. (#7281)Erik Johnston2020-05-041-2/+167
| * | | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-041-0/+3
| |\| | |
| | * | | Fix redis password support. (#7401)Erik Johnston2020-05-041-0/+3
| * | | | Convert the room handler to async/await. (#7396)Patrick Cloke2020-05-041-24/+18
| |/ / /
| * | | Convert synapse.server_notices to async/await. (#7394)Patrick Cloke2020-05-011-10/+6
| * | | Convert the synapse.notifier module to async/await. (#7395)Patrick Cloke2020-05-011-10/+7
| * | | Wait for current_state_events_membership before populate_stats_process_rooms ...Richard van der Hoff2020-05-011-1/+5
| * | | Thread through instance name to replication client. (#7369)Erik Johnston2020-05-018-35/+94
| * | | Use `stream.current_token()` and remove `stream_positions()` (#7172)Erik Johnston2020-05-0114-120/+3
| * | | async/await is_server_admin (#7363)Andrew Morgan2020-05-0117-376/+328
| * | | Further improvements to requesting the public rooms list on a homeserver whic...Andrew Morgan2020-05-012-23/+70
| |/ /
* | | use an upsert to update device_lists_outbound_last_successRichard van der Hoff2020-05-063-18/+71
* | | 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-011-2/+1
* | Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-3010-120/+387
* | Apply federation check for /publicRooms with filter list (#7367)Andrew Morgan2020-04-301-1/+5
* | Add instance name to RDATA/POSITION commands (#7364)Erik Johnston2020-04-296-31/+65
* | Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352)Erik Johnston2020-04-294-25/+51
* | Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-294-19/+76
* | Fix fallback value for account_threepid_delegates.email (#7316)Andrew Morgan2020-04-291-3/+8
* | Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-282-33/+43
* | Fix typo 'datbases' in ConfigErrorAndrew Morgan2020-04-281-1/+1
* | Run replication streamers on workers (#7146)Erik Johnston2020-04-282-22/+24
* | Fix incorrect metrics reporting for renew_attestations (#7344)Richard van der Hoff2020-04-271-10/+9
* | Don't crash when one of the configuration files is empty (#7341)Brendan Abolivier2020-04-271-0/+6
* | Add documentation to the sample config about the templates for SSO. (#7343)Patrick Cloke2020-04-241-0/+24
* | Convert some of the federation handler methods to async/await. (#7338)Patrick Cloke2020-04-241-25/+24
* | Merge pull request #7337 from matrix-org/rav/fix_update_limit_assertionRichard van der Hoff2020-04-244-44/+146
|\ \
| * | 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-231-1/+1
|\ \ \ | |/ / |/| |
| * | 1.12.4 v1.12.4 github/release-v1.12.4 release-v1.12.4Patrick Cloke2020-04-231-1/+1
* | | Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-233-2/+48
* | | Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-228-154/+197
* | | Fix replication metrics when using redis (#7325)Erik Johnston2020-04-222-37/+29
* | | Merge tag 'v1.12.4rc1' into developRichard van der Hoff2020-04-221-1/+1
|\| |
| * | 1.12.4rc1Richard van der Hoff2020-04-221-1/+1
* | | Another go at fixing one-word commands (#7326)Richard van der Hoff2020-04-221-1/+1
* | | Extend StreamChangeCache to support multiple entities per stream ID (#7303)Richard van der Hoff2020-04-221-46/+71
* | | Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-222-5/+88
* | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-224-18/+193
|\| |
| * | Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-221-30/+39
| * | Query missing cross-signing keys on local sig upload (#7289)Andrew Morgan2020-04-222-18/+179
| * | Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-212-0/+14
* | | Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-229-34/+299
* | | Reduce logging verbosity of URL cache cleanup. (#7295)Michael Kaye2020-04-221-2/+7
* | | import urllib.parse when using urllib.parse.quote (#7319)Andrew Morgan2020-04-221-1/+1
* | | Reduce federation logging on success (#7321)Michael Kaye2020-04-221-8/+14
* | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-202-140/+12
|\| |
| * | Revert "Query missing cross-signing keys on local sig upload"Richard van der Hoff2020-04-202-140/+12
* | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-202-12/+140
|\| |
| * | Always send the user updates to their own device list (#7160)David Baker2020-04-202-3/+18
| * | Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-172-12/+140
| * | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
* | | Fix indention in generated config file (#7300)Lars Franke2020-04-201-22/+22
* | | Reject unknown UI auth sessions (instead of silently generating a new one) (#...Patrick Cloke2020-04-201-65/+94
* | | On catchup, process each row with its own stream id (#7286)Richard van der Hoff2020-04-202-5/+71
* | | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-174-33/+60
* | | Improve type checking in `replication.tcp.Stream` (#7291)Richard van der Hoff2020-04-174-122/+142
* | | Clarify the comments for media_storage_providers options (#7272)Tristan Lins2020-04-171-4/+3
* | | Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-161-30/+39
* | | Fix 'generator object is not subscriptable' error (#7290)Richard van der Hoff2020-04-161-1/+2
* | | Convert auth handler to async/await (#7261)Patrick Cloke2020-04-155-113/+119
* | | Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-152-2/+35
* | | Fix a potentially-huge sql query (#7274)Richard van der Hoff2020-04-151-7/+16
* | | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
* | | Check on room creation if the user is allowed to publish the room to the room...PeerD2020-04-131-0/+7
* | | typosMatthew Hodgson2020-04-112-2/+2
* | | Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-091-0/+1
* | | Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-096-7/+70
* | | Fix --help commandline argument (#7249)Richard van der Hoff2020-04-091-16/+8
* | | Make it clearer to the user that they haven't overridden onLogin/Register (#7...Andrew Morgan2020-04-092-3/+2
* | | Upgrade jQuery to 3.x on fallback login/registration screens (#7236)Andrew Morgan2020-04-098-16/+14
* | | Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-081-2/+14
* | | bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-074-13/+181
* | | Merge pull request #7239 from matrix-org/rav/replication_cleanupRichard van der Hoff2020-04-073-32/+35
|\ \ \
| * | | 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-071-2/+2
* | | | Add typing information to federation_server. (#7219)Patrick Cloke2020-04-071-66/+107
* | | | Fix typo in the login fallback javascript (#7235)Brendan Abolivier2020-04-071-1/+1
|/ / /
* | | Remove sent outbound device list pokes from the database (#7192)Richard van der Hoff2020-04-072-2/+23
* | | Fix race in replication (#7226)Erik Johnston2020-04-073-49/+67
* | | Move server command handling out of TCP protocol (#7187)Erik Johnston2020-04-073-269/+236
* | | Remove stream before/after debug log lines (#7207)Andrew Morgan2020-04-061-2/+0
* | | Improve error responses when a remote server doesn't allow you to access its ...Andrew Morgan2020-04-062-24/+32
* | | Move client command handling out of TCP protocol (#7185)Erik Johnston2020-04-068-342/+352
* | | Server notices: Dissociate room creation/lookup from invite (#7199)Brendan Abolivier2020-04-042-10/+45
* | | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-034-83/+130
* | | Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-032-6/+21
* | | Convert http.HTTPStatus objects to their int equivalent (#7188)Andrew Morgan2020-04-031-1/+8
* | | Reduce the number of calls to `resource.getrusage` (#7183)Richard van der Hoff2020-04-031-39/+63
* | | Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-033-59/+76
|\ \ \
| * | | Update docstring per review commentsRichard van der Hoff2020-04-031-1/+1
| * | | review commentRichard van der Hoff2020-04-021-1/+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-311-7/+5
| * | | Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-311-4/+3
| * | | Remove unused `start_background_update`Richard van der Hoff2020-03-311-21/+0
* | | | Remove some `run_in_background` calls in replication code (#7203)Richard van der Hoff2020-04-031-8/+8
* | | | Merge branch 'master' into developRichard van der Hoff2020-04-031-1/+1
|\ \ \ \
| * | | | Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white...Richard van der Hoff2020-04-031-0/+15
| * | | | Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)""Richard van der Hoff2020-04-032-22/+31
| | |/ / | |/| |
| * | | 1.12.3Richard van der Hoff2020-04-031-1/+1
| * | | Fix the debian build in a better way. (#7212)Richard van der Hoff2020-04-031-3/+1
| * | | 1.12.2Andrew Morgan2020-04-021-1/+1
| * | | Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan2020-04-021-1/+3
| * | | 1.12.1Andrew Morgan2020-04-021-1/+1
* | | | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-031-2/+8
* | | | Merge branch 'master' into developAndrew Morgan2020-04-021-1/+1
|\ \ \ \
| * \ \ \ Merge tag 'v1.12.1'Andrew Morgan2020-04-024-13/+32
| |\ \ \ \
| | * | | | 1.12.1 v1.12.1 github/release-v1.12.1 release-v1.12.1Andrew Morgan2020-04-021-1/+1
| | |/ / /
| | * | | 1.12.1rc1Andrew Morgan2020-03-311-1/+1
| | * | | Only import sqlite3 when type checkingDavid Vo2020-03-311-2/+5
| | * | | Fix another instanceAndrew Morgan2020-03-311-5/+7
| | * | | Only setdefault for signatures if device has key_jsonAndrew Morgan2020-03-311-5/+7
| | * | | Fix starting workers when federation sending not split out.Erik Johnston2020-03-311-0/+12
| * | | | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-272-22/+31
| * | | | Update the wording of the config commentBrendan Abolivier2020-03-271-3/+3
| * | | | Whitelist the login fallback by default for SSOBrendan Abolivier2020-03-261-1/+16
| |/ / /
* | | | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-019-44/+218
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-17 22:54:48 +0000