Erik Johnston
|
1bce3e6b35
|
Remove unused variables
|
2017-06-26 14:03:27 +01:00 |
|
Erik Johnston
|
e3cbec10c1
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_round_trip
|
2017-06-26 14:02:44 +01:00 |
|
Erik Johnston
|
ff13c5e7af
|
Merge pull request #2301 from xwiki-labs/push-redact-content
Add configuration parameter to allow redaction of content from push m…
|
2017-06-24 13:13:51 +01:00 |
|
Caleb James DeLisle
|
27bd0b9a91
|
Change the config file generator to more descriptive explanation of push.redact_content
|
2017-06-24 10:32:12 +02:00 |
|
Caleb James DeLisle
|
bce144595c
|
Fix TravisCI tests for PR #2301 - Fat finger mistake
|
2017-06-23 15:26:09 +02:00 |
|
Caleb James DeLisle
|
75eba3b07d
|
Fix TravisCI tests for PR #2301
|
2017-06-23 15:15:18 +02:00 |
|
Caleb James DeLisle
|
1591eddaea
|
Add configuration parameter to allow redaction of content from push messages for google/apple devices
|
2017-06-23 13:01:04 +02:00 |
|
Erik Johnston
|
7fe8ed1787
|
Store URL cache preview downloads seperately
This makes it easier to clear old media out at a later date
|
2017-06-23 11:14:11 +01:00 |
|
Erik Johnston
|
44c722931b
|
Make some more params configurable
|
2017-06-22 14:59:52 +01:00 |
|
Erik Johnston
|
2d520a9826
|
Typo. ARGH.
|
2017-06-22 14:42:39 +01:00 |
|
Erik Johnston
|
24d894e2e2
|
Fix thinko in unhandled user spam
|
2017-06-22 14:39:05 +01:00 |
|
Matthew Hodgson
|
ccfcef6b59
|
Merge branch 'master' into develop
|
2017-06-22 13:03:44 +01:00 |
|
Erik Johnston
|
e0004aa28a
|
Add desc
|
2017-06-22 10:03:48 +01:00 |
|
Erik Johnston
|
b668112320
|
Merge pull request #2296 from matrix-org/erikj/dont_appserver_shar
Don't work out users who share room with appservice users
|
2017-06-21 14:50:24 +01:00 |
|
Erik Johnston
|
dae9a00a28
|
Initialise exclusive_user_regex
|
2017-06-21 14:19:33 +01:00 |
|
Erik Johnston
|
8177563ebe
|
Fix for workers
|
2017-06-21 13:57:49 +01:00 |
|
Krombel
|
4202fba82a
|
Merge branch 'develop' into avoid_duplicate_filters
|
2017-06-21 14:48:21 +02:00 |
|
Krombel
|
812c030e87
|
replaced json.dumps with encode_canonical_json
|
2017-06-21 14:48:12 +02:00 |
|
Erik Johnston
|
1217c7da91
|
Don't work out users who share room with appservice users
|
2017-06-21 12:00:41 +01:00 |
|
Erik Johnston
|
385dcb7c60
|
Handle thumbnail urls
|
2017-06-19 17:48:28 +01:00 |
|
Erik Johnston
|
b8b936a6ea
|
Add API to quarantine media
|
2017-06-19 17:39:21 +01:00 |
|
Erik Johnston
|
e5ae386ea4
|
Handle all cases of sending membership events
|
2017-06-19 16:07:54 +01:00 |
|
Erik Johnston
|
36e51aad3c
|
Remove unused import
|
2017-06-19 14:42:21 +01:00 |
|
Erik Johnston
|
b490299a3b
|
Change to create new room and join other users
|
2017-06-19 14:10:13 +01:00 |
|
Erik Johnston
|
5db7070dd1
|
Forget room
|
2017-06-19 12:40:29 +01:00 |
|
Erik Johnston
|
d7fe6b356c
|
Add shutdown room API
|
2017-06-19 12:37:27 +01:00 |
|
Erik Johnston
|
fcf01dd88e
|
Reject local events that don't round trip the DB
|
2017-06-19 11:33:40 +01:00 |
|
Erik Johnston
|
dfeca6cf40
|
Merge pull request #2286 from matrix-org/erikj/split_out_user_dir
Split out user directory to a separate process
|
2017-06-16 13:01:19 +01:00 |
|
Erik Johnston
|
6aa5bc8635
|
Initial worker impl
|
2017-06-16 11:47:11 +01:00 |
|
Erik Johnston
|
d8f47d2efa
|
Merge pull request #2280 from matrix-org/erikj/share_room_user_dir
Include users who you share a room with in user directory
|
2017-06-16 11:06:00 +01:00 |
|
Krombel
|
1ff419d343
|
allow Authorization header which handling got implemented in #1098
Signed-off-by: Matthias Kesler <krombel@krombel.de>
|
2017-06-16 11:21:14 +02:00 |
|
Erik Johnston
|
fdf1ca30f0
|
Bump version and changelog
|
2017-06-15 12:59:06 +01:00 |
|
Erik Johnston
|
052c5d19d5
|
Merge pull request #2281 from matrix-org/erikj/phone_home_stats
Fix phone home stats
|
2017-06-15 12:46:23 +01:00 |
|
Erik Johnston
|
5ddd199870
|
Typo
|
2017-06-15 10:49:10 +01:00 |
|
Erik Johnston
|
a9d6fa8b2b
|
Include users who share room with requester in user directory
|
2017-06-15 10:17:21 +01:00 |
|
Erik Johnston
|
4564b05483
|
Implement updating users who share rooms on the fly
|
2017-06-15 10:17:17 +01:00 |
|
Erik Johnston
|
72613bc379
|
Implement initial population of users who share rooms table
|
2017-06-15 09:59:04 +01:00 |
|
Erik Johnston
|
ebcd55d641
|
Add DB schema for tracking users who share rooms
|
2017-06-15 09:45:48 +01:00 |
|
Erik Johnston
|
4b461a6931
|
Add some more stats
|
2017-06-15 09:39:39 +01:00 |
|
Erik Johnston
|
617304b2cf
|
Fix phone home stats
|
2017-06-14 19:47:15 +01:00 |
|
Erik Johnston
|
d9fd937e39
|
Fix user directory insertion due to missing room_id
|
2017-06-13 11:50:24 +01:00 |
|
Erik Johnston
|
505e7e8b9d
|
Fix up sql
|
2017-06-13 11:19:18 +01:00 |
|
Erik Johnston
|
6fd7e6db3d
|
Fix user dir to not assume existence of user
|
2017-06-13 11:11:26 +01:00 |
|
Erik Johnston
|
fdca6e36ee
|
Merge pull request #2274 from matrix-org/erikj/cache_is_host_joined
Add cache for is_host_joined
|
2017-06-13 10:58:53 +01:00 |
|
Erik Johnston
|
90ae0cffec
|
Merge pull request #2275 from matrix-org/erikj/tweark_user_directory_search
Tweak the ranking of PG user dir search
|
2017-06-13 10:58:43 +01:00 |
|
Erik Johnston
|
de4cb50ca6
|
Merge pull request #2276 from matrix-org/erikj/fix_user_di
Don't assume existence of events when updating user directory
|
2017-06-13 10:55:41 +01:00 |
|
Erik Johnston
|
48d2949416
|
Throw exception when not retrying when downloading media
|
2017-06-13 10:23:14 +01:00 |
|
Erik Johnston
|
6ae8373d40
|
Don't assume existance of events when updating user directory
|
2017-06-13 10:19:26 +01:00 |
|
Erik Johnston
|
b58e24cc3c
|
Tweak the ranking of PG user dir search
|
2017-06-13 10:16:31 +01:00 |
|
Erik Johnston
|
d53fe399eb
|
Add cache for is_host_joined
|
2017-06-13 09:56:18 +01:00 |
|