72b2cb5460
Merge commit '420031906' into anoa/dinsic_release_1_31_0
2021-04-22 16:22:27 +01:00
527049b71a
Merge commit '233c8b9fc' into anoa/dinsic_release_1_31_0
2021-04-22 16:22:21 +01:00
77f011b8fd
Merge commit '98a64b7f7' into anoa/dinsic_release_1_31_0
2021-04-22 16:21:11 +01:00
a01843fd88
Merge commit '2fb1c2b6e' into anoa/dinsic_release_1_31_0
2021-04-21 16:17:02 +01:00
a1a9b51fd7
Merge commit '63593134a' into anoa/dinsic_release_1_31_0
2021-04-21 16:16:30 +01:00
c7cd7b4545
Merge commit '0312266ee' into anoa/dinsic_release_1_31_0
2021-04-21 16:16:10 +01:00
744f456324
Merge commit '9999eb2d0' into anoa/dinsic_release_1_31_0
2021-04-21 15:35:15 +01:00
82b462401f
Merge commit '4218473f9' into anoa/dinsic_release_1_31_0
2021-04-21 15:34:28 +01:00
52620bdb83
Merge commit '28877fade' into anoa/dinsic_release_1_31_0
2021-04-21 15:09:52 +01:00
ed6742cb30
Merge commit 'c9c1c9d82' into anoa/dinsic_release_1_31_0
2021-04-20 16:59:59 +01:00
83c1c8a56b
Merge commit 'ff5c4da12' into anoa/dinsic_release_1_31_0
2021-04-20 16:41:22 +01:00
cf1e0196bb
Merge commit 'f14428b25' into anoa/dinsic_release_1_31_0
2021-04-16 15:02:53 +01:00
eb19dc5578
Merge commit 'c64002e1c' into anoa/dinsic_release_1_31_0
2021-04-16 14:26:36 +01:00
8011007148
Merge commit '6ff34e00d' into anoa/dinsic_release_1_31_0
2021-04-16 14:26:27 +01:00
93db8f1992
Merge commit 'cf7d3c90d' into dinsic
2021-04-16 12:33:45 +01:00
232b324c38
Port "Add support for no_proxy and case insensitive env variables" from mainline to dinsic ( #93 )
...
This PR is simply porting https://github.com/matrix-org/synapse/pull/9372 to dinsic.
I also had to bring in https://github.com/matrix-org/synapse/pull/8821 and https://github.com/matrix-org/synapse/pull/9084 for this code to work properly - a sign that we should merge mainline into dinsic again soon.
2021-03-22 17:48:42 +00:00
8f97c6c2da
Add a config option to prioritise local users in user directory search results ( #84 )
...
* Add a config option to prioritise local users in user directory search results (#9383 )
This PR adds a homeserver config option, `user_directory.prefer_local_users`, that when enabled will show local users higher in user directory search results than remote users. This option is off by default.
Note that turning this on doesn't necessarily mean that remote users will always be put below local users, but they should be assuming all other ranking factors (search query match, profile information present etc) are identical.
This is useful for, say, University networks that are openly federating, but want to prioritise local students and staff in the user directory over other random users.
* Don't mix simple and english psql query types
2021-02-19 12:11:02 +00:00
6bf58d8194
Add knocking support ( #81 )
...
Implement knocking as defined by https://github.com/matrix-org/matrix-doc/pull/2403
This is the base knocking stuff, taken from https://github.com/matrix-org/synapse/pull/6739
and does not include any public room directory changes.
While knocking hasn't merged yet on mainline due to waiting on getting Complement
into Synapse's CI, the code has been well-tested.
2021-02-09 19:07:00 +00:00
5310808d3b
Give the user a better error when they present bad SSO creds
...
If a user tries to do UI Auth via SSO, but uses the wrong account on the SSO
IdP, try to give them a better error.
Previously, the UIA would claim to be successful, but then the operation in
question would simply fail with "auth fail". Instead, serve up an error page
which explains the failure.
2021-01-13 20:22:41 +00:00
d1eb1b96e8
Register the /devices endpoint on workers. ( #9092 )
2021-01-13 12:35:40 -05:00
7a2e9b549d
Remove user's avatar URL and displayname when deactivated. ( #8932 )
...
This only applies if the user's data is to be erased.
2021-01-12 16:30:15 -05:00
b161528fcc
Also support remote users on the joined_rooms admin API. ( #8948 )
...
For remote users, only the rooms which the server knows about are returned.
Local users have all of their joined rooms returned.
2021-01-11 14:32:17 -05:00
1315a2e8be
Use a chain cover index to efficiently calculate auth chain difference ( #8868 )
2021-01-11 16:09:22 +00:00
bce0c91d9a
Keycloak mapping_provider example ( #9037 ) ( #9057 )
...
This PR adds the missing user_mapping_provider section in oidc.md
Signed-off-by: Christopher Rücker chris-ruecker@protonmail.com
2021-01-08 18:29:30 +00:00
9066c2fd7f
Fix typo in docs/systemd-with-workers/README.md ( #9035 )
...
Signed-off-by: Emelie em@nao.sh
2021-01-07 15:31:01 +00:00
111b673fc1
Add initial support for a "pick your IdP" page ( #9017 )
...
During login, if there are multiple IdPs enabled, offer the user a choice of
IdPs.
2021-01-05 11:25:28 +00:00
192bf29ca0
Merge commit '693dab487' into anoa/dinsic_release_1_23_1
2020-12-31 17:19:54 +00:00
a839d0f32d
Merge commit '09ac0569f' into anoa/dinsic_release_1_23_1
2020-12-31 17:19:14 +00:00
9ab7375f9d
Merge commit 'a090b8620' into anoa/dinsic_release_1_23_1
2020-12-31 17:09:21 +00:00
0c897c7410
Merge commit '7c4344747' into anoa/dinsic_release_1_23_1
2020-12-31 17:08:54 +00:00
fce9ace555
Merge commit '8ca120df7' into anoa/dinsic_release_1_23_1
2020-12-31 16:50:13 +00:00
3cf5e8b3f9
Merge commit '03e392f78' into anoa/dinsic_release_1_23_1
2020-12-31 16:50:11 +00:00
1077d50c65
Merged commit 'deff8f628' into anoa/dinsic_release_1_23_1
2020-12-31 16:20:32 +00:00
917d0f9250
Merge commit 'f12589547' into anoa/dinsic_release_1_23_1
2020-12-31 14:55:18 +00:00
ca151ff0bd
Merge commit '4a54b821b' into anoa/dinsic_release_1_23_1
2020-12-31 14:35:50 +00:00
883c742960
Merge commit '89700dfb8' into anoa/dinsic_release_1_23_1
2020-12-31 14:35:45 +00:00
551681c29d
Merge commit 'c3119d153' into anoa/dinsic_release_1_23_1
2020-12-31 14:35:35 +00:00
535afe4313
Merge commit 'f27a78969' into anoa/dinsic_release_1_23_1
2020-12-31 14:35:28 +00:00
de6773523d
Merge commit 'ef2d62701' into anoa/dinsic_release_1_23_1
2020-12-31 14:34:59 +00:00
b90b34744a
Merge commit 'c97da1e45' into anoa/dinsic_release_1_23_1
2020-12-31 13:40:57 +00:00
3efa169750
Merge commit '88e1d0c52' into anoa/dinsic_release_1_23_1
2020-12-31 13:40:45 +00:00
47c25048c5
Merge commit '24229fac0' into anoa/dinsic_release_1_23_1
2020-12-31 13:40:07 +00:00
a190ad61b3
Merge commit '2b7c18087' into anoa/dinsic_release_1_23_1
2020-12-31 11:58:26 +00:00
5fc0dd8126
Merge commit '74976a8e4' into dinsic
2020-12-31 11:23:24 +00:00
63e8ab5481
Allow users to click account renewal links multiple times without hitting an 'Invalid Token' page ( #74 )
2020-12-30 17:43:08 +00:00
cfcf5541b4
Update the value of group_creation_prefix in sample config. ( #8992 )
...
Removes the trailing slash with causes issues with matrix.to/Element.
2020-12-29 09:30:48 -05:00
68bb26da69
Allow redacting events on workers ( #8994 )
...
Adds the redacts endpoint to workers that have the client listener.
2020-12-29 07:40:12 -05:00
4218473f9e
Refactor the CAS handler in prep for using the abstracted SSO code. ( #8958 )
...
This makes the CAS handler look more like the SAML/OIDC handlers:
* Render errors to users instead of throwing JSON errors.
* Internal reorganization.
2020-12-18 13:09:45 -05:00
56e00ca85e
Send the location of the web client to the IS when inviting via 3PIDs. ( #8930 )
...
Adds a new setting `email.invite_client_location` which, if defined, is
passed to the identity server during invites.
2020-12-18 11:01:57 -05:00
d781a81e69
Allow server admin to get admin bit in rooms where local user is an admin ( #8756 )
...
This adds an admin API that allows a server admin to get power in a room if a local user has power in a room. Will also invite the user if they're not in the room and its a private room. Can specify another user (rather than the admin user) to be granted power.
Co-authored-by: Matthew Hodgson <matthew@matrix.org >
2020-12-18 15:37:19 +00:00
Andrew Morgan