Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-07-07 | 19 | -93/+112 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| * | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-30 | 2 | -2/+13 | |
|\| | | | | | ||||||
| * | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-29 | 1 | -13/+60 | |
|\| | | | | | ||||||
| * | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-29 | 2 | -11/+13 | |
|\| | | | | | ||||||
| * | | | | | 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 'erikj/user_ip_repl' of github.com:matrix-org/synapse into matri... | Erik Johnston | 2017-06-27 | 5 | -12/+9 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Fix up | Erik Johnston | 2017-06-27 | 5 | -12/+9 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-27 | 21 | -60/+306 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-23 | 7 | -20/+94 | |
|\| | | | | | ||||||
| * | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-22 | 4 | -8/+20 | |
|\| | | | | ||||||
| * | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-21 | 5 | -19/+48 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | replaced json.dumps with encode_canonical_json | Krombel | 2017-06-21 | 1 | -1/+2 | |
| | * | | | | | Merge branch 'develop' into avoid_duplicate_filters | Krombel | 2017-05-16 | 10 | -13/+101 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | avoid access-error if no filter_id matches | Krombel | 2017-05-15 | 1 | -3/+3 | |
| | * | | | | | | insert whitespace to fix travis build | Krombel | 2017-05-12 | 1 | -1/+1 | |
| | * | | | | | | add check to only add a new filter if the same filter does not exist previously | Krombel | 2017-05-11 | 1 | -0/+9 | |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-19 | 13 | -11/+328 | |
|\| | | | | | | | ||||||
| * | | | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-16 | 16 | -285/+949 | |
|\| | | | | | | ||||||
| * | | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-13 | 2 | -4/+9 | |
|\| | | | | | ||||||
| * | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-13 | 1 | -24/+41 | |
|\| | | | | | | ||||||
| * | | | | | | 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 | |
| |/ / / / / | ||||||
* | | | | | | Reenable user dir | hera | 2017-06-13 | 1 | -1/+0 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-13 | 6 | -18/+54 | |
|\| | | | | | ||||||
| * | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-12 | 9 | -64/+56 | |
|\| | | | | | ||||||
| * | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-08 | 2 | -7/+19 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| |/ / / / / | ||||||
* | | | | | | hot fixes | hera | 2017-06-08 | 6 | -16/+22 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-07 | 3 | -10/+24 | |
|\| | | | | | ||||||
| * | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-07 | 12 | -73/+237 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-06 | 1 | -1/+1 | |
|\| | | | | | ||||||
| * | | | | | Fix typo when getting app name | Erik Johnston | 2017-06-06 | 1 | -1/+1 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-06 | 1 | -1/+1 | |
|\| | | | | | ||||||
| * | | | | | Fix wrong number of arguments | Erik Johnston | 2017-06-06 | 1 | -1/+1 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-06-06 | 28 | -97/+1427 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| | * | | | | | Bug fixes and logging | Erik Johnston | 2017-06-01 | 2 | -2/+22 | |
| | * | | | | | Order by if they have profile info | Erik Johnston | 2017-06-01 | 1 | -2/+11 | |
| | * | | | | | Use prefix matching | Erik Johnston | 2017-06-01 | 1 | -5/+29 | |
| | * | | | | | Comment on why arbitrary comments | Erik Johnston | 2017-05-31 | 1 | -2/+6 | |
| | * | | | | | Use unique indices | Erik Johnston | 2017-05-31 | 1 | -2/+2 | |
| | * | | | | | Comment briefly on how we keep user_directory up to date | Erik Johnston | 2017-05-31 | 1 | -0/+10 | |
| | * | | | | | Convert to int | Erik Johnston | 2017-05-31 | 1 | -0/+1 | |
| | * | | | | | Lifts things into separate function | Erik Johnston | 2017-05-31 | 1 | -56/+54 | |
| | * | | | | | Typos | Erik Johnston | 2017-05-31 | 1 | -8/+8 | |
| | * | | | | | Fix tests | Erik Johnston | 2017-05-31 | 2 | -2/+3 | |
| | * | | | | | Fix typo | Erik Johnston | 2017-05-31 | 1 | -1/+1 | |
| | * | | | | | Limit number of things we fetch out of the db | Erik Johnston | 2017-05-31 | 1 | -9/+30 | |
| | * | | | | | Add stream change cache | Erik Johnston | 2017-05-31 | 4 | -1/+34 | |
| | * | | | | | Split out directory and search tables | Erik Johnston | 2017-05-31 | 2 | -29/+56 | |
| | * | | | | | Pull max id from correct table | Erik Johnston | 2017-05-31 | 2 | -4/+10 | |
| | * | | | | | Handle the server leaving a public room | Erik Johnston | 2017-05-31 | 4 | -3/+46 | |
| | * | | | | | Add comments | Erik Johnston | 2017-05-31 | 4 | -45/+173 | |
| | * | | | | | Weight differently | Erik Johnston | 2017-05-31 | 2 | -10/+31 | |
| | * | | | | | Use POST | Erik Johnston | 2017-05-31 | 1 | -1/+1 | |
| | * | | | | | Add REST API | Erik Johnston | 2017-05-31 | 2 | -0/+61 | |
| | * | | | | | Add search | Erik Johnston | 2017-05-31 | 2 | -0/+38 | |
| | * | | | | | Update room column when room becomes unpublic | Erik Johnston | 2017-05-31 | 2 | -2/+31 | |
| | * | | | | | Add call later | Erik Johnston | 2017-05-31 | 1 | -0/+2 | |
| | * | | | | | Start later | Erik Johnston | 2017-05-31 | 1 | -1/+4 | |
| | * | | | | | Don't go round in circles | Erik Johnston | 2017-05-31 | 1 | -4/+2 | |
| | * | | | | | Add user_directory to database | Erik Johnston | 2017-05-31 | 6 | -1/+444 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #2251 from matrix-org/erikj/current_state_delta_stream | Erik Johnston | 2017-05-30 | 2 | -8/+50 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Add comment | Erik Johnston | 2017-05-30 | 1 | -1/+1 | |
| | * | | | | Add clobbered event_id | Erik Johnston | 2017-05-30 | 2 | -1/+3 | |
| | * | | | | Add current_state_delta_stream table | Erik Johnston | 2017-05-30 | 2 | -8/+48 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #2247 from matrix-org/erikj/auth_event | Erik Johnston | 2017-05-24 | 5 | -13/+118 | |
| |\ \ \ \ | ||||||
| | * | | | | Add background task to clear out old event_auth | Erik Johnston | 2017-05-24 | 3 | -1/+74 | |
| | * | | | | Only store event_auth for state events | Erik Johnston | 2017-05-24 | 3 | -12/+44 | |
| * | | | | | Merge pull request #2243 from matrix-org/matthew/fix-url-preview-length-again | Erik Johnston | 2017-05-23 | 1 | -0/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | actually trim oversize og:description meta | Matthew Hodgson | 2017-05-22 | 1 | -0/+2 | |
| * | | | | | | Merge pull request #2237 from matrix-org/erikj/sync_key_count | Erik Johnston | 2017-05-23 | 4 | -15/+34 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | Remove redundant invalidation | Erik Johnston | 2017-05-23 | 1 | -3/+0 | |
| | * | | | | | Missed an invalidation | Erik Johnston | 2017-05-23 | 1 | -0/+3 | |
| | * | | | | | Add missing storage function to slave store | Erik Johnston | 2017-05-22 | 1 | -0/+2 | |
| | * | | | | | Stream count_e2e_one_time_keys cache invalidation | Erik Johnston | 2017-05-22 | 1 | -13/+18 | |
| | * | | | | | Add count of one time keys to sync stream | Erik Johnston | 2017-05-19 | 2 | -0/+12 | |
| * | | | | | | Merge pull request #2242 from matrix-org/erikj/email_refactor | Erik Johnston | 2017-05-23 | 5 | -60/+106 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Only load jinja2 templates once | Erik Johnston | 2017-05-22 | 5 | -60/+106 | |
| |/ / / / / / | ||||||
* | | | | | | | Limit concurrent AS joins 2017-06-06_1141 | Erik Johnston | 2017-05-23 | 1 | -13/+19 | |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2017-05-23_1048 | Erik Johnston | 2017-05-22 | 2 | -29/+95 | |
|\| | | | | | | ||||||
| * | | | | | | Merge pull request #2241 from matrix-org/erikj/fix_notifs | Erik Johnston | 2017-05-22 | 1 | -4/+32 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Comment | Erik Johnston | 2017-05-22 | 1 | -0/+2 | |
| | * | | | | | | Remove spurious log level guards | Erik Johnston | 2017-05-22 | 1 | -6/+3 | |
| | * | | | | | | Check if current event is a membership event | Erik Johnston | 2017-05-22 | 1 | -4/+9 | |
| | * | | | | | | Add debug logging | Erik Johnston | 2017-05-22 | 1 | -0/+24 | |
| * | | | | | | | Merge pull request #2240 from matrix-org/erikj/cache_list_fix | Erik Johnston | 2017-05-22 | 1 | -16/+40 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Pull out if statement from for loop | Erik Johnston | 2017-05-22 | 1 | -6/+14 | |
| | * | | | | | | | Update list cache to handle one arg case | Erik Johnston | 2017-05-22 | 1 | -17/+33 | |
| | | |/ / / / / | | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #2238 from matrix-org/erikj/faster_push_rules | Erik Johnston | 2017-05-22 | 1 | -9/+23 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | ||||||
| | * | | | | | Comment | Erik Johnston | 2017-05-22 | 1 | -1/+4 | |
| | * | | | | | Use tuple unpacking | Erik Johnston | 2017-05-22 | 1 | -2/+2 | |
| | * | | | | | Speed up calculating push rules | Erik Johnston | 2017-05-19 | 1 | -8/+19 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2017-05-22_1657 | Erik Johnston | 2017-05-19 | 1 | -1/+3 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #2236 from matrix-org/erikj/invalidation | Erik Johnston | 2017-05-19 | 1 | -1/+3 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix invalidation of get_users_with_read_receipts_in_room | Erik Johnston | 2017-05-19 | 1 | -1/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-05-19 | 5 | -13/+25 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #2234 from matrix-org/erikj/fix_push | Erik Johnston | 2017-05-19 | 5 | -13/+25 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Move invalidation cb to its own structure | Erik Johnston | 2017-05-19 | 1 | -6/+15 | |
| | * | | | | | Store ActionGenerator in HomeServer | Erik Johnston | 2017-05-19 | 5 | -7/+10 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-05-18 | 1 | -1/+4 | |
|\| | | | | | ||||||
| * | | | | | Don't push users who have left | Erik Johnston | 2017-05-18 | 1 | -1/+4 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-05-18 | 1 | -2/+2 | |
|\| | | | | | ||||||
| * | | | | | Increase size of push rule caches | Erik Johnston | 2017-05-18 | 1 | -2/+2 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2017-05-18 | 4 | -14/+35 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #2233 from matrix-org/erikj/faster_as_check | Erik Johnston | 2017-05-18 | 4 | -13/+34 | |
| |\ \ \ \ \ |