Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Fix logcontxt leak in keyclient (#2465) | Richard van der Hoff | 2017-09-25 | 1 | -12/+5 | |
* | | | | | | Do an AAAA lookup on SRV record targets (#2462) | Richard van der Hoff | 2017-09-22 | 2 | -24/+118 | |
* | | | | | | fix thinko'd docstring | Matthew Hodgson | 2017-09-22 | 1 | -1/+1 | |
* | | | | | | Fix device list when rejoining room (#2461) | Erik Johnston | 2017-09-22 | 1 | -2/+14 | |
* | | | | | | Merge pull request #2459 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2017-09-20 | 5 | -214/+353 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix logcontexts in _check_sigs_and_hashes | Richard van der Hoff | 2017-09-20 | 2 | -60/+62 | |
| * | | | | | | Add some more tests for Keyring | Richard van der Hoff | 2017-09-20 | 1 | -37/+140 | |
| * | | | | | | Fix logcontext handling in verify_json_objects_for_server | Richard van der Hoff | 2017-09-20 | 1 | -8/+12 | |
| * | | | | | | Turn _start_key_lookups into an inlineCallbacks function | Richard van der Hoff | 2017-09-20 | 1 | -40/+37 | |
| * | | | | | | Fix potential race in _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -5/+8 | |
| * | | | | | | Add some comments to _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -0/+8 | |
| * | | | | | | Consistency for how verify_request.deferred is called | Richard van der Hoff | 2017-09-20 | 1 | -13/+17 | |
| * | | | | | | Factor out _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -7/+17 | |
| * | | | | | | Replace `server_and_json` with `verify_requests` | Richard van der Hoff | 2017-09-20 | 1 | -3/+3 | |
| * | | | | | | pull out handle_key_deferred to top level | Richard van der Hoff | 2017-09-20 | 1 | -43/+44 | |
| * | | | | | | Fix incorrect key_ids in error message | Richard van der Hoff | 2017-09-20 | 1 | -1/+1 | |
| * | | | | | | Invalidate signing key cache when we gat an update | Richard van der Hoff | 2017-09-20 | 1 | -17/+24 | |
| * | | | | | | Remove redundant `preserve_fn` | Richard van der Hoff | 2017-09-20 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Fix concurrent server_key requests (#2458) | Richard van der Hoff | 2017-09-19 | 2 | -4/+58 | |
* | | | | | | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 5 | -0/+44 | |
* | | | | | | add some comments to on_exchange_third_party_invite_request | Richard van der Hoff | 2017-09-19 | 1 | -0/+11 | |
* | | | | | | PoC for filtering spammy events (#2456) | Richard van der Hoff | 2017-09-19 | 3 | -17/+69 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Fix overzealous kicking of guest users (#2453) | Richard van der Hoff | 2017-09-19 | 1 | -1/+1 | |
* | | | | | Clean up and document handling of logcontexts in Keyring (#2452) | Richard van der Hoff | 2017-09-18 | 2 | -28/+110 | |
* | | | | | Merge pull request #2451 from matrix-org/erikj/add_state_to_timeline | Erik Johnston | 2017-09-18 | 2 | -3/+18 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't filter out current state events from timeline | Erik Johnston | 2017-09-18 | 2 | -3/+18 | |
* | | | | | | Merge pull request #2450 from matrix-org/dbkr/push_event_id_only | David Baker | 2017-09-18 | 1 | -0/+20 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Also include the room_id | David Baker | 2017-09-18 | 1 | -0/+1 | |
| * | | | | | Use .get - it's much shorter | David Baker | 2017-09-18 | 1 | -1/+1 | |
| * | | | | | Add support for event_id_only push format | David Baker | 2017-09-18 | 1 | -0/+19 | |
* | | | | | | Merge pull request #2449 from matrix-org/erikj/rejoin_device_lists | Erik Johnston | 2017-09-18 | 1 | -13/+12 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Correctly handle leaving room in /key/changes | Erik Johnston | 2017-09-18 | 1 | -13/+12 | |
* | | | | | | Merge pull request #2443 from matrix-org/erikj/rejoin_device_lists | Erik Johnston | 2017-09-18 | 4 | -29/+153 | |
|\| | | | | | ||||||
| * | | | | | Fix typo | Erik Johnston | 2017-09-15 | 1 | -1/+1 | |
| * | | | | | Actually hook leave notifs up | Erik Johnston | 2017-09-14 | 1 | -2/+3 | |
| * | | | | | Handle joining/leaving rooms in /keys/changes | Erik Johnston | 2017-09-13 | 1 | -1/+38 | |
| * | | | | | Get left rooms | Erik Johnston | 2017-09-13 | 1 | -3/+32 | |
| * | | | | | In sync handle device lists for newly joined/left rooms | Erik Johnston | 2017-09-12 | 1 | -2/+10 | |
| * | | | | | Add left section to /keys/changes | Erik Johnston | 2017-09-08 | 3 | -11/+19 | |
| * | | | | | Send down device list change notif when member leaves/rejoins room | Erik Johnston | 2017-09-07 | 3 | -14/+55 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2439 from matrix-org/rav/tox_tweaks | Richard van der Hoff | 2017-09-06 | 1 | -5/+29 | |
|\ \ \ \ \ | ||||||
| * | | | | | do tox install with pip -e | Richard van der Hoff | 2017-09-05 | 1 | -5/+29 | |
* | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2017-09-05 | 3 | -0/+3 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Exclude the github issue template from our sdist (#2440) | Richard van der Hoff | 2017-09-05 | 2 | -0/+1 | |
| * | | | | | Merge pull request #2433 from ptman/patch-1 | Erik Johnston | 2017-09-01 | 1 | -0/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Document known to work postgres version | Paul Tötterman | 2017-09-01 | 1 | -0/+2 | |
| |/ / / / / | ||||||
* | / / / / | Merge branch 'master' into develop | Richard van der Hoff | 2017-09-05 | 4 | -0/+483 | |
|\| | | | | | |/ / / / |/| | | | | ||||||
| * | | | | Set --python when running sytest | Richard van der Hoff | 2017-09-01 | 4 | -0/+4 | |
| * | | | | Merge pull request #2416 from matrix-org/rav/prometheus_config | Richard van der Hoff | 2017-08-22 | 3 | -0/+436 | |
| |\ \ \ \ | ||||||
| | * | | | | Add prometheus config | Richard van der Hoff | 2017-08-16 | 3 | -0/+436 | |
| * | | | | | Merge pull request #2413 from matrix-org/toml-issue-template | Tom Lant | 2017-08-21 | 1 | -0/+47 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Update ISSUE_TEMPLATE.md | Tom Lant | 2017-08-17 | 1 | -1/+5 | |
| | * | | | | Update ISSUE_TEMPLATE.md | Tom Lant | 2017-08-17 | 1 | -3/+10 | |
| | * | | | | Update ISSUE_TEMPLATE.md | Tom Lant | 2017-08-14 | 1 | -2/+2 | |
| | * | | | | Update ISSUE_TEMPLATE.md | Tom Lant | 2017-08-14 | 1 | -1/+1 | |
| | * | | | | Create ISSUE_TEMPLATE.md | Tom Lant | 2017-08-14 | 1 | -0/+36 | |
| |/ / / / | ||||||
* | | | | | fix python path in jenkins scripts | Richard van der Hoff | 2017-09-01 | 4 | -4/+4 | |
* | | | | | Set --python when running sytest | Richard van der Hoff | 2017-09-01 | 4 | -0/+4 | |
* | | | | | Merge pull request #2428 from matrix-org/rav/update_upgrade | Richard van der Hoff | 2017-08-24 | 1 | -33/+42 | |
|\ \ \ \ \ | ||||||
| * | | | | | Tweaks to the upgrade instructions | Richard van der Hoff | 2017-08-23 | 1 | -33/+42 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2417 from matrix-org/rav/federation_client | Richard van der Hoff | 2017-08-23 | 1 | -8/+79 | |
|\ \ \ \ \ | ||||||
| * | | | | | test federation client: Allow server-name and key-file as options | Richard van der Hoff | 2017-08-22 | 1 | -8/+28 | |
| * | | | | | Improvements to the federation test client | Richard van der Hoff | 2017-08-17 | 1 | -7/+58 | |
* | | | | | | Merge pull request #2288 from kyrias/bcrypt | Richard van der Hoff | 2017-08-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | python_dependencies: Use bcrypt module instead of py-bcrypt | Johannes Löthberg | 2017-06-17 | 1 | -1/+1 | |
* | | | | | | Fix user_dir startup | Richard van der Hoff | 2017-08-16 | 1 | -1/+1 | |
* | | | | | | Fix process startup | Richard van der Hoff | 2017-08-16 | 1 | -10/+13 | |
* | | | | | | explain why CPU affinity is a good idea | Matthew Hodgson | 2017-08-15 | 1 | -0/+8 | |
* | | | | | | Merge pull request #2415 from matrix-org/rav/synctl_cpu_affinity | Richard van der Hoff | 2017-08-15 | 14 | -465/+271 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Allow configuration of CPU affinity | Richard van der Hoff | 2017-08-15 | 5 | -1/+23 | |
| * | | | | | | Factor out common application start | Richard van der Hoff | 2017-08-15 | 11 | -464/+248 | |
|/ / / / / / | ||||||
* | | | | | | fix english | hera | 2017-08-04 | 1 | -7/+7 | |
* | | | | | | typo | hera | 2017-08-04 | 1 | -1/+1 | |
* | | | | | | Reduce spammy log line in synchrotrons | Erik Johnston | 2017-08-02 | 1 | -1/+1 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #2375 from matrix-org/erikj/port_script | Erik Johnston | 2017-07-20 | 1 | -0/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | Extend comment | Erik Johnston | 2017-07-20 | 1 | -1/+2 | |
| * | | | | | Fix port script for user directory tables | Erik Johnston | 2017-07-20 | 1 | -0/+18 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2371 from matrix-org/erikj/push_cache_hit | Erik Johnston | 2017-07-17 | 1 | -0/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Increase cache hit ratio for push | Erik Johnston | 2017-07-14 | 1 | -0/+8 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2366 from matrix-org/erikj/push_metrics | Erik Johnston | 2017-07-14 | 1 | -2/+42 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add more metrics to push rule evaluation | Erik Johnston | 2017-07-13 | 1 | -2/+42 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2365 from matrix-org/erikj/push_skip_lock | Erik Johnston | 2017-07-13 | 1 | -0/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Push: Don't acquire lock unless necessary | Erik Johnston | 2017-07-13 | 1 | -0/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2362 from matrix-org/erikj/sync_user_users_who_share | Erik Johnston | 2017-07-12 | 1 | -8/+7 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Use less DB for device list handling in sync | Erik Johnston | 2017-07-12 | 1 | -8/+7 | |
|/ / / / | ||||||
* | | | | Merge pull request #2354 from krombel/reduce_static_sync_reply | Erik Johnston | 2017-07-11 | 1 | -16/+25 | |
|\ \ \ \ | ||||||
| * | | | | split out reducing stuff; just make encode_* static | Krombel | 2017-07-11 | 1 | -35/+27 | |
| * | | | | fix test | Krombel | 2017-07-10 | 1 | -1/+3 | |
| * | | | | encode sync-response statically; omit empty objects from sync-response | Krombel | 2017-07-10 | 1 | -33/+48 | |
* | | | | | Merge pull request #2357 from matrix-org/erikj/push | Erik Johnston | 2017-07-11 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't compute push actions for backfilled events | Erik Johnston | 2017-07-11 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* / | | | | Reduce log levels in tcp replication | Erik Johnston | 2017-07-11 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Include registration and as stores in frontend proxy | Erik Johnston | 2017-07-07 | 1 | -0/+4 | |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-07-07 | 2 | -1/+10 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse v0.22.1 | Erik Johnston | 2017-07-06 | 5 | -11/+21 | |
| |\ \ \ | ||||||
| | * | | | Bump version and changelog | Erik Johnston | 2017-07-06 | 2 | -1/+10 | |
* | | | | | Merge pull request #2344 from matrix-org/erikj/frontend_proxy | Erik Johnston | 2017-07-07 | 2 | -0/+269 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add a frontend proxy | Erik Johnston | 2017-07-07 | 2 | -0/+269 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2343 from matrix-org/erikj/fastpush | Erik Johnston | 2017-07-07 | 3 | -36/+21 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Perf: Don't filter events for push | Erik Johnston | 2017-07-07 | 3 | -36/+21 | |
|/ / / / | ||||||
* | | | | Merge pull request #2342 from matrix-org/erikj/pusher_pool_instantiate | Erik Johnston | 2017-07-06 | 3 | -10/+11 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 3 | -10/+11 | |
| |/ / | ||||||
* | | | Merge pull request #2309 from matrix-org/erikj/user_ip_repl | Erik Johnston | 2017-07-06 | 6 | -17/+18 | |
|\ \ \ | ||||||
| * | | | Serialize user ip command as json | Erik Johnston | 2017-06-27 | 1 | -5/+9 | |
| * | | | Fix up | Erik Johnston | 2017-06-27 | 5 | -12/+9 | |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-07-06 | 2 | -1/+23 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0 | Erik Johnston | 2017-07-06 | 91 | -488/+3929 | |
| |\ \ \ | ||||||
| | * | | | Bump version and changelog github/release-v0.22.0 release-v0.22.0 | Erik Johnston | 2017-07-06 | 2 | -1/+7 | |
| | * | | | Bump version and changelog v0.22.0-rc2 | Erik Johnston | 2017-07-04 | 2 | -1/+17 | |
* | | | | | Merge pull request #2334 from matrix-org/erikj/refactor_transport_server | Erik Johnston | 2017-07-05 | 1 | -8/+16 | |
|\ \ \ \ \ | ||||||
| * | | | | | Separate federation servlet into different lists | Erik Johnston | 2017-07-05 | 1 | -8/+16 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #2332 from matrix-org/rav/fix_pushes | Richard van der Hoff | 2017-07-05 | 1 | -1/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix caching error in the push evaluator | Richard van der Hoff | 2017-07-05 | 1 | -1/+3 | |
* | | | | | Merge pull request #2330 from matrix-org/erikj/cache_size_factor | Erik Johnston | 2017-07-04 | 8 | -30/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update test | Erik Johnston | 2017-07-04 | 1 | -1/+1 | |
| * | | | | | Update README | Erik Johnston | 2017-07-04 | 1 | -7/+4 | |
| * | | | | | Increase default cache factor size. | Erik Johnston | 2017-07-04 | 1 | -1/+1 | |
| * | | | | | Define CACHE_SIZE_FACTOR once | Erik Johnston | 2017-07-04 | 5 | -21/+6 | |
* | | | | | | Merge pull request #2323 from matrix-org/markjh/invite_checks | Mark Haines | 2017-07-04 | 1 | -2/+17 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Improve the error handling for bad invites received over federation | Mark Haines | 2017-06-30 | 1 | -2/+17 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2321 from matrix-org/erikj/prefill_forward | Erik Johnston | 2017-06-30 | 2 | -2/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make into list | Erik Johnston | 2017-06-29 | 1 | -1/+1 | |
| * | | | | | Prefill forward extrems and event to state groups | Erik Johnston | 2017-06-29 | 2 | -2/+13 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2320 from matrix-org/erikj/cache_macaroon_parse | Erik Johnston | 2017-06-29 | 1 | -13/+60 | |
|\ \ \ \ \ | ||||||
| * | | | | | Cache macaroon parse and validation | Erik Johnston | 2017-06-29 | 1 | -13/+60 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2319 from matrix-org/erikj/prune_sessions | Erik Johnston | 2017-06-29 | 2 | -11/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use an ExpiringCache for storing registration sessions | Erik Johnston | 2017-06-29 | 2 | -11/+13 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-06-27 | 2 | -1/+35 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update version and changelog v0.22.0-rc1 | Erik Johnston | 2017-06-26 | 2 | -1/+35 | |
* | | | | | | Merge pull request #2308 from matrix-org/erikj/user_ip_repl | Erik Johnston | 2017-06-27 | 9 | -8/+111 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Make workers report to master for user ip updates | Erik Johnston | 2017-06-27 | 9 | -8/+111 | |
* | | | | | | Merge pull request #2307 from matrix-org/erikj/user_ip_batch | Erik Johnston | 2017-06-27 | 5 | -48/+101 | |
|\| | | | | | ||||||
| * | | | | | Fix up client ips to read from pending data | Erik Johnston | 2017-06-27 | 4 | -27/+62 | |
| * | | | | | Batch upsert user ips | Erik Johnston | 2017-06-27 | 2 | -21/+39 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2290 from matrix-org/erikj/ensure_round_trip | Erik Johnston | 2017-06-26 | 1 | -0/+9 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Remove unused variables | Erik Johnston | 2017-06-26 | 1 | -1/+1 | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_rou... | Erik Johnston | 2017-06-26 | 26 | -58/+535 | |
| |\ \ \ \ | ||||||
| * | | | | | Reject local events that don't round trip the DB | Erik Johnston | 2017-06-19 | 1 | -0/+9 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #2304 from matrix-org/erikj/users_share_fix | Erik Johnston | 2017-06-26 | 1 | -1/+2 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix up indices for users_who_share_rooms | Erik Johnston | 2017-06-26 | 1 | -1/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #2301 from xwiki-labs/push-redact-content | Erik Johnston | 2017-06-24 | 3 | -2/+48 | |
|\ \ \ \ | ||||||
| * | | | | Change the config file generator to more descriptive explanation of push.reda... | Caleb James DeLisle | 2017-06-24 | 1 | -3/+11 | |
| * | | | | Fix TravisCI tests for PR #2301 - Fat finger mistake | Caleb James DeLisle | 2017-06-23 | 1 | -0/+0 | |
| * | | | | Fix TravisCI tests for PR #2301 | Caleb James DeLisle | 2017-06-23 | 3 | -5/+2 | |
| * | | | | Add configuration parameter to allow redaction of content from push messages ... | Caleb James DeLisle | 2017-06-23 | 3 | -2/+43 | |
* | | | | | Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloads | Erik Johnston | 2017-06-23 | 7 | -20/+94 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Store URL cache preview downloads seperately | Erik Johnston | 2017-06-23 | 7 | -20/+94 | |
|/ / / / | ||||||
* | | | | Merge pull request #2297 from matrix-org/erikj/user_dir_fix | Erik Johnston | 2017-06-22 | 1 | -7/+10 | |
|\ \ \ \ | ||||||
| * | | | | Make some more params configurable | Erik Johnston | 2017-06-22 | 1 | -5/+8 | |
| * | | | | Typo. ARGH. | Erik Johnston | 2017-06-22 | 1 | -1/+1 | |
| * | | | | Fix thinko in unhandled user spam | Erik Johnston | 2017-06-22 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge branch 'master' into develop | Matthew Hodgson | 2017-06-22 | 2 | -1/+9 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge pull request #2282 from matrix-org/release-v0.21.1 v0.21.1 | Erik Johnston | 2017-06-15 | 7 | -218/+97 | |
| |\ \ \ | ||||||
| | * | | | Bump version and changelog | Erik Johnston | 2017-06-15 | 2 | -1/+9 | |
* | | | | | Add desc | Erik Johnston | 2017-06-22 | 1 | -0/+1 | |
* | | | | | Merge pull request #2296 from matrix-org/erikj/dont_appserver_shar | Erik Johnston | 2017-06-21 | 4 | -18/+37 | |
|\ \ \ \ \ | ||||||
| * | | | | | Initialise exclusive_user_regex | Erik Johnston | 2017-06-21 | 2 | -15/+22 | |
| * | | | | | Fix for workers | Erik Johnston | 2017-06-21 | 2 | -1/+4 | |
| * | | | | | Don't work out users who share room with appservice users | Erik Johnston | 2017-06-21 | 1 | -2/+11 | |
* | | | | | | Merge pull request #2219 from krombel/avoid_duplicate_filters | Erik Johnston | 2017-06-21 | 1 | -1/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Merge branch 'develop' into avoid_duplicate_filters | Krombel | 2017-06-21 | 75 | -593/+3545 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #2292 from matrix-org/erikj/quarantine_media | Erik Johnston | 2017-06-19 | 7 | -5/+121 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Handle thumbnail urls | Erik Johnston | 2017-06-19 | 1 | -12/+14 | |
| * | | | | | | Add API to quarantine media | Erik Johnston | 2017-06-19 | 7 | -5/+119 | |
* | | | | | | | Merge pull request #2291 from matrix-org/erikj/shutdown_room | Erik Johnston | 2017-06-19 | 7 | -5/+205 | |
|\| | | | | | | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Handle all cases of sending membership events | Erik Johnston | 2017-06-19 | 1 | -0/+5 | |
| * | | | | | Remove unused import | Erik Johnston | 2017-06-19 | 1 | -1/+1 | |
| * | | | | | Change to create new room and join other users | Erik Johnston | 2017-06-19 | 2 | -10/+70 | |
| * | | | | | Forget room | Erik Johnston | 2017-06-19 | 1 | -0/+2 | |
| * | | | | | Add shutdown room API | Erik Johnston | 2017-06-19 | 6 | -1/+134 | |
|/ / / / / | ||||||
* | | | | | add missing boolean to synapse_port_db | Matthew | 2017-06-16 | 1 | -0/+1 | |
* | | | | | fix synapse_port script | Matthew | 2017-06-16 | 1 | -1/+1 | |
* | | | | | Merge pull request #2286 from matrix-org/erikj/split_out_user_dir | Erik Johnston | 2017-06-16 | 6 | -7/+328 | |
|\ \ \ \ \ | ||||||
| * | | | | | Initial worker impl | Erik Johnston | 2017-06-16 | 6 | -7/+328 | |
* | | | | | | Merge pull request #2280 from matrix-org/erikj/share_room_user_dir | Erik Johnston | 2017-06-16 | 5 | -60/+508 | |
|\| | | | | | ||||||
| * | | | | | Include users who share room with requester in user directory | Erik Johnston | 2017-06-15 | 3 | -26/+47 | |
| * | | | | | Implement updating users who share rooms on the fly | Erik Johnston | 2017-06-15 | 2 | -24/+235 | |
| * | | | | | Implement initial population of users who share rooms table | Erik Johnston | 2017-06-15 | 2 | -9/+193 | |
| * | | | | | Add DB schema for tracking users who share rooms | Erik Johnston | 2017-06-15 | 2 | -1/+33 | |
* | | | | | | Merge pull request #2285 from krombel/allow_authorization_header | Erik Johnston | 2017-06-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | allow Authorization header which handling got implemented in #1098 | Krombel | 2017-06-16 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2281 from matrix-org/erikj/phone_home_stats | Erik Johnston | 2017-06-15 | 5 | -217/+88 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Typo | Erik Johnston | 2017-06-15 | 1 | -1/+3 | |
| * | | | | | Add some more stats | Erik Johnston | 2017-06-15 | 3 | -0/+35 | |
| * | | | | | Remove unhelpful test | Erik Johnston | 2017-06-15 | 1 | -115/+0 | |
| * | | | | | Fix phone home stats | Erik Johnston | 2017-06-14 | 3 | -107/+56 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | add notes on running out of FDs | Matthew Hodgson | 2017-06-14 | 1 | -0/+24 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #2279 from matrix-org/erikj/fix_user_dir | Erik Johnston | 2017-06-13 | 2 | -4/+9 | |
|\ \ \ \ | ||||||
| * | | | | Fix user directory insertion due to missing room_id | Erik Johnston | 2017-06-13 | 2 | -4/+9 | |
* | | | | | Merge pull request #2278 from matrix-org/erikj/fix_user_dir | Erik Johnston | 2017-06-13 | 1 | -24/+41 | |
|\| | | | | ||||||
| * | | | | Fix up sql | Erik Johnston | 2017-06-13 | 1 | -10/+12 | |
| * | | | | Fix user dir to not assume existence of user | Erik Johnston | 2017-06-13 | 1 | -22/+37 | |
|/ / / / | ||||||
* | | | | Merge pull request #2274 from matrix-org/erikj/cache_is_host_joined | Erik Johnston | 2017-06-13 | 3 | -2/+7 | |
|\ \ \ \ | ||||||
| * | | | | Add cache for is_host_joined | Erik Johnston | 2017-06-13 | 3 | -2/+7 | |
* | | | | | Merge pull request #2275 from matrix-org/erikj/tweark_user_directory_search | Erik Johnston | 2017-06-13 | 1 | -13/+40 | |
|\ \ \ \ \ | ||||||
| * | | | | | Tweak the ranking of PG user dir search | Erik Johnston | 2017-06-13 | 1 | -13/+40 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2276 from matrix-org/erikj/fix_user_di | Erik Johnston | 2017-06-13 | 1 | -3/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't assume existance of events when updating user directory | Erik Johnston | 2017-06-13 | 1 | -3/+6 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2277 from matrix-org/erikj/media | Erik Johnston | 2017-06-13 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Throw exception when not retrying when downloading media | Erik Johnston | 2017-06-13 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #2266 from matrix-org/erikj/host_in_room | Erik Johnston | 2017-06-12 | 5 | -55/+31 | |
|\ \ \ \ | ||||||
| * | | | | Tweak SQL | Erik Johnston | 2017-06-09 | 1 | -3/+6 | |
| * | | | | Fix replication | Erik Johnston | 2017-06-09 | 1 | -1/+0 | |
| * | | | | Change is_host_joined to use current_state table | Erik Johnston | 2017-06-09 | 4 | -54/+28 | |
* | | | | | Merge pull request #2269 from matrix-org/erikj/cache_state_delta | Erik Johnston | 2017-06-09 | 2 | -4/+16 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix replication | Erik Johnston | 2017-06-09 | 2 | -2/+2 | |
| * | | | | | Comments | Erik Johnston | 2017-06-09 | 1 | -0/+3 | |
| * | | | | | Cache state deltas | Erik Johnston | 2017-06-09 | 1 | -3/+12 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2268 from matrix-org/erikj/entity_has_changed | Erik Johnston | 2017-06-09 | 1 | -4/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Rewrite conditional | Erik Johnston | 2017-06-09 | 1 | -1/+1 | |
| * | | | | | Fix has_any_entity_changed | Erik Johnston | 2017-06-09 | 1 | -4/+4 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2267 from matrix-org/erikj/missing_notifier | Erik Johnston | 2017-06-09 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add missing notifier | Erik Johnston | 2017-06-09 | 1 | -1/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2265 from matrix-org/erikj/remote_leave_outlier | Erik Johnston | 2017-06-09 | 1 | -0/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Comment | Erik Johnston | 2017-06-09 | 1 | -0/+2 | |
| * | | | | Mark remote invite rejections as outliers | Erik Johnston | 2017-06-09 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #2263 from matrix-org/erikj/fix_state_woes | Erik Johnston | 2017-06-08 | 2 | -7/+19 | |
|\ \ \ \ | ||||||
| * | | | | Ensure we don't use unpersisted state group as prev group | Erik Johnston | 2017-06-08 | 2 | -7/+19 | |
|/ / / / | ||||||
* | | | | Merge pull request #2259 from matrix-org/erikj/fix_state_woes | Erik Johnston | 2017-06-07 | 3 | -10/+24 | |
|\ \ \ \ | ||||||
| * | | | | Fix bug where state_group tables got corrupted | Erik Johnston | 2017-06-07 | 3 | -10/+24 | |
| |/ / / | ||||||
* | | | | Merge pull request #2258 from matrix-org/erikj/user_dir | Erik Johnston | 2017-06-07 | 2 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | Don't start user_directory handling on workers | Erik Johnston | 2017-06-07 | 2 | -3/+3 | |
* | | | | | Merge pull request #2248 from matrix-org/erikj/state_fixup | Erik Johnston | 2017-06-07 | 7 | -56/+156 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Comments | Erik Johnston | 2017-06-07 | 2 | -0/+15 | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixup | Erik Johnston | 2017-06-07 | 16 | -12/+1175 | |
| |\ \ \ \ | ||||||
| * | | | | | Remove spurious log lines | Erik Johnston | 2017-06-07 | 3 | -4/+0 | |
| * | | | | | Handle None state group correctly | Erik Johnston | 2017-05-26 | 2 | -4/+7 | |
| * | | | | | Fix typing tests | Erik Johnston | 2017-05-26 | 2 | -7/+7 | |
| * | | | | | Faster cache for get_joined_hosts | Erik Johnston | 2017-05-25 | 5 | -29/+117 | |
| * | | | | | Don't return weird prev_group | Erik Johnston | 2017-05-25 | 1 | -8/+13 | |
| * | | | | | Remove unused options | Erik Johnston | 2017-05-25 | 1 | -11/+4 | |
* | | | | | | Add some logging to user directory | Erik Johnston | 2017-06-07 | 1 | -0/+7 | |
* | | | | | | Merge pull request #2256 from matrix-org/erikj/faster_device_updates | Erik Johnston | 2017-06-07 | 2 | -13/+65 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | When pruning, delete from device_lists_outbound_last_success | Erik Johnston | 2017-06-07 | 1 | -0/+8 | |
| * | | | | | Keep pruning background task | Erik Johnston | 2017-06-07 | 1 | -0/+45 | |
| * | | | | | Split up device_lists_outbound_pokes table for faster updates. | Erik Johnston | 2017-06-07 | 2 | -58/+57 | |
|/ / / / / | ||||||
* | | | / | Increase size of IP cache | Erik Johnston | 2017-06-07 | 1 | -1/+6 | |
| |_|_|/ |/| | | | ||||||
* | | | | Fix typo when getting app name | Erik Johnston | 2017-06-06 | 1 | -1/+1 | |
* | | | | Fix wrong number of arguments | Erik Johnston | 2017-06-06 | 1 | -1/+1 | |
* | | | | Merge pull request #2253 from matrix-org/erikj/user_dir | Erik Johnston | 2017-06-01 | 2 | -0/+74 | |
|\ \ \ \ | ||||||
| * | | | | Handle profile updates in user directory | Erik Johnston | 2017-06-01 | 2 | -0/+74 | |
* | | | | | Merge pull request #2252 from matrix-org/erikj/user_dir | Erik Johnston | 2017-06-01 | 13 | -1/+1043 | |
|\| | | | | ||||||
| * | | | | Fix sqlite | Erik Johnston | 2017-06-01 | 1 | -1/+1 | |
| * | | | | Split the table in two | Erik Johnston | 2017-06-01 | 4 | -31/+138 | |
| * | | | | Tweak search query | Erik Johnston | 2017-06-01 | 1 | -1/+1 | |
| * | | | | Tweak search query | Erik Johnston | 2017-06-01 | 1 | -2/+2 | |
| * | | | | Comments | Erik Johnston | 2017-06-01 | 1 | -3/+3 | |
| * | | | | Check if host is still in room | Erik Johnston | 2017-06-01 | 1 | -0/+11 | |
| * | | | | Remove spurious inlineCallbacks | Erik Johnston | 2017-06-01 | 1 | -1/+0 | |
| * | | | | Fix removing users | Erik Johnston | 2017-06-01 | 1 | -0/+5 |