da757b7759
Rewrite identity server URLs as required. ( #4393 )
...
This takes a mapping of <old> -> <new> and looks up and replaces as
required.
2019-01-21 15:48:15 +00:00
cf68593544
Synchronise account metadata onto another server. ( #4145 )
...
* implement shadow registration via AS (untested)
* shadow support for 3pid binding/unbinding (untested)
2019-01-11 15:50:28 +00:00
6e7488ce11
merge master into dinsic, again...
2018-11-03 12:14:24 +00:00
41585e1340
Merge pull request #4047 from matrix-org/michaelkaye/dinsic_allow_user_directory_url
...
user_directory.defer_to_id_server should be an URL, not a hostname
2018-11-02 12:00:18 +00:00
b94a43d5b5
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list
2018-10-25 15:25:31 +01:00
e5481b22aa
Use allow/deny
2018-10-25 15:25:21 +01:00
f7f487e14c
Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin
2018-10-25 14:40:06 +01:00
9ec2186586
isort
2018-10-24 16:09:21 +01:00
ef771cc4c2
Fix a number of flake8 errors
...
Broadly three things here:
* disable W504 which seems a bit whacko
* remove a bunch of `as e` expressions from exception handlers that don't use
them
* use `r""` for strings which include backslashes
Also, we don't use pep8 any more, so we can get rid of the duplicate config
there.
2018-10-24 10:39:03 +01:00
47a9ba435d
Use match rather than search
2018-10-24 09:54:57 +01:00
a67d8ace9b
remove errant exception and style
2018-10-23 17:44:39 +01:00
c7503f8f33
merge in master
2018-10-22 20:19:40 +02:00
e1728dfcbe
Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on py3) ( #4068 )
2018-10-20 11:16:55 +11:00
cc325c7069
Calculate absolute path for email templates
2018-10-19 14:01:59 +01:00
084046456e
Add config option to control alias creation
2018-10-19 10:22:45 +01:00
c8f2c19991
Put the warning blob at the top of the file
2018-10-17 16:56:22 +01:00
1519572961
Ship the email templates as package_data
...
move the example email templates into the synapse package so that they can be
used as package data, which should mean that all of the packaging mechanisms
(pip, docker, debian, arch, etc) should now come with the example templates.
In order to grandfather in people who relied on the templates being in the old
place, check for that situation and fall back to using the defaults if the
templates directory does not exist.
2018-10-17 16:46:02 +01:00
9d8baa1595
Allow us to configure http vs https for user_directory
2018-10-17 11:38:48 +01:00
c6584f4b5f
clean up config error logic and imports
2018-10-17 11:36:41 +01:00
a2bfb778c8
improve auto room join logic, comments and tests
2018-10-12 18:17:36 +01:00
8f646f2d04
fix UTs
2018-09-28 15:37:28 +01:00
07340cdaca
untested stab at autocreating autojoin rooms
2018-09-28 01:42:53 +01:00
dc5db01ff2
Replaced all occurences of e.message with str(e)
...
Signed-off-by: Schnuffle <schnuffle@github.com>
2018-09-27 13:38:50 +02:00
b7d2fb5eb9
Remove some superfluous logging ( #3855 )
2018-09-13 19:59:32 +10:00
b8ad756bd0
Fix jwt import check
...
This handy code attempted to check that we could import jwt, but utterly failed
to check it was the right jwt.
Fixes https://github.com/matrix-org/synapse/issues/3793
2018-09-07 14:20:54 +01:00
0b01281e77
move threepid checker to config, add missing yields
2018-08-31 17:11:11 +01:00
05077e06fa
Change admin_uri to admin_contact in config and errors
2018-08-24 16:51:27 +01:00
cd77270a66
Implement trail users
2018-08-23 19:17:19 +01:00
324525f40c
Port over enough to get some sytests running on Python 3 ( #3668 )
2018-08-20 23:54:49 +10:00
c334ca67bb
Integrate presence from hotfixes ( #3694 )
2018-08-18 01:08:45 +10:00
0195dfbf52
server limits config docs
2018-08-17 13:58:25 +01:00
13ad9930c8
add new error type ResourceLimit
2018-08-16 18:02:02 +01:00
55afba0fc5
update admin email to uri
2018-08-15 11:41:18 +01:00
ab035bdeac
replace admin_email with admin_uri for greater flexibility
2018-08-15 10:16:41 +01:00
f4b49152e2
support admin_email config and pass through into blocking errors, return AuthError in all cases
2018-08-13 21:09:47 +01:00
ce7de9ae6b
Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"
...
This reverts commit 0d43f991a1
2018-08-13 18:06:18 +01:00
0d43f991a1
support admin_email config and pass through into blocking errors, return AuthError in all cases
2018-08-13 18:00:23 +01:00
c08f9d95b2
log *after* reloading log config
...
... because logging *before* reloading means the log message gets lost in the old MemoryLogger
2018-08-10 14:56:48 +01:00
d2f3ef98ac
Merge branch 'develop' into neilj/disable_hs
2018-08-08 15:55:47 +00:00
e8eba2b4e3
implement reserved users for mau limits
2018-08-07 17:49:43 +01:00
7daa8a78c5
load mau limit threepids
2018-08-06 22:55:05 +01:00
42c6823827
disable HS from config
2018-08-04 22:07:04 +01:00
5593ff6773
fix (lots of) py3 test failures
2018-08-03 14:59:17 +01:00
704c3e6239
Merge branch 'master' into develop
2018-08-02 15:43:30 +01:00
2c54f1c225
remove need to plot limit_usage_by_mau
2018-08-01 11:46:59 +01:00
df2235e7fa
coding style
2018-07-31 13:16:20 +01:00
251e6c1210
limit register and sign in on number of monthly users
2018-07-30 15:55:57 +01:00
2669e494e0
Merge remote-tracking branch 'origin/master' into dinsic
2018-07-19 18:25:25 +01:00
5f3658baf5
Merge pull request #3377 from Valodim/note-affinity
...
document that the affinity package is required for the cpu_affinity setting
2018-07-19 14:35:06 +01:00
1d11d9323d
Merge remote-tracking branch 'origin/master' into dinsic
2018-07-17 15:43:33 +01:00
Michael Kaye