MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-06-29 07:58:19 +02:00
Code Issues Projects Releases Wiki Activity
13055 commits 5 branches 702 tags 78 MiB
Commit graph

13055 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff 34b25dcc8e Silence travis-ci build warnings by removing non-functional python3.6 (#4377) 
* Remove non-functional python3.6 in travis env

* changelog
 2019-01-12 06:22:56 +11:00
Amber Brown a35c66a00b
Remove duplicates in the user_ips table and add an index (#4370) 2019-01-12 06:21:50 +11:00
Richard van der Hoff 91fa34b3fa s/Breaks/Conflicts/ in debian/control 
Otherwise people can't upgrade from matrix-synapse without removing it first
 2019-01-11 17:05:45 +00:00
Amber Brown 522dada206 Merge remote-tracking branch 'origin/master' into develop 2019-01-11 02:22:48 +11:00
Amber Brown ea00f18135 Merge Synapse v0.34.1.1 2019-01-11 02:21:54 +11:00
Amber Brown c0dba73aa0 changelog, for debian 2019-01-11 02:20:29 +11:00
Richard van der Hoff 8c818af38e
Merge pull request #4342 from aaronraimist/new-virtualenv 
Update README to use new virtualenv (#4328)
 2019-01-10 14:59:33 +00:00
Amber Brown 5c792ee5c3 changelog 2019-01-11 01:59:10 +11:00
Amber Brown 6dc06c3775 version 2019-01-11 01:56:37 +11:00
Amber Brown 3933ce9f13
Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1 
Fix spontaneous logout
 2019-01-11 01:48:53 +11:00
Richard van der Hoff de80e979c9 changelog 2019-01-10 14:26:01 +00:00
Richard van der Hoff e0910d0145 Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 
Fixes #4371
 2019-01-10 14:12:50 +00:00
Richard van der Hoff ba41aeed6a Revert "Fix macaroon_secret_key fallback logic" 
This is already fixed in 0.34.1, by 59f93bb

This reverts commit efc522c55e.
 2019-01-10 14:09:26 +00:00
Richard van der Hoff 4f24452ead changelog 2019-01-10 14:00:23 +00:00
Richard van der Hoff aa70d24125 Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 2019-01-10 12:58:33 +00:00
Richard van der Hoff efc522c55e Fix macaroon_secret_key fallback logic 2019-01-10 12:57:27 +00:00
Richard van der Hoff 566947ff34 Skip macaroon check for access tokens in the db 2019-01-10 12:57:21 +00:00
Richard van der Hoff 353f2407b7 Fix fallback to signing key for macaroon-secret-key 2019-01-10 12:42:56 +00:00
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 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 2019-01-09 14:53:54 +00:00
Erik Johnston 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 Brown 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 Johnston 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 Johnston 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 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 Johnston 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 Brown 1dcb086f33
Fix synapse.config.__main__ on python 3 (#4356) 2019-01-08 10:03:09 +11:00
Jason Robinson 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 Ralston 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 Hoff 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 Telatynski 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 Hoff 29f20a8a1a
Update debian Conflicts specifications (#4349) 
...  to allow installation alongside our matrix-synapse transitional package.
 2019-01-04 17:24:13 +00:00
Matthew Hodgson 27128145e6 fix NPE in /messages by checking if all events were filtered out (#4330) 2019-01-02 23:37:39 +00:00
Richard van der Hoff dd3bf40152
README.rst: fix hash_password path 2019-01-02 16:36:29 +00:00
Aaron Raimist 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 Johnson 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