458add9e29
Merge commit '8ec221710' into anoa/dinsic_release_1_31_0
2021-04-23 12:22:35 +01:00
476cc03d7a
Merge commit 'd2f0ec12d' into anoa/dinsic_release_1_31_0
2021-04-23 12:22:28 +01:00
3e6a798ee7
Merge commit 'e40d88cff' into anoa/dinsic_release_1_31_0
2021-04-22 19:11:54 +01:00
62a44bcedc
Merge commit 'fb0e14ee9' into anoa/dinsic_release_1_31_0
2021-04-22 19:05:12 +01:00
d8df16e331
Merge commit '3f58fc848' into anoa/dinsic_release_1_31_0
2021-04-22 19:04:59 +01:00
2eb003c966
Merge commit '5a9cdaa6e' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:24 +01:00
ae9ce80220
Merge commit '7e8083eb4' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:16 +01:00
d06a48b4be
Merge commit '2ab6e67ab' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:12 +01:00
aa8555e337
Merge commit '261093072' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:04 +01:00
0145f103f5
Merge commit '351845452' into anoa/dinsic_release_1_31_0
2021-04-22 18:39:22 +01:00
9273535ade
Merge commit '18ab35284' into anoa/dinsic_release_1_31_0
2021-04-22 18:37:01 +01:00
3518cc79b6
Merge commit '9c715a5f1' into anoa/dinsic_release_1_31_0
2021-04-22 18:33:37 +01:00
27fd9474ae
Merge commit 'e19396d62' into anoa/dinsic_release_1_31_0
2021-04-22 18:32:44 +01:00
3c159e5c0c
Merge commit 'a78016dad' into anoa/dinsic_release_1_31_0
2021-04-22 18:32:38 +01:00
7bf3a6ee18
Merge commit '2e537a028' into anoa/dinsic_release_1_31_0
2021-04-22 18:31:10 +01:00
cfa0cff6aa
Merge commit '1baab2035' into anoa/dinsic_release_1_31_0
2021-04-22 18:30:10 +01:00
159622bd9a
Merge commit 'cee4010f9' into anoa/dinsic_release_1_31_0
2021-04-22 18:30:04 +01:00
f22d69bcf3
Merge commit 'fdf834694' into anoa/dinsic_release_1_31_0
2021-04-22 18:29:56 +01:00
357f84c952
Merge commit '42a8e8137' into anoa/dinsic_release_1_31_0
2021-04-22 18:27:20 +01:00
15f31e1ca9
Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0
2021-04-22 18:26:10 +01:00
50e257bea1
Merge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0
2021-04-22 18:24:35 +01:00
07c70a8261
Merge commit '73b03722f' into anoa/dinsic_release_1_31_0
2021-04-22 18:12:49 +01:00
53f6ab1c34
Merge commit '2b467d0b6' into anoa/dinsic_release_1_31_0
2021-04-22 17:29:20 +01:00
6714a091ea
Merge commit '9de6b9411' into anoa/dinsic_release_1_31_0
2021-04-22 17:28:31 +01:00
a31eb4a9fd
Merge commit '3e4cdfe5d' into anoa/dinsic_release_1_31_0
2021-04-22 16:34:35 +01:00
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
bb2577f6b7
Add http2 to the nginx example config ( #9390 )
2021-02-18 08:46:16 -05:00
626afd7e89
Revert "Update workers.md"
...
This reverts commit a8878960c0
2021-02-18 11:56:25 +00:00
c8d9383cfb
Add the shadow-banning status to the display user admin API. ( #9400 )
2021-02-17 15:19:23 -05:00
53f1c4da81
Update workers.md
2021-02-17 17:14:23 +00:00
a8878960c0
Update workers.md
...
tiny typo in sso paths
2021-02-17 17:11:24 +00:00
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
`](https://github.com/matrix-org/synapse/blob/80d6dc9783aa80886a133756028984dbf8920168/docs/code_style.md )
- Update `code_style.md` docs around installing black to use the correct version
2021-02-16 22:32:34 +00:00
5636e597c3
Fix OIDC gitiea redirect URL. ( #9404 )
...
Fixes a "conflict" from 846b9d3df0d1f13c7485
2021-02-16 14:06:55 -05:00
ddfdf94506
Document that pusher instances are shardable ( #9407 )
2021-02-16 13:27:49 +00:00
Andrew Morgan