Andrew Morgan
7fffd3789b
Merge commit '22db45bd4' into anoa/dinsic_release_1_31_0
2021-04-23 17:26:31 +01:00
Andrew Morgan
96f8556e08
Merge commit 'a5daae2a5' into anoa/dinsic_release_1_31_0
2021-04-23 16:24:31 +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
6afa265e4e
Merge commit '292792194' into anoa/dinsic_release_1_31_0
2021-04-23 14:38:31 +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
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
Patrick Cloke
683d6f75af
Rename handler and config modules which end in handler/config. ( #9816 )
2021-04-20 14:55:20 -04: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
71f0623de9
Port "Allow users to click account renewal links multiple times without hitting an 'Invalid Token' page #74 " from synapse-dinsic ( #9832 )
...
This attempts to be a direct port of https://github.com/matrix-org/synapse-dinsic/pull/74 to mainline. There was some fiddling required to deal with the changes that have been made to mainline since (mainly dealing with the split of `RegistrationWorkerStore` from `RegistrationStore`, and the changes made to `self.make_request` in test code).
2021-04-19 19:16:34 +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
