Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add config option for setting the trusted id servers, disabling checking the ↵ | Mark Haines | 2016-01-29 | 2 | -8/+24 |
| | | | | ID server in integration tests | ||||
* | Allow three_pid_creds as well as threePidCreds in /account/3pid | Mark Haines | 2016-01-29 | 1 | -2/+3 |
| | |||||
* | Pin pynacl to 0.3.0 | Daniel Wagner-Hall | 2016-01-28 | 1 | -1/+1 |
| | | | | | Something has gone wrong in the packaging of 1.* which causes it not to compile. | ||||
* | Merge pull request #534 from matrix-org/erikj/setup | Erik Johnston | 2016-01-28 | 9 | -115/+111 |
|\ | | | | | Add a Homeserver.setup method | ||||
| * | Clean up a bit. Add comment | Erik Johnston | 2016-01-28 | 3 | -26/+18 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup | Erik Johnston | 2016-01-27 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup | Erik Johnston | 2016-01-27 | 4 | -9/+27 |
| |\ \ | |||||
| * | | | PEP 8 | Erik Johnston | 2016-01-27 | 1 | -1/+0 |
| | | | | |||||
| * | | | Add a Homeserver.setup method. | Erik Johnston | 2016-01-26 | 9 | -116/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is for setting up dependencies that require work on startup. This is useful for the DataStore that wants to read a bunch from the database before initiliazing. | ||||
* | | | | Up get_rooms_for_user cache size | Erik Johnston | 2016-01-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #535 from matrix-org/rav/paginate_from_stream_token | Richard van der Hoff | 2016-01-28 | 1 | -22/+21 |
|\ \ \ \ | | | | | | | | | | | Make it possible to paginate forwards from stream tokens | ||||
| * | | | | Make it possible to paginate forwards from stream tokens | Richard van der Hoff | 2016-01-27 | 1 | -22/+21 |
| | |/ / | |/| | | | | | | | | | | | | | | In order that we can fill the gap after a /sync, make it possible to paginate forwards from a stream token. | ||||
* | | | | Remove chdir | Erik Johnston | 2016-01-28 | 1 | -1/+0 |
| |_|/ |/| | | |||||
* | | | Merge pull request #530 from matrix-org/erikj/server_refactor | Erik Johnston | 2016-01-27 | 7 | -230/+160 |
|\ \ \ | |/ / |/| | | Remove redundant BaseHomeServer | ||||
| * | | Don't turn on profiling | Erik Johnston | 2016-01-26 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-01-26 | 2 | -2/+8 |
| |\ \ | | |/ | |/| | | | | erikj/server_refactor | ||||
| * | | Remove redundated BaseHomeServer | Erik Johnston | 2016-01-26 | 7 | -231/+161 |
| | | | |||||
* | | | Merge pull request #533 from matrix-org/rav/hashtest_federation | Richard van der Hoff | 2016-01-27 | 1 | -1/+7 |
|\ \ \ | | | | | | | | | Fix federation for #test:matrix.org | ||||
| * | | | Federation: drop events which cause SynapseErrors | Richard van der Hoff | 2016-01-27 | 1 | -1/+7 |
| | |/ | |/| | | | | | | | | | | ... rather than rejecting any attempt to federate channels which contain such events. | ||||
* | | | Merge pull request #531 from matrix-org/markjh/relative_push_rules | Mark Haines | 2016-01-27 | 2 | -6/+12 |
|\ \ \ | |/ / |/| | | Fix adding push rules relative to other rules | ||||
| * | | Fix adding push rules relative to other rules | Mark Haines | 2016-01-27 | 2 | -6/+12 |
| | | | |||||
* | | | Only notify for messages in one to one rooms, not every event | David Baker | 2016-01-26 | 1 | -0/+6 |
|/ / | | | | | | | Fixes the fact that candidate events and hangups generated notifications. | ||||
* | | Merge pull request #528 from matrix-org/markjh/missing_yield | Mark Haines | 2016-01-25 | 1 | -2/+2 |
|\ \ | |/ |/| | Add missing yield in push_rules set enabled | ||||
| * | Add missing yield in push_rules set enabled | Mark Haines | 2016-01-25 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #524 from matrix-org/erikj/sync | Erik Johnston | 2016-01-25 | 3 | -87/+174 |
|\ \ | | | | | | | Move some sync logic from rest to handlers pacakege | ||||
| * | | PEP8 | Erik Johnston | 2016-01-25 | 1 | -1/+0 |
| | | | |||||
| * | | Remove weird stuff | Erik Johnston | 2016-01-25 | 1 | -6/+0 |
| | | | |||||
| * | | Fix tests | Erik Johnston | 2016-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-01-25 | 1 | -3/+7 |
| |\| | |||||
| * | | Move logic from rest/ to handlers/ | Erik Johnston | 2016-01-25 | 3 | -87/+181 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-01-22 | 6 | -19/+189 |
| |\ \ | |||||
* | \ \ | Merge pull request #525 from matrix-org/erikj/select_many | Erik Johnston | 2016-01-25 | 3 | -60/+110 |
|\ \ \ \ | | | | | | | | | | | Implement a `_simple_select_many_batch` | ||||
| * | | | | Guard against empty iterables | Erik Johnston | 2016-01-25 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Correct docstring | Erik Johnston | 2016-01-25 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Implement a _simple_select_many_batch | Erik Johnston | 2016-01-25 | 3 | -60/+105 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #527 from matrix-org/erikj/push_cache | Erik Johnston | 2016-01-25 | 2 | -17/+14 |
|\ \ \ \ | | | | | | | | | | | Push: Use storage apis that are cached | ||||
| * | | | | Push: Use storage apis that are cached | Erik Johnston | 2016-01-25 | 2 | -17/+14 |
| |/ / / | |||||
* | | | | Merge pull request #526 from matrix-org/erikj/push_index | Erik Johnston | 2016-01-25 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Add index to event_push_actions | ||||
| * | | | | Add index to event_push_actions | Erik Johnston | 2016-01-25 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #521 from matrix-org/erikj/underscores | Erik Johnston | 2016-01-25 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Underscores are allowed in user ids | ||||
| * | | | Underscores are allowed in user ids | Erik Johnston | 2016-01-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-01-25 | 3 | -34/+40 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Sanitize filters | Erik Johnston | 2016-01-22 | 3 | -34/+40 |
| | | | | |||||
* | | | | Merge pull request #523 from matrix-org/dbkr/no_push_unless_notify | David Baker | 2016-01-22 | 1 | -9/+1 |
|\ \ \ \ | | | | | | | | | | | Better fix for actions with both dont_notify and tweaks | ||||
| * | | | | Better fix for actions with both dont_notify and tweaks | David Baker | 2016-01-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Revert b4a41aa542203c03bb8a6c93097b94bc5d167265 as it's just broken. | David Baker | 2016-01-22 | 1 | -9/+1 |
| | | | | | |||||
* | | | | | Merge pull request #522 from matrix-org/dbkr/no_push_unless_notify | David Baker | 2016-01-22 | 1 | -1/+9 |
|\| | | | | | | | | | | | | | | Don't add notifications to the table unless there's actually a 'notify' action | ||||
| * | | | | Don't add notifications to the table unless there's actually a 'notify' action | David Baker | 2016-01-22 | 1 | -1/+9 |
| | |_|/ | |/| | | |||||
* / | | | Don't mutate cached values | Erik Johnston | 2016-01-22 | 1 | -2/+6 |
|/ / / | |||||
* | | | Don't crash if a user has no push rule enabled entries | David Baker | 2016-01-22 | 1 | -0/+3 |
| | | | |||||
* | | | Overlay the push_rules_enabled map for users, otherwise they won't be able ↵ | David Baker | 2016-01-22 | 2 | -0/+43 |
| |/ |/| | | | | | to disable server default rules. | ||||
* | | Don't add the member functiopn if we're not using treecache | David Baker | 2016-01-22 | 1 | -1/+4 |
| | | |||||
* | | docs | David Baker | 2016-01-22 | 1 | -1/+5 |
| | | |||||
* | | Revert all the bits changing keys of eeverything that used LRUCaches to tuples | David Baker | 2016-01-22 | 3 | -9/+9 |
| | | |||||
* | | Make LRU cache not default to treecache & add options to use it | David Baker | 2016-01-22 | 3 | -11/+20 |
| | | |||||
* | | Add __contains__ | David Baker | 2016-01-22 | 1 | -0/+3 |
| | | |||||
* | | Docs for treecache | David Baker | 2016-01-22 | 1 | -0/+5 |
| | | |||||
* | | Use new invalidate_many cache invalidation to invalidate the ↵ | David Baker | 2016-01-22 | 1 | -4/+15 |
| | | | | | | | | event_push_actions cache appropriately. | ||||
* | | Add invalidate_many here too | David Baker | 2016-01-22 | 1 | -0/+1 |
| | | |||||
* | | peppate | David Baker | 2016-01-21 | 1 | -2/+2 |
| | | |||||
* | | Change LRUCache to be tree-based so we can delete subtrees. | David Baker | 2016-01-21 | 5 | -17/+105 |
|/ | |||||
* | Only fetch events for rooms and receipts | Erik Johnston | 2016-01-21 | 3 | -7/+8 |
| | |||||
* | Cache get_unread_event_push_actions_by_room_for_user | Erik Johnston | 2016-01-21 | 1 | -1/+2 |
| | |||||
* | Only compute badge count when necessary. | Erik Johnston | 2016-01-21 | 1 | -4/+15 |
| | | | | This reverts commit d7265977376eb391007cde55c4b2d9b8f54d452b. | ||||
* | Fix AttributeError | Erik Johnston | 2016-01-21 | 1 | -1/+1 |
| | |||||
* | Merge pull request #515 from matrix-org/erikj/syn-606 | Erik Johnston | 2016-01-21 | 1 | -1/+3 |
|\ | | | | | SYN-606: Peeking does not wake up /events | ||||
| * | SYN-606: Peeking does not wake up /events | Erik Johnston | 2016-01-21 | 1 | -1/+3 |
| | | | | | | | | | | | | If a real user attempted to first peek into one room, and then another, their room event stream would not be woken up for events in the later room. | ||||
* | | Merge pull request #509 from matrix-org/erikj/dns_cache | Erik Johnston | 2016-01-21 | 1 | -30/+71 |
|\ \ | | | | | | | Cache dns lookups, and use the cache if we fail to lookup servers later | ||||
| * | | Cache dns lookups, and use the cache if we fail to lookup servers later | Erik Johnston | 2016-01-20 | 1 | -30/+71 |
| | | | |||||
* | | | Remove member event rule as per SYN-607 | David Baker | 2016-01-21 | 1 | -17/+19 |
| |/ |/| | |||||
* | | Merge pull request #507 from matrix-org/push_badge_counts | David Baker | 2016-01-21 | 5 | -66/+108 |
|\ \ | | | | | | | Push badge counts | ||||
| * | | peppate | David Baker | 2016-01-20 | 1 | -3/+2 |
| | | | |||||
| * | | Add index by user id on receipts_linearized | David Baker | 2016-01-20 | 1 | -0/+18 |
| | | | |||||
| * | | Add storage function to get all receipts for a user. Also add some cache ↵ | David Baker | 2016-01-20 | 2 | -43/+40 |
| | | | | | | | | | | | | invalidation to the receipts storage because there wasn't any, and remove a method that was unused. | ||||
| * | | Inline membership specifier | David Baker | 2016-01-20 | 1 | -3/+1 |
| | | | |||||
| * | | Simplify badge updating code by just updating it every time we get woken up ↵ | David Baker | 2016-01-20 | 1 | -15/+4 |
| | | | | | | | | | | | | and it's not an event | ||||
| * | | Merge branch 'develop' into push_badge_counts | David Baker | 2016-01-20 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into push_badge_counts | David Baker | 2016-01-20 | 1 | -0/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into push_badge_counts | David Baker | 2016-01-20 | 3 | -36/+36 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'develop' into push_badge_counts | David Baker | 2016-01-19 | 30 | -672/+950 |
| |\ \ \ \ | |||||
| * | | | | | Use the unread notification count to send accurate badge counts in push ↵ | David Baker | 2016-01-13 | 3 | -45/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | notifications. | ||||
* | | | | | | Merge pull request #513 from matrix-org/erikj/register_user_chars | Erik Johnston | 2016-01-21 | 1 | -3/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't explode when given a unicode username in /register/ | ||||
| * | | | | | | Don't explode when given a unicode username in /register/ | Erik Johnston | 2016-01-20 | 1 | -3/+2 |
| | | | | | | | |||||
* | | | | | | | Fix change_password | Erik Johnston | 2016-01-20 | 1 | -3/+2 |
| | | | | | | | |||||
* | | | | | | | Whine if we give a from param to /sync | Erik Johnston | 2016-01-20 | 1 | -0/+7 |
|/ / / / / / | |||||
* | | | | / | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 8 | -85/+108 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | 'filtered' is a list of zero or 1 | David Baker | 2016-01-20 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Don't generate push actions for our own events | David Baker | 2016-01-20 | 1 | -0/+3 |
| |_|/ |/| | | |||||
* | | | Merge pull request #506 from matrix-org/erikj/push_fast | Erik Johnston | 2016-01-19 | 2 | -30/+23 |
|\ \ \ | | | | | | | | | Only compute unread notifications for rooms we send down stream | ||||
| * | | | Only compute unread notifications for rooms we send down stream | Erik Johnston | 2016-01-19 | 2 | -30/+23 |
| | |/ | |/| | |||||
* / | | Don't use form of get_state_for_events with None state_key | Erik Johnston | 2016-01-19 | 1 | -6/+13 |
|/ / | |||||
* | | Use split rather than endswith | Erik Johnston | 2016-01-19 | 1 | -2/+1 |
| | | |||||
* | | Change regex cache size to 5000 | Erik Johnston | 2016-01-19 | 1 | -1/+1 |
| | | |||||
* | | Add regex cache. Only caculate push actions for users that have sent read ↵ | Erik Johnston | 2016-01-19 | 7 | -14/+50 |
| | | | | | | | | receipts, and are on that server | ||||
* | | Handle glob -> regex errors | Erik Johnston | 2016-01-19 | 1 | -29/+33 |
| | | |||||
* | | Merge pull request #477 from matrix-org/erikj/access_token_log | Erik Johnston | 2016-01-19 | 1 | -3/+5 |
|\ \ | | | | | | | Don't log urlencoded access_tokens | ||||
| * | | Use compiled regex | Erik Johnston | 2016-01-13 | 1 | -2/+4 |
| | | | |||||
| * | | Don't log urlencoded access_tokens | Erik Johnston | 2016-01-08 | 1 | -2/+2 |
| | | | |||||
* | | | Use all_ephemeral_by_room in incremental_sync_with_gap_for_room | Erik Johnston | 2016-01-19 | 1 | -3/+5 |
| | | | |||||
* | | | Return don't break | Erik Johnston | 2016-01-19 | 1 | -1/+1 |
| | | | |||||
* | | | Except truthy values | Erik Johnston | 2016-01-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #504 from matrix-org/erikj/highlight_count | Erik Johnston | 2016-01-19 | 3 | -8/+40 |
|\ \ \ | | | | | | | | | Return highlight_count in /sync | ||||
| * | | | Return highlight_count in /sync | Erik Johnston | 2016-01-19 | 3 | -8/+40 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into default_notify | Erik Johnston | 2016-01-19 | 24 | -647/+851 |
|\| | | | |||||
| * | | | Merge pull request #502 from matrix-org/erikj/push_notif_perf | Erik Johnston | 2016-01-19 | 11 | -395/+550 |
| |\ \ \ | | | | | | | | | | | Unread notification performance. | ||||
| | * | | | Take a deepcopy of push rules before mutating them | Erik Johnston | 2016-01-19 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Update _id | Erik Johnston | 2016-01-19 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Preserve truthiness | Erik Johnston | 2016-01-18 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | You need to escape backslashes | Erik Johnston | 2016-01-18 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fix branch didn't check word_boundary | Erik Johnston | 2016-01-18 | 1 | -3/+9 |
| | | | | | |||||
| | * | | | Remove dead code | Erik Johnston | 2016-01-18 | 1 | -22/+1 |
| | | | | | |||||
| | * | | | Don't split at word boundaries, actually use regex | Erik Johnston | 2016-01-18 | 2 | -63/+48 |
| | | | | | |||||
| | * | | | Drop log levels | Erik Johnston | 2016-01-18 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Add comments and remove dead code | Erik Johnston | 2016-01-18 | 1 | -12/+11 |
| | | | | | |||||
| | * | | | Do for loop once at start | Erik Johnston | 2016-01-18 | 1 | -8/+17 |
| | | | | | |||||
| | * | | | Use static for const dicts | Erik Johnston | 2016-01-18 | 4 | -198/+209 |
| | | | | | |||||
| | * | | | Remove internal ids | Erik Johnston | 2016-01-18 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Don't edit ruleset | Erik Johnston | 2016-01-18 | 1 | -5/+4 |
| | | | | | |||||
| | * | | | Make unit tests work | Erik Johnston | 2016-01-18 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Re-enable urnead notifications | Erik Johnston | 2016-01-18 | 3 | -13/+6 |
| | | | | | |||||
| | * | | | Make notifications go quicker | Erik Johnston | 2016-01-18 | 4 | -131/+260 |
| | | | | | |||||
| | * | | | Make Event objects behave more like dicts | Erik Johnston | 2016-01-18 | 1 | -0/+9 |
| | | | | | |||||
| | * | | | Allow filtering events for multiple users at once | Erik Johnston | 2016-01-18 | 2 | -39/+67 |
| | | | | | |||||
| * | | | | Don't error on AS non-ghost user use | Daniel Wagner-Hall | 2016-01-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This will probably go away either when we fix our existing ASes, or when we kill the concept of non-ghost users. | ||||
| * | | | | Pull out app service user lookup | Daniel Wagner-Hall | 2016-01-18 | 1 | -31/+28 |
| |/ / / | | | | | | | | | | | | | I find this a lot simpler than nested try-catches and stuff | ||||
| * | | | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 5 | -55/+113 |
| | | | | |||||
| * | | | Remove unused parameters | Daniel Wagner-Hall | 2016-01-15 | 2 | -16/+8 |
| | | | | |||||
| * | | | M_INVALID_USERNAME to be consistent with the parameter name | David Baker | 2016-01-15 | 2 | -2/+2 |
| | | | | |||||
| * | | | Add specific error code for invalid user names. | David Baker | 2016-01-14 | 2 | -1/+3 |
| | | | | |||||
| * | | | Merge pull request #497 from matrix-org/erikj/max_limit | Erik Johnston | 2016-01-14 | 1 | -2/+5 |
| |\ \ \ | | | | | | | | | | | Clamp pagination limits to at most 1000 | ||||
| | * | | | Clamp pagination limits to at most 1000 | Erik Johnston | 2016-01-14 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | Merge branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 2 | -12/+29 |
| |\ \ \ \ | |||||
| | * | | | | Add 'event' result to 'context' endpoint | Richard van der Hoff | 2016-01-13 | 2 | -12/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | ... because the context isn't much use without the event. | ||||
| | * | | | | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-13 | 5 | -21/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour. | ||||
| * | | | | | Require ID and as_token be unique for ASs | Daniel Wagner-Hall | 2016-01-14 | 1 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defaults ID to as_token if not specified. This will change when IDs are fully supported. | ||||
| * | | | | | Merge pull request #498 from matrix-org/push_rule_enabled_fix | David Baker | 2016-01-14 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix enabling & disabling push rules | ||||
| | * | | | | | Fix enabling & disabling push rules | David Baker | 2016-01-14 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #487 from matrix-org/daniel/forceregistration | Daniel Wagner-Hall | 2016-01-14 | 1 | -0/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Require AS users to be registered before use | ||||
| | * | | | | | Require AS users to be registered before use | Daniel Wagner-Hall | 2016-01-13 | 1 | -0/+5 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #494 from matrix-org/daniel/2 | Daniel Wagner-Hall | 2016-01-14 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Don't start server if ASes are invalidly configured | ||||
| | * | | | | | Don't start server if ASes are invalidly configured | Daniel Wagner-Hall | 2016-01-13 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #493 from matrix-org/daniel/1 | Daniel Wagner-Hall | 2016-01-14 | 1 | -59/+0 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Delete unused code | ||||
| | * | | | | Delete unused code | Daniel Wagner-Hall | 2016-01-13 | 1 | -59/+0 |
| | |/ / / | |||||
| * | | | | Use logger not logging | Erik Johnston | 2016-01-14 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Don't change signature. Return empty list | Erik Johnston | 2016-01-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Temporarily disable notification branch | Erik Johnston | 2016-01-13 | 3 | -7/+14 |
| | | | | | |||||
| * | | | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵ | Mark Haines | 2016-01-13 | 9 | -99/+99 |
| |/ / / | | | | | | | | | | | | | of the code | ||||
* / / / | Change default pushrules back to notifying for all messages. | David Baker | 2016-01-13 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into ↵ | Mark Haines | 2016-01-13 | 3 | -26/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | markjh/table_name Conflicts: synapse/storage/push_rule.py | ||||
| * | | | bulk_get_push_rules should handle empty lists | Erik Johnston | 2016-01-13 | 1 | -21/+13 |
| | | | | |||||
| * | | | Merge pull request #480 from matrix-org/erikj/guest_event_tightloop | Erik Johnston | 2016-01-13 | 1 | -7/+0 |
| |\ \ \ | | | | | | | | | | | Dont fire user_joined_room when guest hits /events | ||||
| | * | | | Dont fire user_joined_room when guest hits /events | Erik Johnston | 2016-01-12 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firing the 'user_joined_room' signal everytime a guest hits /events causes all presence for that room to be returned in the stream. This may sound helpful, but causes clients to tightloop calling /events. In general, guest users should get the initial presence from (room) intial sync and so we don't require presence to sbsequently come down the event stream. | ||||
| * | | | | Don't include old left rooms | Erik Johnston | 2016-01-12 | 1 | -1/+5 |
| |/ / / | |||||
* | | | | Delete the table objects from TransactionStore | Mark Haines | 2016-01-13 | 1 | -58/+10 |
| | | | | |||||
* | | | | Remove the RoomsTable object | Mark Haines | 2016-01-13 | 1 | -13/+3 |
| | | | | |||||
* | | | | Remove the PushersTable and EventPushActionsTable objects | Mark Haines | 2016-01-12 | 2 | -14/+6 |
| | | | | |||||
* | | | | Remove the PushRuleTable and PushRuleEnableTable objects | Mark Haines | 2016-01-12 | 1 | -50/+33 |
|/ / / | |||||
* | | | Merge pull request #478 from matrix-org/daniel/userobject | Daniel Wagner-Hall | 2016-01-11 | 21 | -131/+167 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a User object I'm sick of passing around more and more things as tuple items around the whole world, and needing to edit every call site every time there is more information about a user. So pass them around together as an object. This object has incredibly poorly named fields because we have a convention that `user` indicates a UserID object, and `user_id` indicates a string. I tried to clean up the whole repo to fix this, but gave up. So instead, I introduce a second convention. A user_object is a User, and a user_id_object is a UserId. I may have cried a little bit. | ||||
| * | | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 21 | -131/+167 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up. | ||||
* | | | | Postgres doesn't like booleans | David Baker | 2016-01-11 | 1 | -2/+2 |
| | | | | |||||
* | | | | Remove rogue 'admin' | David Baker | 2016-01-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #474 from matrix-org/erikj/core_dump | Erik Johnston | 2016-01-08 | 1 | -2/+5 |
|\ \ \ \ | | |_|/ | |/| | | Turn on core dumps | ||||
| * | | | Turn on core dumps | Erik Johnston | 2016-01-07 | 1 | -2/+5 |
| |/ / | |||||
* | | | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 16 | -35/+515 |
|\ \ \ | | | | | | | | | Send unread notification counts | ||||
| * | | | This comma is actually important | David Baker | 2016-01-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | more commas | David Baker | 2016-01-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | comma style | David Baker | 2016-01-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-06 | 6 | -142/+60 |
| |\ \ \ | |||||
| * | | | | Adding is_guest here won't work because it just constructs a dict of uid -> ↵ | David Baker | 2016-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | password hash | ||||
| * | | | | Delete notifications for redacted events | David Baker | 2016-01-06 | 2 | -0/+19 |
| | | | | | |||||
| * | | | | Add schema change file for is_guest flag | David Baker | 2016-01-06 | 1 | -0/+22 |
| | | | | | |||||
| * | | | | Add is_guest flag to users db to track whether a user is a guest user or ↵ | David Baker | 2016-01-06 | 9 | -31/+69 |
| | | | | | | | | | | | | | | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions. | ||||
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-05 | 14 | -58/+120 |
| |\ \ \ \ | |||||
| * | | | | | comment typo | David Baker | 2016-01-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | = not == in sql | David Baker | 2016-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Only joined rooms have unread_notif_count | David Baker | 2016-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | comma | David Baker | 2016-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add unread_notif_count in incremental_sync_with_gap | David Baker | 2016-01-04 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | Rename event-actions to event_push_actions as per PR request | David Baker | 2016-01-04 | 6 | -17/+17 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-04 | 5 | -4/+120 |
| |\ \ \ \ \ | |||||
| * | | | | | | Address minor PR issues | David Baker | 2016-01-04 | 7 | -25/+12 |
| | | | | | | | |||||
| * | | | | | | Fix merge fail with anon access stuff | David Baker | 2015-12-22 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | pep8 & unused variable | David Baker | 2015-12-22 | 3 | -4/+3 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-22 | 5 | -81/+200 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add some comments to areas that could be optimised. | David Baker | 2015-12-22 | 3 | -1/+14 |
| | | | | | | | | |||||
| * | | | | | | | Insert push actions in a single db query rather than one per user/profile_tag | David Baker | 2015-12-22 | 2 | -17/+24 |
| | | | | | | | | |||||
| * | | | | | | | Add bulk push rule evaluator which actually still evaluates rules one by ↵ | David Baker | 2015-12-22 | 4 | -22/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one, but does far fewer db queries to fetch the rules | ||||
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 15 | -69/+253 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Only run pushers for users on this hs! | David Baker | 2015-12-21 | 3 | -3/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | pep8 | David Baker | 2015-12-21 | 2 | -9/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Make unread notification count sending work: put the correct count in ↵ | David Baker | 2015-12-18 | 2 | -20/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user... | ||||
| * | | | | | | | | still very WIP, but now sends unread_notifications_count in the room object ↵ | David Baker | 2015-12-16 | 5 | -5/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs). | ||||
| * | | | | | | | | Store nothing instead of ['dont_notify'] for events with no notification ↵ | David Baker | 2015-12-10 | 3 | -21/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required: much as it would be nice to be able to tell between the event not having been processed and there being no notification for it, this isn't worth filling up the table with ['dont_notify'] I think. Consequently treat the empty actions array as dont_notify and filter dont_notify out of the result. | ||||
| * | | | | | | | | Save event actions to the db | David Baker | 2015-12-10 | 4 | -2/+72 |
| | | | | | | | | | |||||
| * | | | | | | | | Having consulted The Erikle, this should go at the end of on_receive_pdu, ↵ | David Baker | 2015-12-10 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise it will be triggered whenever we backfill too. | ||||
| * | | | | | | | | Very first cut of calculating actions for events as they come in. Doesn't ↵ | David Baker | 2015-12-10 | 4 | -1/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store them yet. Not very efficient. | ||||
* | | | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail. | Mark Haines | 2016-01-07 | 1 | -1/+1 |
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Even though ones cropped with scale might be technically valid. | ||||
* | | | | | | | | Use logger not logging | Erik Johnston | 2016-01-07 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #473 from matrix-org/erikj/ssh_manhole | Erik Johnston | 2016-01-07 | 2 | -6/+22 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Change manhole to use ssh | ||||
| * | | | | | | | | s/telnet/ssh/ | Erik Johnston | 2016-01-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Change manhole to use ssh | Erik Johnston | 2016-01-07 | 1 | -5/+21 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | copyrights | Matthew Hodgson | 2016-01-07 | 231 | -231/+231 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #472 from roblabla/patch-1 | Matthew Hodgson | 2016-01-06 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Config Comment mixup in captcha public/private key | ||||
| * | | | | | | | | Config Comment mixup in captcha public/private key | Robin Lambertz | 2016-01-06 | 1 | -2/+2 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Add /_matrix/versions to report supported versions | Daniel Wagner-Hall | 2016-01-06 | 3 | -0/+43 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Pass whether the user was a guest to some of the event streams | Mark Haines | 2016-01-06 | 1 | -5/+3 |
| | | | | | | | |||||
* | | | | | | | Guest users must be joined to a room to see it in /sync | Mark Haines | 2016-01-06 | 4 | -137/+50 |
| | | | | | | | |||||
* | | | | | | | Log when starting stats reporting | Daniel Wagner-Hall | 2016-01-06 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Log on stats scheduling | Daniel Wagner-Hall | 2016-01-06 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Log when we skip daily messages | Daniel Wagner-Hall | 2016-01-06 | 1 | -1/+10 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-05 | 5 | -21/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour. | ||||
* | | | | | | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 10 | -31/+84 |
| | | | | | | |||||
* | | | | | | Use larger thumbnail rather than smaller. | Erik Johnston | 2016-01-05 | 1 | -4/+13 |
| | | | | | | |||||
* | | | | | | Return /sync when something under the 'leave' key has changed | Erik Johnston | 2016-01-05 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Use named args | Erik Johnston | 2016-01-05 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Support inviting 3pids in /createRoom | Erik Johnston | 2016-01-05 | 1 | -0/+16 |
|/ / / / / | |||||
* | | | / | Bump changelog and version for v0.12.0 | Mark Haines | 2016-01-04 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Expose /login under r0 | Richard van der Hoff | 2016-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | The spec says /login should be available at r0 and 'unstable', so make it so. | ||||
* | | | | Bump version and update changelog for v0.12.0-rc3 v0.12.0-rc3 | Mark Haines | 2015-12-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #457 from matrix-org/markjh/cached_sync | Mark Haines | 2015-12-23 | 2 | -1/+117 |
|\ \ \ \ | | | | | | | | | | | Add a cache for initialSync responses that expires after 5 minutes | ||||
| * | | | | Add some docstring explaining the snapshot cache does | Mark Haines | 2015-12-23 | 1 | -1/+23 |
| | | | | | |||||
| * | | | | Add a unit test for the snapshot cache | Mark Haines | 2015-12-23 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Move the doc string to the public facing method | Mark Haines | 2015-12-22 | 1 | -16/+17 |
| | | | | | |||||
| * | | | | Add a cache for initialSync responses that expires after 5 minutes | Mark Haines | 2015-12-22 | 2 | -1/+94 |
| | |_|/ | |/| | | |||||
* / | | | Missing yield on guest access auth check | Mark Haines | 2015-12-23 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Needs matrix-org/sytest#125 to land first | ||||
* | | | Include the list of bad room ids in the error | Mark Haines | 2015-12-22 | 2 | -2/+24 |
| | | | |||||
* | | | Use a list comprehension | Mark Haines | 2015-12-22 | 1 | -3/+4 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/develop' into markjh/guest_access | Mark Haines | 2015-12-22 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/api/filtering.py | ||||
| * | | | Add top level filters for filtering by room id | Mark Haines | 2015-12-22 | 1 | -33/+35 |
| | | | | | | | | | | | | | | | | Documented by matrix-org/matrix-doc#246 | ||||
* | | | | Hook up read receipts and typing notifications for guest access | Mark Haines | 2015-12-22 | 1 | -13/+11 |
| | | | | |||||
* | | | | Merge branch 'develop' into markjh/guest_access | Mark Haines | 2015-12-22 | 1 | -2/+21 |
|\| | | | |||||
| * | | | Return room avatar URLs in /publicRooms | Daniel Wagner-Hall | 2015-12-21 | 1 | -2/+21 |
| | |/ | |/| | | | | | | | | | | Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121 | ||||
* | | | Allow guest access to /sync | Mark Haines | 2015-12-22 | 1 | -46/+98 |
| | | | |||||
* | | | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 3 | -1/+22 |
| | | | |||||
* | | | Add top level filtering by room id | Mark Haines | 2015-12-21 | 1 | -33/+30 |
|/ / | |||||
* | | Remove accidentally committed debug logging | Mark Haines | 2015-12-21 | 1 | -1/+0 |
| | | |||||
* | | Actually look up required remote server key IDs | Paul "LeoNerd" Evans | 2015-12-18 | 1 | -1/+3 |
| | | | | | | | | | | | | set.union() is a side-effect-free function that returns the union of two sets. This clearly wanted .update(), which is the side-effecting mutator version. | ||||
* | | Merge pull request #450 from matrix-org/matthew/no-identicons | Matthew Hodgson | 2015-12-18 | 1 | -19/+3 |
|\ \ | | | | | | | Matthew/no identicons | ||||
| * | | fix indentation level | Matthew Hodgson | 2015-12-17 | 1 | -3/+3 |
| | | | |||||
| * | | stop generating default identicons. reverts most of ↵ | Matthew Hodgson | 2015-12-17 | 1 | -19/+3 |
| | | | | | | | | | | | | 582019f870adbc4a8a8a9ef97b527e0fead77761 and solves vector-web/vector-im#346 | ||||
* | | | Merge branch 'release-v0.12.0' into develop | David Baker | 2015-12-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix typo that broke registration on the mobile clients | David Baker | 2015-12-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add display_name to 3pid invite in m.room.member invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+31 |
| |/ / |/| | | |||||
* | | | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 2 | -2/+13 |
|/ / | | | | | | | We're not meant to leak that into the graph | ||||
* | | Fix 500 error when back-paginating search results | Richard van der Hoff | 2015-12-17 | 1 | -2/+4 |
| | | | | | | | | | | We were mistakenly adding pagination clauses to the count query, which then failed because the count query doesn't join to the events table. | ||||
* | | Fix typo | Daniel Wagner-Hall | 2015-12-16 | 1 | -1/+1 |
| | | |||||
* | | Give the IS a bunch more 3pid invite context | Daniel Wagner-Hall | 2015-12-16 | 1 | -7/+60 |
| | | | | | | | | This allows it to form richer emails | ||||
* | | Merge pull request #440 from matrix-org/daniel/ise | Mark Haines | 2015-12-16 | 1 | -2/+5 |
|\ \ | | | | | | | Include errcode on Internal Server Error | ||||
| * | | Include errcode on Internal Server Error | Daniel Wagner-Hall | 2015-12-14 | 1 | -2/+5 |
| | | | |||||
* | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-16 | 3 | -5/+10 |
|\ \ \ |