Matthew Hodgson
739d3500fe
pep8
2018-03-13 01:50:32 +00:00
Matthew Hodgson
0e2d70e101
typos
2018-03-13 01:41:20 +00:00
Matthew Hodgson
82c4fd7226
add yields
2018-03-13 01:38:02 +00:00
Matthew Hodgson
e446077478
delegate to the IS to check 3PID signup eligibility
2018-03-13 01:34:20 +00:00
Matthew Hodgson
d82c89ac22
fix thinko on 3pid whitelisting
2018-01-24 11:07:24 +01:00
Matthew Hodgson
75b25b3f1f
Merge branch 'develop' into dinsic
2018-01-23 10:00:53 +01:00
Matthew Hodgson
d32385336f
add ?ts massaging for ASes ( #2754 )
...
blindly implement ?ts for AS. untested
2018-01-23 09:59:06 +01:00
Richard van der Hoff
b2da272b77
Merge pull request #2821 from matrix-org/rav/matthew_test_fixes
...
Matthew's fixes to the unit tests
2018-01-22 20:43:56 +00:00
AmandineLP
1df10d8814
Fixed translation
2018-01-22 21:18:44 +01:00
AmandineLP
8f9340d248
Fixed translation
2018-01-22 21:17:36 +01:00
AmandineLP
c5034cd4b0
More translation
2018-01-22 21:16:46 +01:00
AmandineLP
f7f937d051
Translate to FR
2018-01-22 21:14:13 +01:00
AmandineLP
e52b5d94a9
Translate to FR
2018-01-22 21:13:03 +01:00
AmandineLP
d90f27a21f
Translate to FR
2018-01-22 21:12:06 +01:00
AmandineLP
03cf9710e3
Translate to FR
2018-01-22 21:10:00 +01:00
AmandineLP
1dcdd8d568
Translate to FR
2018-01-22 20:02:47 +01:00
AmandineLP
4344fb1faf
translate to FR
2018-01-22 20:01:00 +01:00
Matthew Hodgson
846577ebde
fork notif templates
2018-01-22 19:55:27 +01:00
Matthew Hodgson
ab9f844aaf
Add federation_domain_whitelist option ( #2820 )
...
Add federation_domain_whitelist
gives a way to restrict which domains your HS is allowed to federate with.
useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network
2018-01-22 19:11:18 +01:00
Matthew Hodgson
3869981227
remove unreachable except block
2018-01-22 18:43:41 +01:00
Matthew Hodgson
fa80b492a5
fix thinko
2018-01-22 18:43:41 +01:00
Richard van der Hoff
5c431f421c
Matthew's fixes to the unit tests
...
Extracted from https://github.com/matrix-org/synapse/pull/2820
2018-01-22 16:46:16 +00:00
Richard van der Hoff
c776c52eed
Back out unrelated changes
2018-01-22 16:44:39 +00:00
Matthew Hodgson
b424c16f50
fix tests
2018-01-22 15:25:25 +01:00
Matthew Hodgson
d84f65255e
Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid
...
add registrations_require_3pid and allow_local_3pids
2018-01-22 13:57:22 +00:00
Matthew Hodgson
313a489fc9
incorporate PR feedback
2018-01-22 14:54:46 +01:00
Matthew Hodgson
4b090cb273
add federation_domain_whitelist
...
gives a way to restrict which domains your HS is allowed to federate with.
useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network
2018-01-22 12:13:41 +01:00
Matthew Hodgson
3f79378d4b
make replication tests pass on OSX
2018-01-20 17:23:27 +00:00
Matthew Hodgson
49fce04624
fix typo (thanks sytest)
2018-01-19 19:55:38 +00:00
Richard van der Hoff
b0d9e633ee
Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbs
...
Use the right path for url_preview thumbnails
2018-01-19 18:57:15 +00:00
Richard van der Hoff
ad7ec63d08
Use the right path for url_preview thumbnails
...
This was introduced by #2627 : we were overwriting the original media for url
previews with the thumbnails :/
(fixes https://github.com/vector-im/riot-web/issues/6012 , hopefully)
2018-01-19 18:29:39 +00:00
Matthew Hodgson
62d7d66ae5
oops, check all login types
2018-01-19 18:23:56 +00:00
Matthew Hodgson
8fe253f19b
fix PR nitpicking
2018-01-19 18:23:45 +00:00
Matthew Hodgson
293380bef7
trailing commas
2018-01-19 15:38:53 +00:00
Matthew Hodgson
447f4f0d5f
rewrite based on PR feedback:
...
* [ ] split config options into allowed_local_3pids and registrations_require_3pid
* [ ] simplify and comment logic for picking registration flows
* [ ] fix docstring and move check_3pid_allowed into a new util module
* [ ] use check_3pid_allowed everywhere
@erikjohnston PTAL
2018-01-19 15:33:55 +00:00
Matthew Hodgson
9d332e0f79
fix up v1, and improve errors
2018-01-19 00:53:58 +00:00
Matthew Hodgson
0af58f14ee
fix pep8
2018-01-19 00:33:51 +00:00
Matthew Hodgson
81d037dbd8
mock registrations_require_3pid
2018-01-19 00:28:08 +00:00
Matthew Hodgson
28a6ccb49c
add registrations_require_3pid
...
lets homeservers specify a whitelist for 3PIDs that users are allowed to associate with.
Typically useful for stopping people from registering with non-work emails
2018-01-19 00:19:58 +00:00
Erik Johnston
cd871a3057
Fix storage provider bug introduced when renamed to store_local
2018-01-18 18:37:59 +00:00
Erik Johnston
8ff6726c0d
Merge pull request #2812 from matrix-org/erikj/media_storage_provider_config
...
Make storage providers configurable
2018-01-18 18:33:57 +00:00
Erik Johnston
d69768348f
Fix passing wrong config to provider constructor
2018-01-18 17:14:05 +00:00
Erik Johnston
8e85220373
Remove duplicate directory test
2018-01-18 17:12:35 +00:00
Erik Johnston
3fe2bae857
Missing staticmethod
2018-01-18 17:11:45 +00:00
Erik Johnston
aae77da73f
Fixup comments
2018-01-18 17:11:29 +00:00
Erik Johnston
b6dc7044a9
Merge pull request #2804 from matrix-org/erikj/file_consumer
...
Add decent impl of a FileConsumer
2018-01-18 16:31:33 +00:00
Erik Johnston
9a89dae8c5
Fix typo in thumbnail resource causing access times to be incorrect
2018-01-18 15:06:24 +00:00
Erik Johnston
0af5dc63a8
Make storage providers more configurable
2018-01-18 14:07:21 +00:00
Richard van der Hoff
5a4da21d58
Merge pull request #2810 from matrix-org/rav/metrics_fixes
...
Fix bugs in block metrics
2018-01-18 13:35:28 +00:00
Richard van der Hoff
d57765fc8a
Fix bugs in block metrics
...
... which I introduced in #2785
2018-01-18 12:24:42 +00:00
