David Baker
|
27955056e0
|
Merge branch 'develop' into erikj/groups_merged
|
2017-10-02 16:20:41 +01:00 |
|
Richard van der Hoff
|
d5325d7ef1
|
Merge pull request #2480 from matrix-org/rav/federation_client_logging
Improve logging of failures in matrixfederationclient
|
2017-09-29 17:32:53 +01:00 |
|
Erik Johnston
|
d5694ac5fa
|
Only log if we've removed media
|
2017-09-28 16:08:08 +01:00 |
|
Richard van der Hoff
|
e43de3ae4b
|
Improve logging of failures in matrixfederationclient
* don't log exception types twice
* not all exceptions have a meaningful 'message'. Use the repr rather than
attempting to build a string ourselves.
|
2017-09-28 15:38:09 +01:00 |
|
Richard van der Hoff
|
75e67b9ee4
|
Handle SERVFAILs when doing AAAA lookups for federation (#2477)
... to cope with people with broken dnssec setups, mostly
|
2017-09-28 15:24:00 +01:00 |
|
Erik Johnston
|
768f00dedb
|
Up the limits on number of url cache entries to delete at one time
|
2017-09-28 14:27:27 +01:00 |
|
Erik Johnston
|
4dc07e93a8
|
Add old indices
|
2017-09-28 14:10:33 +01:00 |
|
Erik Johnston
|
7cc483aa0e
|
Clear up expired url cache every 10s
|
2017-09-28 13:56:53 +01:00 |
|
Erik Johnston
|
e1e7d76cf1
|
Actually assign result to variable
|
2017-09-28 13:55:29 +01:00 |
|
Erik Johnston
|
93247a424a
|
Only pull out local media that were for url cache
|
2017-09-28 13:48:14 +01:00 |
|
Erik Johnston
|
5f501ec7e2
|
Fix typo in url cache expiry timer
|
2017-09-28 12:59:01 +01:00 |
|
Erik Johnston
|
761d255fdf
|
Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnails
Support new and old style media id formats
|
2017-09-28 12:58:13 +01:00 |
|
Erik Johnston
|
ace8079086
|
Support new and old style media id formats
|
2017-09-28 12:52:51 +01:00 |
|
Erik Johnston
|
7a44c01d89
|
Fix typo
|
2017-09-28 12:46:04 +01:00 |
|
Erik Johnston
|
c9bc4b7031
|
Merge pull request #2478 from matrix-org/erikj/expire_url_cache_thumbnails
Delete expired url cache data
|
2017-09-28 12:42:33 +01:00 |
|
Erik Johnston
|
ae79764fe5
|
Change expires column to expires_ts
|
2017-09-28 12:37:53 +01:00 |
|
Erik Johnston
|
77f1d24de3
|
More brackets
|
2017-09-28 12:23:15 +01:00 |
|
Erik Johnston
|
9ccb4226ba
|
Delete expired url cache data
|
2017-09-28 12:18:06 +01:00 |
|
Erik Johnston
|
bf86a41ef1
|
Merge pull request #2476 from matrix-org/erikj/joined_members_auth
Fix /joined_members to work with AS users
|
2017-09-28 10:44:44 +01:00 |
|
Erik Johnston
|
8090fd4664
|
Fix /joined_members to work with AS users
|
2017-09-28 10:09:32 +01:00 |
|
Erik Johnston
|
3a743f649c
|
Merge pull request #2475 from matrix-org/erikj/joined_members_auth
Fix bug where /joined_members didn't check user was in room
|
2017-09-27 16:42:23 +01:00 |
|
Erik Johnston
|
adec03395d
|
Fix bug where /joined_members didn't check user was in room
|
2017-09-27 15:14:39 +01:00 |
|
David Baker
|
74e494b010
|
Merge pull request #2474 from matrix-org/dbkr/spam_check_module
Make the spam checker a module
|
2017-09-27 11:31:00 +01:00 |
|
David Baker
|
ef3a5ae787
|
Don't test is spam_checker not None
Sometimes it's a Mock object which is not none but is still not
what we're after
|
2017-09-27 11:24:19 +01:00 |
|
David Baker
|
8c06dd6071
|
Remove unintentional debugging
|
2017-09-27 10:31:14 +01:00 |
|
David Baker
|
60c78666ab
|
pep8
|
2017-09-27 10:26:13 +01:00 |
|
David Baker
|
1786b0e768
|
Forgot the new file again :(
|
2017-09-27 10:22:54 +01:00 |
|
David Baker
|
8ad5f34908
|
pep8
|
2017-09-26 19:21:41 +01:00 |
|
David Baker
|
6cd5fcd536
|
Make the spam checker a module
|
2017-09-26 19:20:23 +01:00 |
|
David Baker
|
ccc67d445b
|
Merge pull request #2473 from matrix-org/dbkr/factor_out_module_loading
Factor out module loading to a separate place
|
2017-09-26 18:12:17 +01:00 |
|
David Baker
|
9fd086e506
|
unnecessary parens
|
2017-09-26 17:59:46 +01:00 |
|
David Baker
|
0b03a97708
|
Add module_loader.py
|
2017-09-26 17:56:41 +01:00 |
|
David Baker
|
4824a33c31
|
Factor out module loading to a separate place
So it can be reused
|
2017-09-26 17:51:26 +01:00 |
|
Erik Johnston
|
1e5fcfd14a
|
Merge pull request #2472 from matrix-org/erikj/groups_rooms
Add remove room from group API
|
2017-09-26 16:05:46 +01:00 |
|
Erik Johnston
|
17b8e2bd02
|
Add remove room API
|
2017-09-26 15:52:41 +01:00 |
|
Erik Johnston
|
a8e2a3df32
|
Add unique index to group_rooms table
|
2017-09-26 15:39:21 +01:00 |
|
Erik Johnston
|
0d7c7fd907
|
Merge pull request #2471 from matrix-org/erikj/group_summary_publicised
Add is_publicised to group summary
|
2017-09-26 11:33:21 +01:00 |
|
Erik Johnston
|
95298783bb
|
Add is_publicised to group summary
|
2017-09-26 11:04:37 +01:00 |
|
Erik Johnston
|
1a398b19fd
|
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0
|
2017-09-26 10:08:59 +01:00 |
|
Erik Johnston
|
f4c8cd5e85
|
Bump changelog and version
|
2017-09-26 10:02:48 +01:00 |
|
Erik Johnston
|
b8d832a08c
|
Merge pull request #2470 from matrix-org/erikj/sync_speed_fix
Refactor to speed up incremental syncs
|
2017-09-25 17:43:14 +01:00 |
|
Erik Johnston
|
e3edca3b5d
|
Refactor to speed up incremental syncs
|
2017-09-25 17:35:39 +01:00 |
|
Richard van der Hoff
|
cacfa04cb6
|
Merge pull request #2468 from maxidor/develop
Clarify recommended network setup
|
2017-09-25 16:37:33 +01:00 |
|
Max Dor
|
e591f7b3f0
|
Include review feedback
|
2017-09-25 16:42:26 +02:00 |
|
Max Dor
|
7141f1a5cc
|
Clarify recommended network setup
|
2017-09-25 16:20:23 +02:00 |
|
Erik Johnston
|
44edac0497
|
Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse into develop
|
2017-09-25 14:52:46 +01:00 |
|
Richard van der Hoff
|
29e1c717c3
|
Merge pull request #2390 from r3dey3/develop
Fix iteration of requests_missing_keys; list doesn't have .values()
|
2017-09-25 11:56:01 +01:00 |
|
Richard van der Hoff
|
94133d7ce8
|
Merge branch 'develop' into develop
|
2017-09-25 11:50:11 +01:00 |
|
Erik Johnston
|
b15c2b7971
|
Update CHANGES
|
2017-09-25 11:34:12 +01:00 |
|
Erik Johnston
|
ba8fdc925c
|
Bump version and changes
|
2017-09-25 11:01:31 +01:00 |
|