Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix typos and reinherit | Erik Johnston | 2017-08-25 | 1 | -12/+6 |
* | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 11 | -29/+35 |
* | Add remote profile cache | Erik Johnston | 2017-08-25 | 5 | -5/+237 |
* | Add _simple_update | Erik Johnston | 2017-08-25 | 1 | -19/+32 |
* | Merge pull request #2410 from matrix-org/erikj/groups_publicise | Erik Johnston | 2017-08-21 | 6 | -0/+197 |
|\ | |||||
| * | Use BOOLEAN rather than TEXT type | Erik Johnston | 2017-08-21 | 1 | -1/+1 |
| * | Fixup | Erik Johnston | 2017-08-11 | 2 | -9/+14 |
| * | Add bulk group publicised lookup API | Erik Johnston | 2017-08-09 | 5 | -0/+142 |
| * | Allow update group publicity | Erik Johnston | 2017-08-08 | 2 | -0/+43 |
| * | Store whether the user wants to publicise their membership of a group | Erik Johnston | 2017-08-08 | 3 | -0/+7 |
* | | Merge pull request #2426 from matrix-org/erikj/groups_fix_sync | Erik Johnston | 2017-08-21 | 1 | -1/+7 |
|\ \ | |/ |/| | |||||
| * | Groups: Fix mising json.load in initial sync | Erik Johnston | 2017-08-21 | 1 | -1/+7 |
|/ | |||||
* | Remove stale TODO comments | Erik Johnston | 2017-08-04 | 1 | -10/+0 |
* | Merge pull request #2382 from matrix-org/erikj/group_privilege | Erik Johnston | 2017-07-24 | 2 | -1/+85 |
|\ | |||||
| * | Update comment | Erik Johnston | 2017-07-24 | 1 | -2/+2 |
| * | Use join rather than joined, etc. | Erik Johnston | 2017-07-24 | 1 | -2/+2 |
| * | Fix all the typos | Erik Johnston | 2017-07-24 | 1 | -8/+7 |
| * | Include users membership in group in summary API | Erik Johnston | 2017-07-24 | 2 | -0/+60 |
| * | Check users/rooms are in group before adding to summary | Erik Johnston | 2017-07-24 | 1 | -0/+25 |
|/ | |||||
* | Correctly add joins to correct segment | Erik Johnston | 2017-07-24 | 1 | -1/+1 |
* | Merge pull request #2378 from matrix-org/erikj/group_sync_support | Erik Johnston | 2017-07-21 | 12 | -12/+283 |
|\ | |||||
| * | Add notifier | Erik Johnston | 2017-07-20 | 1 | -0/+1 |
| * | Fix replication. And notify | Erik Johnston | 2017-07-20 | 5 | -4/+119 |
| * | Remember to cast to bool | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| * | Fix bug in generating current token | Erik Johnston | 2017-07-20 | 1 | -0/+2 |
| * | Add groups to sync stream | Erik Johnston | 2017-07-20 | 8 | -8/+161 |
* | | Merge pull request #2377 from matrix-org/erikj/group_profile_update | Erik Johnston | 2017-07-20 | 5 | -0/+55 |
|\ \ | |/ |/| | |||||
| * | Remove spurious content param | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| * | Check values are strings | Erik Johnston | 2017-07-20 | 1 | -1/+4 |
| * | Fix a storage desc | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| * | Add update group profile API | Erik Johnston | 2017-07-20 | 5 | -0/+52 |
* | | Merge pull request #2374 from matrix-org/erikj/group_server_local | Erik Johnston | 2017-07-20 | 11 | -34/+1457 |
|\ \ | |||||
| * | | Fix typo | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| |/ | |||||
| * | Comments | Erik Johnston | 2017-07-18 | 4 | -13/+24 |
| * | Comments | Erik Johnston | 2017-07-18 | 2 | -103/+88 |
| * | Fix permissions | Erik Johnston | 2017-07-18 | 1 | -2/+6 |
| * | Add DELETE | Erik Johnston | 2017-07-18 | 1 | -0/+46 |
| * | Add 'args' param to post_json | Erik Johnston | 2017-07-18 | 1 | -9/+15 |
| * | Fix typos | Erik Johnston | 2017-07-18 | 3 | -12/+22 |
| * | Correctly parse query params | Erik Johnston | 2017-07-18 | 1 | -19/+19 |
| * | Update federation client pokes | Erik Johnston | 2017-07-18 | 1 | -13/+22 |
| * | Add client apis | Erik Johnston | 2017-07-18 | 2 | -10/+188 |
| * | Comments | Erik Johnston | 2017-07-18 | 2 | -15/+22 |
| * | Use transport client directly | Erik Johnston | 2017-07-18 | 1 | -18/+25 |
| * | Comment | Erik Johnston | 2017-07-18 | 1 | -0/+14 |
| * | Remove sync stuff | Erik Johnston | 2017-07-18 | 2 | -29/+1 |
| * | Add GroupID type | Erik Johnston | 2017-07-18 | 1 | -0/+5 |
| * | Remove unused tables | Erik Johnston | 2017-07-18 | 1 | -7/+0 |
| * | Remove sync stuff | Erik Johnston | 2017-07-18 | 2 | -70/+0 |
| * | Add local group server support | Erik Johnston | 2017-07-17 | 10 | -2/+1248 |
|/ | |||||
* | Merge pull request #2363 from matrix-org/erikj/group_server_summary | Erik Johnston | 2017-07-17 | 4 | -22/+1131 |
|\ | |||||
| * | Ensure category and role ids are non-null | Erik Johnston | 2017-07-14 | 1 | -0/+24 |
| * | Add DEFAULT_ROLE_ID | Erik Johnston | 2017-07-14 | 1 | -4/+5 |
| * | Correctly increment orders | Erik Johnston | 2017-07-14 | 1 | -2/+2 |
| * | Remove unused functions | Erik Johnston | 2017-07-13 | 1 | -152/+0 |
| * | Comments | Erik Johnston | 2017-07-13 | 2 | -12/+32 |
| * | Remove TODO | Erik Johnston | 2017-07-13 | 1 | -1/+0 |
| * | Add summary APIs to federation | Erik Johnston | 2017-07-13 | 1 | -11/+223 |
| * | raise NotImplementedError | Erik Johnston | 2017-07-13 | 1 | -5/+2 |
| * | Comments | Erik Johnston | 2017-07-12 | 3 | -5/+79 |
| * | Simplify checking if admin | Erik Johnston | 2017-07-12 | 1 | -53/+19 |
| * | Add group summary APIs | Erik Johnston | 2017-07-12 | 4 | -2/+970 |
|/ | |||||
* | Merge pull request #2352 from matrix-org/erikj/group_server_split | Erik Johnston | 2017-07-12 | 11 | -11/+1206 |
|\ | |||||
| * | Comment | Erik Johnston | 2017-07-12 | 1 | -1/+1 |
| * | Move comment | Erik Johnston | 2017-07-11 | 1 | -2/+2 |
| * | Add federation API for adding room to group | Erik Johnston | 2017-07-11 | 1 | -0/+18 |
| * | Comment | Erik Johnston | 2017-07-11 | 1 | -5/+8 |
| * | Typo | Erik Johnston | 2017-07-11 | 1 | -1/+1 |
| * | Rename column to attestation_json | Erik Johnston | 2017-07-11 | 2 | -5/+5 |
| * | Comments | Erik Johnston | 2017-07-11 | 3 | -5/+9 |
| * | Comment | Erik Johnston | 2017-07-11 | 2 | -0/+26 |
| * | Remove u/ requirement | Erik Johnston | 2017-07-11 | 1 | -2/+3 |
| * | Lift out visibility parsing | Erik Johnston | 2017-07-11 | 1 | -20/+21 |
| * | Comments | Erik Johnston | 2017-07-11 | 4 | -43/+132 |
| * | Initial group server implementation | Erik Johnston | 2017-07-10 | 11 | -11/+1064 |
* | | 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 |
| * | | | | 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 |