dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-07-20 17:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,834 Commits 1,148 Branches 838 Tags
8d4b4e781f6d4502795cdeb2d588f685c718697f
Commit Graph
12834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard van der Hoff 8d4b4e781f Merge branch 'master' into develop 2019-01-09 16:52:08 +00:00
Richard van der Hoff 95fca1c7e9 fix docker build to install optional deps 2019-01-09 16:37:51 +00:00
Richard van der Hoff 58fe88c47e Merge branch 'master' into develop 2019-01-09 16:02:05 +00:00
Richard van der Hoff 2394e832a8 debian: Remove Breaks: matrix-synapse-ldap3 v0.34.1+1 2019-01-09 15:35:11 +00:00
Richard van der Hoff d566e6b17a Merge branch 'master' into develop 2019-01-09 15:00:46 +00:00
Richard van der Hoff 998f5225c1 0.34.1 v0.34.1 2019-01-09 14:53:54 +00:00
Erik JohnstonandGitHub 55c3e853c5 Merge pull request #4368 from matrix-org/erikj/better_errors 
Fixup docstrings for matrixfederationclient
 2019-01-09 11:39:28 +00:00
Erik Johnston 484867d35d Merge branch 'develop' into release-v0.34.1 2019-01-09 11:38:13 +00:00
Amber BrownandGitHub 7960c26fda Fix adding new rows instead of updating them if one of the key values is a NULL in upserts. (#4369) 2019-01-09 22:26:25 +11:00
Erik Johnston 0dce21ba77 Newsfile 2019-01-09 09:27:03 +00:00
Erik Johnston 34ea14139d Fixup docstrings for matrixfederationclient 2019-01-09 09:25:59 +00:00
Erik JohnstonandGitHub d1d81d0651 Merge pull request #4362 from matrix-org/erikj/better_errors 
Use RequestSendFailed when fail to parse content type headers
 2019-01-09 09:08:35 +00:00
Erik Johnston d91b99abe0 Newsfile 2019-01-08 14:24:05 +00:00
Erik Johnston d422570e9b Use RequestSendFailed when fail to parse content type headers 2019-01-08 14:22:18 +00:00
Erik JohnstonandGitHub c4530b97b2 Merge pull request #4361 from matrix-org/erikj/better_errors 
Don't log stack traces for HTTP error responses
 2019-01-08 14:19:00 +00:00
Erik Johnston 83c50bf752 Newsfile 2019-01-08 12:28:35 +00:00
Erik Johnston 1371d5b798 Don't log stack traces for HTTP error responses 2019-01-08 12:28:30 +00:00
Richard van der Hoff 32172f2297 clean up changelog v0.34.1rc1 2019-01-08 11:26:11 +00:00
Richard van der Hoff ba85786d71 0.34.1rc1 2019-01-08 11:15:34 +00:00
Richard van der Hoff bc1a4b5576 changelog 2019-01-08 11:14:59 +00:00
Erik JohnstonandRichard van der Hoff b970cb0e96 Refactor request sending to have better excpetions (#4358) 
* Correctly retry and back off if we get a HTTPerror response

* Refactor request sending to have better excpetions

MatrixFederationHttpClient blindly reraised exceptions to the caller
without differentiating "expected" failures (e.g. connection timeouts
etc) versus more severe problems (e.g. programming errors).

This commit adds a RequestSendFailed exception that is raised when
"expected" failures happen, allowing the TransactionQueue to log them as
warnings while allowing us to log other exceptions as actual exceptions.
 2019-01-08 11:04:28 +00:00
Amber BrownandGitHub 1dcb086f33 Fix synapse.config.__main__ on python 3 (#4356) 2019-01-08 10:03:09 +11:00
Jason RobinsonandRichard van der Hoff 26e5abf20d Fix command hint to generate a config file (#4353) 
* Fix command hint to generate a config file

When trying to start Synapse without a config file, it will complain
and give a hint towards what command to run. This hinted command
is missing the "report_stats" parameter, which is required with either
yes or no value. Add this to the command.

Not an ideal situation but makes the given command work without the
user getting another error, even though it might be unclear what
"report_stats" represents.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2019-01-07 16:28:40 +00:00
Travis RalstonandRichard van der Hoff bc1fa8cd01 Add GET account data routes (#4303) 
As per https://github.com/matrix-org/matrix-doc/issues/1339
 2019-01-07 10:27:54 +00:00
Richard van der HoffandGitHub b7c0218812 Check jinja version for consent resource (#4327) 
* Raise a ConfigError if an invalid resource is specified

* Require Jinja 2.9 for the consent resource

* changelog
 2019-01-07 10:14:31 +00:00
Michael TelatynskiandRichard van der Hoff a27e501b09 fix the check for whether is_url to match all the other ones in codebase (#3405) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-01-06 21:43:25 +00:00
Richard van der HoffandGitHub 29f20a8a1a Update debian Conflicts specifications (#4349) 
...  to allow installation alongside our matrix-synapse transitional package.
 2019-01-04 17:24:13 +00:00
Matthew HodgsonandRichard van der Hoff 27128145e6 fix NPE in /messages by checking if all events were filtered out (#4330) 2019-01-02 23:37:39 +00:00
Aaron RaimistandRichard van der Hoff 37f8bdc1d5 Update README to not lie about required restart (#4343) 
* Update README to not lie about required restart

Signed-off-by: Aaron Raimist <aaron@raim.ist>

* Add changelog

Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-01-02 16:32:37 +00:00
Neil JohnsonandGitHub f95581332f Merge pull request #4344 from matrix-org/neilj/fix_synchrotron_fix_4312 
Ensure synchrotrons can access is_support_user in the storage layer
 2019-01-02 10:42:01 +00:00
Neil Johnson 84b6fae1f5 Ensure synchrotrons can access is_support_user in the storage layer 2019-01-02 10:19:59 +00:00
jribalandRichard van der Hoff 265513e499 Update docker-compose.yml (#4282) 
Hi, the original docker-compose file did not work by default.
You get federation port working but no client port.

My proposal is to let federation port work as it is by default (8448) and let traefik handle client http/https traffic.
 2019-01-02 07:38:18 +00:00
Aaron RaimistandRichard van der Hoff 252c0c81fa Update PR template to use absolute links (#4341) 
* Update PR template to use absolute links

Signed-off-by: Aaron Raimist <aaron@raim.ist>

* Add changelog

Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-01-02 07:33:13 +00:00
Richard van der HoffandGitHub e9cdfedff3 Avoid packaging _trial_temp directory (#4326) 
Make sure we don't put the _trial_temp directory in the package target
directory.

Fixes https://github.com/matrix-org/synapse/issues/4322
 2019-01-02 07:30:31 +00:00
Richard van der HoffandGitHub 7134832c01 Install the optional dependencies into the debian package (#4325) 
since #4298, the optional dependencies are no longer installed with a simple
`pip install .`, which meant that they were not being included in the debian
package.

The easy fix to that is dh_virtualenv --extras, but that needs dh_virtualenv
1.1...
 2019-01-02 07:17:39 +00:00
Amber BrownandGitHub d7843f47b6 Remove v1 only REST APIs now we don't ship matrix console (#4334) 2018-12-29 23:12:30 +11:00
Krithin SitaramandRichard van der Hoff 98df67a8de Remove mention of lt-cred-mech in the sample coturn config. (#4333) 
* Remove mention of lt-cred-mech in the sample coturn config.

See https://github.com/coturn/coturn/pull/262 for more context.
Also clean up some minor formatting issues while I'm here.

* Add changelog.

Signed-off-by: Krithin Sitaram <krithin@gmail.com>
 2018-12-28 23:31:49 +00:00
Will HuntandRichard van der Hoff 0708f437cc Log roomid along with Unknown room (#4297) 2018-12-24 10:49:42 +01:00
Richard van der HoffandGitHub cd018e3543 Merge pull request #4307 from matrix-org/erikj/v2_rooms 
Add v2 room version
 2018-12-24 10:48:59 +01:00
Richard van der HoffandGitHub f85676cc93 Return well_known in /login response (#4319) 
... as per MSC1730.
 2018-12-24 10:44:33 +01:00
Richard van der HoffandGitHub 3355c1a9ec Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5 
Fix test_metrics.py compatibility prometheus_client 0.5
 2018-12-23 00:14:47 +01:00
Richard van der HoffandGitHub 597dafb5e8 Merge pull request #4316 from matrix-org/rav/fix_docker_upload 
Fix circleci config for synapse:latest docker upload
 2018-12-21 17:33:34 +01:00
Richard van der HoffandAmber Brown 9c2af7b2c5 Add a script to generate a clean config file (#4315) 2018-12-22 02:04:57 +11:00
Richard van der HoffandAmber Brown f3561f8d86 Fix indentation in default config (#4313) 
These settings are not supposed to be under 'listeners'.
 2018-12-22 02:01:43 +11:00
Amber BrownandGitHub ea6abf6724 Fix IP URL previews on Python 3 (#4215) 2018-12-22 01:56:13 +11:00
Amber BrownandGitHub c26f49a664 Make the dependencies more like a standard Python project and hook up the optional dependencies to setuptools (#4298) 2018-12-22 01:37:26 +11:00
Maarten de Vries 48b7ff7a35 Fix test_metrics.py compatibility prometheus_client 0.5 
prometheus_client 0.5 has a named-tuple Sample type with more member
than the old plain tuple had. This commit makes sure the unit test
detects this and changes the way it reads the sample.

Signed-off-by: Maarten de Vries <maarten@de-vri.es>
 2018-12-21 01:53:57 +01:00
Richard van der Hoff d9aaf26539 Fix circleci config for synapse:latest docker upload 
Give the image the right tag, so that we can push it.
 2018-12-21 00:22:31 +00:00
Richard van der Hoff c8d32caba3 Merge branch 'master' into develop 2018-12-20 23:33:25 +00:00
Richard van der Hoff ad1c68ad94 Mention updating extensions 2018-12-20 23:32:59 +00:00