Andrew Morgan
476cc03d7a
Merge commit 'd2f0ec12d' into anoa/dinsic_release_1_31_0
2021-04-23 12:22:28 +01:00
Andrew Morgan
3e6a798ee7
Merge commit 'e40d88cff' into anoa/dinsic_release_1_31_0
2021-04-22 19:11:54 +01:00
Andrew Morgan
62a44bcedc
Merge commit 'fb0e14ee9' into anoa/dinsic_release_1_31_0
2021-04-22 19:05:12 +01:00
Andrew Morgan
d8df16e331
Merge commit '3f58fc848' into anoa/dinsic_release_1_31_0
2021-04-22 19:04:59 +01:00
Andrew Morgan
2eb003c966
Merge commit '5a9cdaa6e' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:24 +01:00
Andrew Morgan
ae9ce80220
Merge commit '7e8083eb4' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:16 +01:00
Andrew Morgan
d06a48b4be
Merge commit '2ab6e67ab' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:12 +01:00
Andrew Morgan
aa8555e337
Merge commit '261093072' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:04 +01:00
Andrew Morgan
0145f103f5
Merge commit '351845452' into anoa/dinsic_release_1_31_0
2021-04-22 18:39:22 +01:00
Andrew Morgan
9273535ade
Merge commit '18ab35284' into anoa/dinsic_release_1_31_0
2021-04-22 18:37:01 +01:00
Andrew Morgan
3518cc79b6
Merge commit '9c715a5f1' into anoa/dinsic_release_1_31_0
2021-04-22 18:33:37 +01:00
Andrew Morgan
27fd9474ae
Merge commit 'e19396d62' into anoa/dinsic_release_1_31_0
2021-04-22 18:32:44 +01:00
Andrew Morgan
3c159e5c0c
Merge commit 'a78016dad' into anoa/dinsic_release_1_31_0
2021-04-22 18:32:38 +01:00
Andrew Morgan
7bf3a6ee18
Merge commit '2e537a028' into anoa/dinsic_release_1_31_0
2021-04-22 18:31:10 +01:00
Andrew Morgan
cfa0cff6aa
Merge commit '1baab2035' into anoa/dinsic_release_1_31_0
2021-04-22 18:30:10 +01:00
Andrew Morgan
159622bd9a
Merge commit 'cee4010f9' into anoa/dinsic_release_1_31_0
2021-04-22 18:30:04 +01:00
Andrew Morgan
f22d69bcf3
Merge commit 'fdf834694' into anoa/dinsic_release_1_31_0
2021-04-22 18:29:56 +01:00
Andrew Morgan
357f84c952
Merge commit '42a8e8137' into anoa/dinsic_release_1_31_0
2021-04-22 18:27:20 +01:00
Andrew Morgan
15f31e1ca9
Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0
2021-04-22 18:26:10 +01:00
Andrew Morgan
50e257bea1
Merge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0
2021-04-22 18:24:35 +01:00
Andrew Morgan
07c70a8261
Merge commit '73b03722f' into anoa/dinsic_release_1_31_0
2021-04-22 18:12:49 +01:00
Andrew Morgan
53f6ab1c34
Merge commit '2b467d0b6' into anoa/dinsic_release_1_31_0
2021-04-22 17:29:20 +01:00
Andrew Morgan
6714a091ea
Merge commit '9de6b9411' into anoa/dinsic_release_1_31_0
2021-04-22 17:28:31 +01:00
Andrew Morgan
a31eb4a9fd
Merge commit '3e4cdfe5d' into anoa/dinsic_release_1_31_0
2021-04-22 16:34:35 +01:00
Andrew Morgan
72b2cb5460
Merge commit '420031906' into anoa/dinsic_release_1_31_0
2021-04-22 16:22:27 +01:00
Andrew Morgan
527049b71a
Merge commit '233c8b9fc' into anoa/dinsic_release_1_31_0
2021-04-22 16:22:21 +01:00
Andrew Morgan
77f011b8fd
Merge commit '98a64b7f7' into anoa/dinsic_release_1_31_0
2021-04-22 16:21:11 +01:00
Andrew Morgan
a01843fd88
Merge commit '2fb1c2b6e' into anoa/dinsic_release_1_31_0
2021-04-21 16:17:02 +01:00
Andrew Morgan
a1a9b51fd7
Merge commit '63593134a' into anoa/dinsic_release_1_31_0
2021-04-21 16:16:30 +01:00
Andrew Morgan
c7cd7b4545
Merge commit '0312266ee' into anoa/dinsic_release_1_31_0
2021-04-21 16:16:10 +01:00
Andrew Morgan
744f456324
Merge commit '9999eb2d0' into anoa/dinsic_release_1_31_0
2021-04-21 15:35:15 +01:00
Andrew Morgan
82b462401f
Merge commit '4218473f9' into anoa/dinsic_release_1_31_0
2021-04-21 15:34:28 +01:00
Andrew Morgan
52620bdb83
Merge commit '28877fade' into anoa/dinsic_release_1_31_0
2021-04-21 15:09:52 +01:00
Andrew Morgan
ed6742cb30
Merge commit 'c9c1c9d82' into anoa/dinsic_release_1_31_0
2021-04-20 16:59:59 +01:00
Andrew Morgan
83c1c8a56b
Merge commit 'ff5c4da12' into anoa/dinsic_release_1_31_0
2021-04-20 16:41:22 +01:00
Andrew Morgan
cf1e0196bb
Merge commit 'f14428b25' into anoa/dinsic_release_1_31_0
2021-04-16 15:02:53 +01:00
Andrew Morgan
eb19dc5578
Merge commit 'c64002e1c' into anoa/dinsic_release_1_31_0
2021-04-16 14:26:36 +01:00
Andrew Morgan
8011007148
Merge commit '6ff34e00d' into anoa/dinsic_release_1_31_0
2021-04-16 14:26:27 +01:00
Andrew Morgan
93db8f1992
Merge commit 'cf7d3c90d' into dinsic
2021-04-16 12:33:45 +01:00
Andrew Morgan
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
Andrew Morgan
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
Eric Eastwood
0a00b7ff14
Update black, and run auto formatting over the codebase ( #9381 )
...
- Update black version to the latest
- Run black auto formatting over the codebase
- Run autoformatting according to [`docs/code_style.md
`](80d6dc9783/docs/code_style.md
2021-02-16 22:32:34 +00:00
Marcus
5636e597c3
Fix OIDC gitiea redirect URL. ( #9404 )
...
Fixes a "conflict" from 846b9d3df0d1f13c7485
2021-02-16 14:06:55 -05:00
Erik Johnston
ddfdf94506
Document that pusher instances are shardable ( #9407 )
2021-02-16 13:27:49 +00:00
Andrew Morgan
ff40c8099d
Fix sample config
...
Just a small change missed in 7950aa8a27
2021-02-12 22:18:40 +00:00
Patrick Cloke
2c9b4a5f16
Merge tag 'v1.27.0rc2' into develop
...
Synapse 1.27.0rc2 (2021-02-11)
==============================
Features
--------
- Further improvements to the user experience of registration via single sign-on. ([\#9297](https://github.com/matrix-org/synapse/issues/9297 ))
Bugfixes
--------
- Fix ratelimiting introduced in v1.27.0rc1 for invites to respect the `ratelimit` flag on application services. ([\#9302](https://github.com/matrix-org/synapse/issues/9302 ))
- Do not automatically calculate `public_baseurl` since it can be wrong in some situations. Reverts behaviour introduced in v1.26.0. ([\#9313](https://github.com/matrix-org/synapse/issues/9313 ))
Improved Documentation
----------------------
- Clarify the sample configuration for changes made to the template loading code. ([\#9310](https://github.com/matrix-org/synapse/issues/9310 ))
2021-02-11 11:56:03 -05:00
Patrick Cloke
e40d88cff3
Backout changes for automatically calculating the public baseurl. ( #9313 )
...
This breaks some people's configurations (if their Client-Server API
is not accessed via port 443).
2021-02-11 11:16:54 -05:00
Andrew Morgan
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
Thomas Mortagne
5f716fa777
Add XWiki OIDC provider example. ( #9324 )
2021-02-09 11:54:52 -05:00
David Teller
b0b2cac057
Merge pull request #9150 from Yoric/develop-context
...
New API /_synapse/admin/rooms/{roomId}/context/{eventId}
2021-02-08 15:53:44 +01:00
