Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 24 | -546/+580 |
|\ | |||||
| * | Fix overzealous kicking of guest users (#2453) | Richard van der Hoff | 2017-09-19 | 1 | -1/+1 |
| | | | | | | We should only kick guest users if the guest access event is authorised. | ||||
| * | Clean up and document handling of logcontexts in Keyring (#2452) | Richard van der Hoff | 2017-09-18 | 1 | -28/+36 |
| | | | | | | | | | | | | I'm still unclear on what the intended behaviour for `verify_json_objects_for_server` is, but at least I now understand the behaviour of most of the things it calls... | ||||
| * | 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 | ||||
| | * | 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 |
| |\ \ | | |/ | |/| | Add support for event_id_only push format | ||||
| | * | Also include the room_id | David Baker | 2017-09-18 | 1 | -0/+1 |
| | | | | | | | | | | | | as really it's part of the event ID | ||||
| | * | 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 |
| | | | | | | | | | | | | | | | | | | | | | Param in the data dict of a pusher that tells an HTTP pusher to send just the event_id of the event it's notifying about and the notification counts. For clients that want to go & fetch the body of the event themselves anyway. | ||||
| * | | Correctly handle leaving room in /key/changes | Erik Johnston | 2017-09-18 | 1 | -13/+12 |
| |/ | |||||
| * | 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 #2288 from kyrias/bcrypt | Richard van der Hoff | 2017-08-23 | 1 | -1/+1 |
| |\ | | | | | | | python_dependencies: Use bcrypt module instead of py-bcrypt | ||||
| | * | python_dependencies: Use bcrypt module instead of py-bcrypt | Johannes Löthberg | 2017-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | py-bcrypt has been unmaintained for a long while, while bcrypt is actively maintained. And since ff8b87118dcfb153d972e29c2b77b195244d5ddc we're compatible with the bcrypt anyway. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | Fix user_dir startup | Richard van der Hoff | 2017-08-16 | 1 | -1/+1 |
| | | | | | | | | | | | | Add missing parameter to _base.start_worker_reactor | ||||
| * | | Fix process startup | Richard van der Hoff | 2017-08-16 | 1 | -10/+13 |
| | | | | | | | | | | | | escape the % that got added in 92168cb so that the process starts up ok. | ||||
| * | | explain why CPU affinity is a good idea | Matthew Hodgson | 2017-08-15 | 1 | -0/+8 |
| | | | |||||
| * | | Allow configuration of CPU affinity | Richard van der Hoff | 2017-08-15 | 5 | -1/+23 |
| | | | | | | | | | | | | | | | Make it possible to set the CPU affinity in the config file, so that we don't need to remember to do it manually every time. | ||||
| * | | Factor out common application start | Richard van der Hoff | 2017-08-15 | 11 | -464/+248 |
| | | | | | | | | | | | | | | | We have 10 copies of this code, and I don't really want to update each one separately. | ||||
| * | | 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 |
| | | | |||||
| * | | Increase cache hit ratio for push | Erik Johnston | 2017-07-14 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | We don't update the cache in all code paths, which causes subsequent calls to miss the cache | ||||
| * | | Add more metrics to push rule evaluation | Erik Johnston | 2017-07-13 | 1 | -2/+42 |
| | | | |||||
| * | | Push: Don't acquire lock unless necessary | Erik Johnston | 2017-07-13 | 1 | -0/+4 |
| | | | |||||
| * | | Use less DB for device list handling in sync | Erik Johnston | 2017-07-12 | 1 | -8/+7 |
| | | | |||||
* | | | Add user profiles to summary from group server | Erik Johnston | 2017-08-25 | 3 | -2/+30 |
| | | | |||||
* | | | Fix typos and reinherit | Erik Johnston | 2017-08-25 | 1 | -12/+6 |
| | | | |||||
* | | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 8 | -22/+30 |
| | | | |||||
* | | | 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 |
|\ \ \ | | | | | | | | | Add ability to publicise group membership | ||||
| * | | | 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 |
| | | | | |||||
* | | | | 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 |
| | | | |||||
* | | | 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 | 11 | -10/+281 |
|\ \ \ | | | | | | | | | Add groups to sync stream | ||||
| * | | | 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 | 7 | -6/+159 |
| | | | | |||||
* | | | | Merge pull request #2377 from matrix-org/erikj/group_profile_update | Erik Johnston | 2017-07-20 | 5 | -0/+55 |
|\ \ \ \ | |/ / / |/| | | | Add update group profile API | ||||
| * | | | 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 |
| | | | | |||||
* | | | | 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 |
| | | | |||||
* | | | 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 |
|\ \ \ | |/ / |/| | | Initial Group Server | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | encode sync-response statically | ||||
| * | | | 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 | ||||
| * | | | | 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 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Bump version and changelog | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add a frontend proxy | Erik Johnston | 2017-07-07 | 2 | -0/+269 |
| | | | | |||||
* | | | | Perf: Don't filter events for push | Erik Johnston | 2017-07-07 | 3 | -36/+21 |
| |/ / |/| | | | | | | | | | | | We know the users are joined and we can explicitly check for if they are ignoring the user, so lets do that. | ||||
* | | | 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 | ||||
| * | | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 3 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | Since we didn't instansiate the PusherPool at start time it could fail at run time, which it did for some users. This may or may not fix things for those users, but it should happen at start time and stop the server from starting. | ||||
* | | | Merge pull request #2309 from matrix-org/erikj/user_ip_repl | Erik Johnston | 2017-07-06 | 4 | -11/+16 |
|\ \ \ | | | | | | | | | Fix up user_ip replication commands | ||||
| * | | | Serialize user ip command as json | Erik Johnston | 2017-06-27 | 1 | -5/+9 |
| | | | | |||||
| * | | | Fix up | Erik Johnston | 2017-06-27 | 3 | -6/+7 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Bump version and changelog github/release-v0.22.0 release-v0.22.0 | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bump version and changelog v0.22.0-rc2 | Erik Johnston | 2017-07-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | Fix caching error in the push evaluator | Richard van der Hoff | 2017-07-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialising `result` to `{}` in the parameters meant that every call to _flatten_dict used the *same* target dictionary. I'm hopeful this will fix https://github.com/matrix-org/synapse/issues/2270, but I suspect it won't. (This code seems to have been here since forever, unlike the bug, and I don't really think it explains the observed behaviour). Still, it makes it hard to investigate the problem. | ||||
* | | | | Merge pull request #2330 from matrix-org/erikj/cache_size_factor | Erik Johnston | 2017-07-04 | 6 | -22/+7 |
|\ \ \ \ | | | | | | | | | | | Increase default cache size | ||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | Improve the error handling for bad invites received over federation | Mark Haines | 2017-06-30 | 1 | -2/+17 |
|/ / / / | |||||
* | | | | 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 |
| | | | | |||||
* | | | | Cache macaroon parse and validation | Erik Johnston | 2017-06-29 | 1 | -13/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Use an ExpiringCache for storing registration sessions | Erik Johnston | 2017-06-29 | 2 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | This is because pruning them was a significant performance drain on matrix.org | ||||
* | | | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-06-27 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Update version and changelog v0.22.0-rc1 | Erik Johnston | 2017-06-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | 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 | ||||
| * | | | | 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 | 4 | -44/+100 |
|\| | | | | | | | | | | | | | | Batch upsert user ips | ||||
| * | | | | Fix up client ips to read from pending data | Erik Johnston | 2017-06-27 | 3 | -23/+61 |
| | | | | | |||||
| * | | | | 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 |
|\ \ \ \ | |/ / / |/| | | | Reject local events that don't round trip the DB | ||||
| * | | | Remove unused variables | Erik Johnston | 2017-06-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-06-26 | 25 | -58/+527 |
| |\ \ \ | | | | | | | | | | | | | | | | erikj/ensure_round_trip | ||||
| * | | | | Reject local events that don't round trip the DB | Erik Johnston | 2017-06-19 | 1 | -0/+9 |
| | |_|/ | |/| | | |||||
* | | | | 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 |
|\ \ \ | | | | | | | | | Add configuration parameter to allow redaction of content from push m… | ||||
| * | | | Change the config file generator to more descriptive explanation of ↵ | Caleb James DeLisle | 2017-06-24 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | push.redact_content | ||||
| * | | | Fix TravisCI tests for PR #2301 - Fat finger mistake | Caleb James DeLisle | 2017-06-23 | 1 | -0/+37 |
| | | | | |||||
| * | | | Fix TravisCI tests for PR #2301 | Caleb James DeLisle | 2017-06-23 | 3 | -42/+2 |
| | | | | |||||
| * | | | Add configuration parameter to allow redaction of content from push messages ↵ | Caleb James DeLisle | 2017-06-23 | 3 | -2/+43 |
| | | | | | | | | | | | | | | | | for google/apple devices | ||||
* | | | | Store URL cache preview downloads seperately | Erik Johnston | 2017-06-23 | 7 | -20/+94 |
|/ / / | | | | | | | | | | This makes it easier to clear old media out at a later date | ||||
* | | | 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 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Bump version and changelog | Erik Johnston | 2017-06-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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 |
|\ \ \ \ | | | | | | | | | | | Don't work out users who share room with appservice users | ||||
| * | | | | 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 branch 'develop' into avoid_duplicate_filters | Krombel | 2017-06-21 | 67 | -475/+3482 |
|\| | | | | |||||
| * | | | | Handle thumbnail urls | Erik Johnston | 2017-06-19 | 1 | -12/+14 |
| | | | | | |||||
| * | | | | Add API to quarantine media | Erik Johnston | 2017-06-19 | 7 | -5/+119 |
| | | | | | |||||
| * | | | | 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 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #2286 from matrix-org/erikj/split_out_user_dir | Erik Johnston | 2017-06-16 | 6 | -7/+328 |
| |\ \ \ | | | | | | | | | | | Split out user directory to a separate process | ||||
| | * | | | 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 you share a room with in user directory | ||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | allow Authorization header which handling got implemented in #1098 | Krombel | 2017-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Kesler <krombel@krombel.de> | ||||
| * | | | | Merge pull request #2281 from matrix-org/erikj/phone_home_stats | Erik Johnston | 2017-06-15 | 4 | -102/+88 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | Fix phone home stats | ||||
| | * | | Typo | Erik Johnston | 2017-06-15 | 1 | -1/+3 |
| | | | | |||||
| | * | | Add some more stats | Erik Johnston | 2017-06-15 | 3 | -0/+35 |
| | | | | |||||
| | * | | Fix phone home stats | Erik Johnston | 2017-06-14 | 3 | -107/+56 |
| | | | | |||||
| * | | | Fix user directory insertion due to missing room_id | Erik Johnston | 2017-06-13 | 2 | -4/+9 |
| | | | | |||||
| * | | | 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 | ||||
| | * | | | 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 | ||||
| | * | | | | 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 existence of events when updating user directory | ||||
| | * | | | | Don't assume existance of events when updating user directory | Erik Johnston | 2017-06-13 | 1 | -3/+6 |
| | |/ / / | |||||
| * / / / | 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 |
| |\ \ \ | | | | | | | | | | | Change is_host_joined to use current_state table | ||||
| | * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bypasses a bug where using the state groups to figure out if a host is in a room sometimes errors if the servers isn't in the room. (For example when the server rejected an invite to a remote room) | ||||
| * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | Fix has_any_entity_changed | ||||
| | * | | | | Rewrite conditional | Erik Johnston | 2017-06-09 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix has_any_entity_changed | Erik Johnston | 2017-06-09 | 1 | -4/+4 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occaisonally has_any_entity_changed would throw the error: "Set changed size during iteration" when taking the max of the `sorteddict`. While its uncertain how that happens, its quite inefficient to iterate over the entire dict anyway so we change to using the more traditional `bisect_*` functions. | ||||
| * | | | | Merge pull request #2267 from matrix-org/erikj/missing_notifier | Erik Johnston | 2017-06-09 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Fix removing of pushers when using workers | ||||
| | * | | | | Add missing notifier | Erik Johnston | 2017-06-09 | 1 | -1/+2 |
| | |/ / / | |||||
| * | | | | Comment | Erik Johnston | 2017-06-09 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Mark remote invite rejections as outliers | Erik Johnston | 2017-06-09 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | 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 | ||||
| | * | | | Fix bug where state_group tables got corrupted | Erik Johnston | 2017-06-07 | 3 | -10/+24 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to the fact that we prefilled caches using txn.call_after, which always gets called including on error. We fix this by making txn.call_after only fire when a transaction completes successfully, which is what we want most of the time anyway. | ||||
| * | | | 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 | ||||
| | * | | | 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 | 6 | -56/+154 |
| |\ \ \ \ | | |/ / / | |/| | | | Faster cache for get_joined_hosts | ||||
| | * | | | 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 | 1 | -7/+5 |
| | | | | | | |||||
| | * | | | | 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 |
| | | | | | | |||||
| * | | | | | 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 |
| | | | | |||||
| * | | | Handle profile updates in user directory | Erik Johnston | 2017-06-01 | 2 | -0/+74 |
| | | | | |||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | - Check if room is public when a user joins before adding to user dir - Fix typo of field name "content.join_rules" -> "content.join_rule" | ||||
| * | | | 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 |
| | | | |