aed4e4ecdd
Merge pull request #2762 from matrix-org/rav/fix_logconfig_indenting
...
Make indentation of generated log config consistent
2018-01-09 12:07:56 +00:00
f8fa5ae4af
enable twisted delayedcall debugging in UTs
2018-01-09 12:06:45 +00:00
374c4d4ced
Remove dead code
...
pointless function is pointless
2018-01-09 12:06:45 +00:00
142fb0a7d4
Disable user_directory updates for UTs
...
Fix flakiness in the UTs caused by the user_directory being updated in the
background
2018-01-09 12:06:45 +00:00
0211464ba2
Fix broken config UTs
...
https://github.com/matrix-org/synapse/pull/2755 broke log-config generation,
which in turn broke the unit tests.
2018-01-09 11:28:33 +00:00
3a556f1ea0
Make indentation of generated log config consistent
...
(we had a mix of 2- and 4-space indents)
2018-01-09 11:27:19 +00:00
e9f7677170
Merge pull request #2761 from turt2live/patch-1
...
Fix templating error with unban permission message
2018-01-08 10:10:49 +00:00
eccfc8e928
Fix templating error with unban permission message
...
Fixes https://github.com/matrix-org/synapse/issues/2759
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-01-07 19:52:58 -07:00
e6b24663e4
Merge pull request #2755 from matrix-org/richvdh-patch-1
...
Remove 'verbosity'/'log_file' from generated cfg
2018-01-05 14:17:46 +00:00
840f72356e
Remove 'verbosity'/'log_file' from generated cfg
...
... because these only really exist to confuse people nowadays.
Also bring log config more into line with the generated log config, by making `level_for_storage`
apply to the `synapse.storage.SQL` logger rather than `synapse.storage`.
2018-01-05 12:30:28 +00:00
18e3a16e8b
Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse
2018-01-05 10:54:22 +00:00
864a6d2977
Bump version and changelog
2018-01-05 10:54:01 +00:00
6e375f4597
Merge pull request #2744 from matrix-org/rav/login_logging
...
Better logging when login can't find a 3pid
2018-01-05 09:54:39 +00:00
efdfd5c835
Merge pull request #2745 from matrix-org/rav/assert_params
...
Check missing fields in event_from_pdu_json
2018-01-05 09:52:39 +00:00
bd91857028
Check missing fields in event_from_pdu_json
...
Return a 400 rather than a 500 when somebody messes up their send_join
2017-12-30 18:40:19 +00:00
3079f80d4a
Factor out `event_from_pdu_json`
...
turns out we have two copies of this, and neither needs to be an instance
method
2017-12-30 18:40:19 +00:00
65abc90fb6
federation_server: clean up imports
2017-12-30 18:40:19 +00:00
a7b726ad18
federation_client: clean up imports
2017-12-30 18:40:19 +00:00
75c1b8df01
Better logging when login can't find a 3pid
2017-12-20 19:31:00 +00:00
3f9f1c50f3
Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typo
...
synapse/config/password_auth_providers: Fixed bracket typo
2017-12-18 22:37:21 +00:00
48fa4e1e5b
Merge pull request #2435 from silkeh/listen-ipv6-default
...
Adapt the default config to bind on both IPv4 and IPv6 on all platforms
2017-12-18 22:34:50 +00:00
df0f602796
Implement listen_tcp method in remaining workers
...
Signed-off-by: Silke <silke@slxh.eu>
2017-12-18 20:00:42 +01:00
26cd3f5690
Remove logger argument and do not catch replication listener
...
Signed-off-by: Silke <silke@slxh.eu>
2017-12-18 20:00:42 +01:00
3355ce650d
Merge pull request #2737 from Valodim/master
...
mention federation tester more prominently in the readme
2017-12-17 23:05:17 +00:00
ed48ecc58c
Add methods for listening on multiple addresses
...
Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP
and reactor.listenSSL for multiple addresses.
Signed-off-by: Silke Hofstra <silke@slxh.eu>
2017-12-17 13:15:48 +01:00
37d1a90025
Allow binds to both :: and 0.0.0.0
...
Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed.
This causes a warning explaining the behaviour.
Configuration changed to match.
See #2232
Signed-off-by: Silke Hofstra <silke@slxh.eu>
2017-12-17 13:10:31 +01:00
3e59143ba8
Adapt the default config to bind on IPv6.
...
Most deployments are on Linux (or Mac OS), so this would actually bind
on both IPv4 and IPv6.
Resolves #1886 .
Signed-off-by: Willem Mulder <willemmaster@hotmail.com>
2017-12-17 13:07:37 +01:00
9419bb5776
mention federation tester more prominently in the readme
2017-12-16 22:09:53 +02:00
80573e3900
Fix rc version number
2017-12-13 15:15:33 +00:00
069ae2a5d6
Bump changelog and version
2017-12-13 15:11:22 +00:00
ba24576f2f
Merge pull request #2717 from matrix-org/erikj/createroom_content
...
Fix wrong avatars when inviting multiple users when creating room
2017-12-07 20:00:34 +00:00
d8a6c734fa
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
2017-12-07 14:24:01 +00:00
ef045dcd71
Copy dict in update_membership too
2017-12-07 14:17:15 +00:00
33cb7ef0b7
Merge pull request #2723 from matrix-org/matthew/search-all-local-users
...
Add all local users to the user_directory and optionally search them
2017-12-05 11:09:47 +00:00
cdc2cb5d11
fix StoreError syntax
2017-12-05 11:09:31 +00:00
16ec3805e5
Fix error when deleting devices
...
This was introduced in d7ea8c4#2728
2017-12-05 09:49:22 +00:00
8529874368
Merge pull request #2729 from matrix-org/rav/custom_ui_auth
...
support custom login types for validating users
2017-12-05 09:43:43 +00:00
da1010c83a
support custom login types for validating users
...
Wire the custom login type support from password providers into the UI-auth
user-validation flows.
2017-12-05 09:43:30 +00:00
cc58e177f3
Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_auth
...
Factor out a validate_user_via_ui_auth method
2017-12-05 09:42:46 +00:00
d7ea8c4800
Factor out a validate_user_via_ui_auth method
...
Collect together all the places that validate a logged-in user via UI auth.
2017-12-05 09:42:30 +00:00
aa6ecf0984
Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_return
...
Refactor UI auth implementation
2017-12-05 09:40:38 +00:00
d5f9fb06b0
Refactor UI auth implementation
...
Instead of returning False when auth is incomplete, throw an exception which
can be caught with a wrapper.
2017-12-05 09:40:05 +00:00
c22e73293a
speed up the rate of initial spam for users
2017-12-04 18:05:28 +00:00
b11dca2025
better doc
2017-12-04 17:51:33 +00:00
7b86c1fdcd
try make tests work a bit more...
2017-12-04 17:10:03 +00:00
58ebdb037c
Merge pull request #2716 from matrix-org/rav/federation_client_post
...
federation_client script: Support for posting content
2017-12-04 17:04:08 +00:00
95f8a713dc
erik told me to
2017-12-04 16:56:25 +00:00
74e0cc74ce
fix pep8 and tests
2017-12-04 15:11:38 +00:00
1bd40ca73e
switch to a simpler 'search_all_users' button as per review feedback
2017-12-04 14:58:39 +00:00
f397153dfc
Merge branch 'develop' into matthew/search-all-local-users
2017-11-30 01:51:38 +00:00
Richard van der Hoff