Mark Haines
|
3e279411fe
|
Improve the error handling for bad invites received over federation
|
2017-06-30 16:20:30 +01:00 |
|
Erik Johnston
|
47574c9cba
|
Merge pull request #2321 from matrix-org/erikj/prefill_forward
Prefill forward extrems and event to state groups
|
2017-06-30 11:03:04 +01:00 |
|
Erik Johnston
|
6ff14ddd2e
|
Make into list
|
2017-06-29 15:47:37 +01:00 |
|
Erik Johnston
|
5946aa0877
|
Prefill forward extrems and event to state groups
|
2017-06-29 15:38:48 +01:00 |
|
Erik Johnston
|
d800ab2847
|
Merge pull request #2320 from matrix-org/erikj/cache_macaroon_parse
Cache macaroon parse and validation
|
2017-06-29 15:06:43 +01:00 |
|
Erik Johnston
|
2c365f4723
|
Cache macaroon parse and validation
Turns out this can be quite expensive for requests, and is easily
cachable. We don't cache the lookup to the DB so invalidation still
works.
|
2017-06-29 14:50:18 +01:00 |
|
Erik Johnston
|
a1a253ea50
|
Merge pull request #2319 from matrix-org/erikj/prune_sessions
Use an ExpiringCache for storing registration sessions
|
2017-06-29 14:20:24 +01:00 |
|
Erik Johnston
|
c72058bcc6
|
Use an ExpiringCache for storing registration sessions
This is because pruning them was a significant performance drain on
matrix.org
|
2017-06-29 14:08:37 +01:00 |
|
Erik Johnston
|
27f26e48b7
|
Serialize user ip command as json
|
2017-06-27 16:25:38 +01:00 |
|
Erik Johnston
|
8c23221666
|
Fix up
|
2017-06-27 15:53:45 +01:00 |
|
Erik Johnston
|
731f3c37a0
|
Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into develop
|
2017-06-27 15:41:34 +01:00 |
|
Erik Johnston
|
4b444723f0
|
Merge pull request #2308 from matrix-org/erikj/user_ip_repl
Make workers report to master for user ip updates
|
2017-06-27 15:36:47 +01:00 |
|
Erik Johnston
|
816605a137
|
Merge pull request #2307 from matrix-org/erikj/user_ip_batch
Batch upsert user ips
|
2017-06-27 15:08:32 +01:00 |
|
Erik Johnston
|
78cefd78d6
|
Make workers report to master for user ip updates
|
2017-06-27 14:58:10 +01:00 |
|
Erik Johnston
|
a0a561ae85
|
Fix up client ips to read from pending data
|
2017-06-27 14:46:12 +01:00 |
|
Erik Johnston
|
ed3d0170d9
|
Batch upsert user ips
|
2017-06-27 13:37:04 +01:00 |
|
Erik Johnston
|
976128f368
|
Update version and changelog
|
2017-06-26 16:14:56 +01:00 |
|
Erik Johnston
|
d04d672a80
|
Merge pull request #2290 from matrix-org/erikj/ensure_round_trip
Reject local events that don't round trip the DB
|
2017-06-26 15:12:02 +01:00 |
|
Erik Johnston
|
036f439f53
|
Merge pull request #2304 from matrix-org/erikj/users_share_fix
Fix up indices for users_who_share_rooms
|
2017-06-26 15:11:39 +01:00 |
|
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
|
8abdd7b553
|
Fix up indices for users_who_share_rooms
|
2017-06-26 14:01:30 +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
|
4fec80ba6f
|
Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloads
Store URL cache preview downloads separately
|
2017-06-23 12:00:45 +01: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
|
e204062310
|
Merge pull request #2297 from matrix-org/erikj/user_dir_fix
Fix thinko in initial public room user spam
|
2017-06-22 15:14:47 +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
|
71995e1397
|
Merge pull request #2219 from krombel/avoid_duplicate_filters
only add new filter when not existent prevoisly
|
2017-06-21 14:11:26 +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
|
7d69f2d956
|
Merge pull request #2292 from matrix-org/erikj/quarantine_media
Add API to quarantine media
|
2017-06-19 18:15:00 +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
|
b5f665de32
|
Merge pull request #2291 from matrix-org/erikj/shutdown_room
Add shutdown room API
|
2017-06-19 16:20:55 +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 |
|