Andrew Morgan
ea35d2cddc
Merge commit 'ad721fc55' into anoa/dinsic_release_1_31_0
2021-04-23 17:49:30 +01:00
Andrew Morgan
cac2b54fa0
Merge commit 'd315e9644' into anoa/dinsic_release_1_31_0
2021-04-23 17:49:16 +01:00
Andrew Morgan
977d3dc589
Merge commit '7fdc6cefb' into anoa/dinsic_release_1_31_0
2021-04-23 17:26:38 +01:00
Andrew Morgan
c8e6ac4977
Merge commit '33a02f0f5' into anoa/dinsic_release_1_31_0
2021-04-23 16:24:53 +01:00
Andrew Morgan
7ce8d7877e
Merge commit 'e12077a78' into anoa/dinsic_release_1_31_0
2021-04-23 15:44:57 +01:00
Andrew Morgan
1996a5f445
Merge commit '1b2d6d55c' into anoa/dinsic_release_1_31_0
2021-04-23 14:38:26 +01:00
Andrew Morgan
d2b3c47ba3
Merge commit 'e22b71810' into anoa/dinsic_release_1_31_0
2021-04-23 14:12:47 +01:00
Andrew Morgan
2036503c9e
Merge commit 'd9f1dccba' into anoa/dinsic_release_1_31_0
2021-04-23 13:39:50 +01:00
Andrew Morgan
5a514a3e11
Merge commit '1381cd05b' into anoa/dinsic_release_1_31_0
2021-04-23 12:22:55 +01:00
Andrew Morgan
458add9e29
Merge commit '8ec221710' into anoa/dinsic_release_1_31_0
2021-04-23 12:22:35 +01:00
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
d8df16e331
Merge commit '3f58fc848' into anoa/dinsic_release_1_31_0
2021-04-22 19:04:59 +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
92161ae9ed
Merge commit 'e288499c6' into anoa/dinsic_release_1_31_0
2021-04-22 19:02:06 +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
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
7bf3a6ee18
Merge commit '2e537a028' into anoa/dinsic_release_1_31_0
2021-04-22 18:31: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
19dc9ec9a1
Merge commit '939ef657c' into anoa/dinsic_release_1_31_0
2021-04-22 18:29:36 +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
50e257bea1
Merge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0
2021-04-22 18:24:35 +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
23ce9ea383
Merge commit 'd34c6e127' into anoa/dinsic_release_1_31_0
2021-04-22 16:22:57 +01:00
Andrew Morgan
3f8b6e5091
Merge commit '20af31088' into anoa/dinsic_release_1_31_0
2021-04-22 16:22:50 +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
64150ac9ba
Merge commit 'a03d71dc9' into anoa/dinsic_release_1_31_0
2021-04-21 16:16:41 +01:00
Andrew Morgan
4c970214af
Merge commit '23d701864' into anoa/dinsic_release_1_31_0
2021-04-21 16:16:22 +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
59766708cf
Fix old-style uses of self.make_request in dinum test code
2021-04-16 15:46:03 +01:00
Andrew Morgan
ec2cab331d
Merge commit 'bd30cfe86' into anoa/dinsic_release_1_31_0
2021-04-16 15:45:40 +01:00
Andrew Morgan
7fd80c73cc
Merge commit '8388a7fb3' into anoa/dinsic_release_1_31_0
2021-04-16 15:06:31 +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
93db8f1992
Merge commit 'cf7d3c90d' into dinsic
2021-04-16 12:33:45 +01:00
Andrew Morgan
0da5273f71
Stabilise all knock-related unstable identifiers that would be in state ( #96 )
2021-03-23 13:44:34 +00: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
7a61b0e752
Change knock room version to v7 ( #88 )
2021-03-18 17:26:13 +00:00
Dirk Klimpel
8000cf1315
Return m.change_password.enabled=false if local database is disabled ( #9588 )
...
Instead of if the user does not have a password hash. This allows a SSO
user to add a password to their account, but only if the local password
database is configured.
2021-03-16 11:44:25 -04:00
Richard van der Hoff
dd69110d95
Add support for stable MSC2858 API ( #9617 )
...
The stable format uses different brand identifiers, so we need to support two
identifiers for each IdP.
2021-03-16 11:21:26 +00:00
Patrick Cloke
075c16b410
Handle image transparency better when thumbnailing. ( #9473 )
...
Properly uses RGBA mode for 1- and 8-bit images with transparency
(instead of RBG mode).
2021-03-09 07:37:09 -05:00
