kaslo/synapse
1
0
Fork 0
Code Wiki Activity
15,344 Commits 1,047 Branches 805 Tags
097d2d75dea9d5580938ea1ada7f8edcb0d3077b
Commit Graph

15344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Johnson
097d2d75de fix broken method call 2019-10-23 15:30:36 +01:00
Neil Johnson
84ca716c6b back ref_events change 2019-10-23 10:15:49 +01:00
Neil Johnson
9df32f389f isort 2019-10-22 17:29:51 +01:00
Neil Johnson
7b83fcbd48 preserve other pinned events on applying block 2019-10-22 17:24:02 +01:00
Neil Johnson
1e1afccacb Merge branch 'neilj/disable-mau-alerting-for-small-instances' of github.com:matrix-org/synapse into neilj/disable-mau-alerting-for-small-instances 2019-10-22 17:19:43 +01:00
Neil Johnson
31dc1a0d67 ensure that suppresion affects only mau case 2019-10-22 17:19:34 +01:00
Neil Johnson
8adab5185f Update synapse/server_notices/resource_limits_server_notices.py 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2019-10-22 12:38:57 +01:00
Neil Johnson
d186657bbf Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable-mau-alerting-for-small-instances 2019-10-18 13:45:27 +01:00
Neil Johnson
49b4f9633c refactor for clarity 2019-10-18 13:36:08 +01:00
Richard van der Hoff
560c122267 Fix logging config for the docker image (#6197) 
Turns out that loggers that are instantiated before the config is loaded get
turned off.

Also bring the logging config that is generated by --generate-config into line.

Fixes #6194.
 2019-10-18 13:34:33 +02:00
Brendan Abolivier
1ee97cbd01 Merge branch 'master' into develop 2019-10-18 11:00:43 +01:00
Brendan Abolivier
9fc14b5e84 Merge tag 'v1.4.1' 
Synapse 1.4.1 (2019-10-18)
==========================

No changes since 1.4.1rc1.

Synapse 1.4.1rc1 (2019-10-17)
=============================

Bugfixes
--------

- Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](5b0e9948ea))
 2019-10-18 10:59:01 +01:00
Erik Johnston
d98029ea89 Merge pull request #6196 from matrix-org/erikj/await 
Move rest/admin to use async/await.
 2019-10-18 11:53:02 +02:00
przemas75
c3772a71cb Update docker-compose.yml for a static config file, and update traefik examples (#6142) 2019-10-18 11:23:33 +02:00
Brendan Abolivier
774b8d0930 Fix changelog v1.4.1 2019-10-18 10:19:02 +01:00
Brendan Abolivier
41b9faed16 1.4.1 2019-10-18 10:15:12 +01:00
Bart Noordervliet
dc4bec885d Add missing BOOLEAN_COLUMNs to synapse_port_db (#6216) 
Small fix to synapse_port_db to be able to convert from database schema v56.
 2019-10-18 11:13:59 +02:00
Erik Johnston
5859a5c569 Fix presence timeouts when synchrotron restarts. (#6212) 
* Fix presence timeouts when synchrotron restarts.

Handling timeouts would fail if there was an external process that had
timed out, e.g. a synchrotron restarting. This was due to a couple of
variable name typoes.

Fixes #3715.
 2019-10-18 06:42:26 +01:00
Richard van der Hoff
6fb0a3da07 Remove dead changelog file 
This is part of 1.4.1
 2019-10-17 18:03:28 +01:00
Richard van der Hoff
423f7ae397 Fix up changelogs 2019-10-17 17:06:07 +01:00
Richard van der Hoff
70d9759cdf Merge tag 'v1.4.1rc1' into develop 
Synapse 1.4.1rc1 (2019-10-17)
=============================

Bugfixes
--------

- Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](5b0e9948ea))
 2019-10-17 17:03:02 +01:00
Richard van der Hoff
71cd3fed66 1.4.1rc1 v1.4.1rc1 2019-10-17 16:40:56 +01:00
Erik Johnston
5b0e9948ea Do the update as a background index 2019-10-17 16:31:42 +01:00
Erik Johnston
a2bb50c2eb Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets 
Fix inserting bytes as text in `censor_redactions`
 2019-10-17 16:29:07 +01:00
Hubert Chathi
06fc66c81e Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage 
make storage layer in charge of interpreting the device key data
 2019-10-11 15:19:06 -04:00
Hubert Chathi
132b251e29 expand on comment 2019-10-11 14:24:52 -04:00
Neil Johnson
dc8a2d3194 respond to review comments 2019-10-11 15:47:10 +01:00
Erik Johnston
2e97a4c197 Port synapse/rest/client/_base.py to async/await 2019-10-11 15:29:26 +01:00
Erik Johnston
3c2d6c708c Add maybe_awaitable and fix __init__ bugs 2019-10-11 15:26:09 +01:00
Hubert Chathi
691dd67fcd Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version 
make version optional in body of e2e backup version update
 2019-10-11 10:11:59 -04:00
Erik Johnston
6f5c6c8f60 Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url 
Trace non-JSON APIs, /media, /key etc
 2019-10-11 13:23:52 +01:00
Neil Johnson
00ae8b763e black and towncrier 2019-10-11 13:01:30 +01:00
Valérian Rousset
be9b55e0d2 cas: support setting display name (#6114) 
Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.
 2019-10-11 12:33:12 +01:00
Erik Johnston
c3b0fbe9c3 Newsfile 2019-10-11 12:24:52 +01:00
Erik Johnston
dfbb62c28d Port synaps/rest/client/users.py to async/await 2019-10-11 12:21:40 +01:00
Erik Johnston
f95325e22a Port synaps/rest/client/server_notice_servlet.py to async/await 2019-10-11 12:21:40 +01:00
Erik Johnston
281f887090 Port synaps/rest/client/media.py to async/await 2019-10-11 12:21:40 +01:00
Erik Johnston
fca3a541e7 Port rest/admin/__init__.py to async/await 2019-10-11 12:17:52 +01:00
Erik Johnston
de3a176426 Newsfile 2019-10-11 11:58:52 +01:00
Erik Johnston
f3ceaf4323 Trace non-JSON APIs, /media, /key etc 2019-10-11 11:58:52 +01:00
Neil Johnson
7716de8854 add mau_suppress_alerting 2019-10-11 09:42:36 +01:00
Neil Johnson
bd8974c6da Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable-mau-alerting-for-small-instances 2019-10-11 09:41:10 +01:00
Neil Johnson
a0d0ba7862 Fix MAU reaping where reserved users are specified. (#6168) 2019-10-11 09:38:26 +01:00
Hubert Chathi
7a0dce9259 make sure we actually return something 2019-10-10 20:31:30 -04:00
Hubert Chathi
2208891ace add changelog 2019-10-10 19:22:10 -04:00
Hubert Chathi
4908fb3b30 make storage layer in charge of interpreting the device key data 2019-10-10 19:15:30 -04:00
Neil Johnson
e4e4364b57 switch config to a bool and write tests 2019-10-10 23:39:14 +01:00
Erik Johnston
83d86106a8 Merge pull request #6156 from matrix-org/erikj/postgres_any 
Use Postgres ANY for selecting many values.
 2019-10-10 16:41:36 +01:00
Erik Johnston
b54b1e759a Fix SQLite take 2 2019-10-10 16:19:40 +01:00
Erik Johnston
329eae9cda Merge pull request #6186 from matrix-org/erikj/disable_sql_bytes 
Disable bytes usage with postgres
 2019-10-10 15:59:35 +01:00