Neil Johnson
add148841b
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_support_user
2018-11-14 13:22:39 +00:00
Richard van der Hoff
4b60c969d8
Merge pull request #4184 from matrix-org/rav/fix_public_consent
...
Fix an internal server error when viewing the public privacy policy
2018-11-14 11:32:43 +00:00
Richard van der Hoff
0c4dc6fd76
changelog
2018-11-14 10:48:08 +00:00
Richard van der Hoff
c1efcd7c6a
Add a test for the public T&Cs form
2018-11-14 10:46:27 +00:00
Richard van der Hoff
83a5f459aa
Fix an internal server error when viewing the public privacy policy
2018-11-14 10:21:07 +00:00
David Baker
0869566ad3
Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbers
...
Make e2e backup versions numeric in the DB
2018-11-14 07:55:48 +00:00
Neil Johnson
b01271a12b
tweak tests and tidy
2018-11-13 23:12:58 +00:00
Neil Johnson
c7082966f3
fix unit tests
2018-11-13 22:07:58 +00:00
Neil Johnson
3121f041c6
wip - move support user logic into handler from storage
2018-11-13 17:56:01 +00:00
Neil Johnson
22418bc494
remove unneeded sql
2018-11-13 16:47:57 +00:00
Neil Johnson
a54aaf42ad
fix boolean typing
2018-11-13 16:15:24 +00:00
Neil Johnson
cf10ca9c53
remove errant prints
2018-11-13 15:55:29 +00:00
Neil Johnson
45e0b9dc1e
implementation and tests for db backed support user
2018-11-13 15:35:20 +00:00
Neil Johnson
eae8d4a388
add db support for support user
2018-11-13 10:07:03 +00:00
Neil Johnson
eaac29f7ef
move to db backed support user
2018-11-12 17:58:49 +00:00
David Baker
bca3b91c2d
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_are_numbers
2018-11-09 18:35:02 +00:00
Erik Johnston
db5a1c059a
Merge pull request #4166 from matrix-org/erikj/drop_unknown_events
...
Drop incoming events from federation for unknown rooms
2018-11-09 17:59:34 +00:00
Erik Johnston
dc59ad5334
Remove hack to support rejoining rooms
2018-11-09 14:58:09 +00:00
David Baker
d44dea0223
pep8
2018-11-09 14:38:31 +00:00
David Baker
4f93abd62d
add docs
2018-11-09 13:25:38 +00:00
Erik Johnston
30dd27afff
Simplify to always drop events if server isn't in the room
2018-11-09 11:36:45 +00:00
Richard van der Hoff
3cecf5340d
Update synapse/federation/federation_server.py
...
Co-Authored-By: erikjohnston <erikj@jki.re >
2018-11-09 11:28:25 +00:00
Richard van der Hoff
9bce065a53
Update synapse/federation/federation_server.py
...
Co-Authored-By: erikjohnston <erikj@jki.re >
2018-11-09 11:28:22 +00:00
David Baker
d3fa6194f7
Remove unnecessary str()
2018-11-09 11:11:31 +00:00
Brendan Abolivier
0f3f0a64bf
Merge pull request #4168 from matrix-org/babolivier/federation-client-content-type
...
Add a Content-Type header on POST requests to the federation client script
2018-11-09 11:00:55 +00:00
Brendan Abolivier
91d96759c9
Add a Content-Type header on POST requests to the federation client
2018-11-09 10:41:34 +00:00
Erik Johnston
7b22421a7b
Merge pull request #4164 from matrix-org/erikj/fix_device_comparison
...
Fix noop checks when updating device keys
2018-11-08 14:37:20 +00:00
Erik Johnston
abaa93c158
Add test to assert set_e2e_device_keys correctly returns False on no-op
2018-11-08 14:06:44 +00:00
Neil Johnson
7430a879a0
remove white space
2018-11-08 13:03:44 +00:00
Richard van der Hoff
c70809a275
Merge pull request #4163 from matrix-org/rav/fix_consent_on_py3
...
Fix encoding error for consent form on python3
2018-11-08 12:48:51 +00:00
Neil Johnson
12d09ac132
tiday up cruft
2018-11-08 12:42:17 +00:00
Erik Johnston
5ebed18692
Lets convert bytes to unicode instead
2018-11-08 12:33:13 +00:00
Erik Johnston
94896d7ffe
Newsfile
2018-11-08 12:30:25 +00:00
Erik Johnston
06c3d8050f
Newsfile
2018-11-08 12:18:41 +00:00
Erik Johnston
b1a22b24ab
Fix noop checks when updating device keys
...
Clients often reupload their device keys (for some reason) so its
important for the server to check for no-ops before sending out device
list update notifications.
The check is broken in python 3 due to the fact comparing bytes and
unicode always fails, and that we write bytes to the DB but get unicode
when we read.
2018-11-08 12:18:38 +00:00
Erik Johnston
9417986f77
Drop PDUs of unknown rooms
...
When we receive events over federation we will need to know the room
version to be able to correctly handle them, e.g. once we start changing
event formats. Currently, we attempt to handle events in unknown rooms.
2018-11-08 12:11:20 +00:00
Richard van der Hoff
0a1fc52971
fix parse_string docstring
2018-11-08 11:12:29 +00:00
Richard van der Hoff
de6223836e
changelog
2018-11-08 11:06:28 +00:00
hera
2b075fb03a
Fix encoding error for consent form on python3
...
The form was rendering this as "b'01234....'".
-- richvdh
2018-11-08 11:05:39 +00:00
Neil Johnson
f217b5fd7a
fix case where auto creation of rooms should never auto create for support user
2018-11-07 22:29:17 +00:00
Neil Johnson
06a3ec83e2
replace filter with list comp to aid py2 py3 compat, make test more paranoid
2018-11-07 22:28:21 +00:00
Amber Brown
264cb14402
Port hash_password to Python 3 ( #4161 )
...
* port hash_password
* changelog
2018-11-08 04:57:28 +11:00
Amber Brown
b3708830b8
Fix URL preview bugs (type error when loading cache from db, content-type including quotes) ( #4157 )
2018-11-08 01:37:43 +11:00
Richard van der Hoff
c8ba79327b
Merge pull request #4155 from rubo77/purge-api
...
add purge_history.sh and purge_remote_media.sh scripts
2018-11-07 14:06:41 +00:00
rubo77
2904d133f3
add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/
...
Signed-off-by: Ruben Barkow <github@r.z11.de >
2018-11-07 14:02:41 +01:00
Neil Johnson
425403398e
update description due to change in desired behaviour
2018-11-06 23:35:08 +00:00
Neil Johnson
b7d1f0dffd
remove unused import
2018-11-06 23:23:36 +00:00
Neil Johnson
d8b1f519e2
remove unused dependency
2018-11-06 23:21:07 +00:00
Neil Johnson
bccbdb85a8
replace is with ==
2018-11-06 23:08:49 +00:00
Neil Johnson
6f19edbda5
fix misnamed var
2018-11-06 22:46:40 +00:00
