Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-02-11 | 1 | -1/+1 |
|\ | |||||
| * | Bump version and changelog | Erik Johnston | 2016-02-11 | 1 | -1/+1 |
| | | |||||
* | | Fix SYN-627, events are in incorrect room in /sync | Erik Johnston | 2016-02-11 | 1 | -1/+1 |
|/ | |||||
* | Return events in correct order for /events | Erik Johnston | 2016-02-11 | 2 | -8/+12 |
| | |||||
* | Add some paranoia logging | Erik Johnston | 2016-02-11 | 1 | -0/+10 |
| | |||||
* | 0.13.1 v0.13.1 | Matthew Hodgson | 2016-02-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git+ssh://github.com/matrix-org/synapse | Matthew Hodgson | 2016-02-10 | 257 | -2954/+4782 |
|\ | |||||
| * | Bump version and changelog | Erik Johnston | 2016-02-10 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0 | Erik Johnston | 2016-02-10 | 77 | -1065/+1540 |
| |\ | |||||
| | * | Batch fetch _get_state_groups_from_groups | Erik Johnston | 2016-02-10 | 1 | -32/+34 |
| | | | |||||
| | * | Use _simple_select_many for _get_state_group_for_events | Erik Johnston | 2016-02-10 | 2 | -17/+11 |
| | | | |||||
| | * | Only calculate initial sync for 10 rooms at a time | Erik Johnston | 2016-02-10 | 1 | -24/+29 |
| | | | | | | | | | | | | This helps to ensure we don't completely starve other requests. | ||||
| | * | Merge pull request #566 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-10 | 1 | -16/+13 |
| | |\ | | | | | | | | | Don't bother copying records on parent context | ||||
| | | * | Remove comment | Erik Johnston | 2016-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | s/parent_context/previous_context/ | Erik Johnston | 2016-02-10 | 1 | -9/+9 |
| | | | | |||||
| | | * | Set parent context on instansiation | Erik Johnston | 2016-02-10 | 1 | -2/+7 |
| | | | | |||||
| | | * | Don't bother copying records on parent context | Erik Johnston | 2016-02-09 | 1 | -8/+0 |
| | | | | |||||
| | * | | Merge pull request #568 from matrix-org/erikj/unread_notif | Erik Johnston | 2016-02-10 | 7 | -89/+66 |
| | |\ \ | | | | | | | | | | | Atomically persit push actions when we persist the event | ||||
| | | * | | Rename functions | Erik Johnston | 2016-02-10 | 2 | -4/+4 |
| | | | | | |||||
| | | * | | Atomically persit push actions when we persist the event | Erik Johnston | 2016-02-09 | 6 | -65/+49 |
| | | | | | |||||
| | | * | | Pass in current state to push action handler | Erik Johnston | 2016-02-09 | 3 | -27/+20 |
| | | | | | |||||
| | * | | | Merge pull request #565 from matrix-org/erikj/macaroon_config | Erik Johnston | 2016-02-09 | 2 | -16/+30 |
| | |\ \ \ | | | | | | | | | | | | | Derive macaroon_secret_key from signing key. | ||||
| | | * | | | Derive macaroon_secret_key from signing key. | Erik Johnston | 2016-02-08 | 2 | -16/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, there are people that are running synapse without a `macaroon_sercret_key` set. Mandating they set one is a good solution, except that breaking auto upgrades is annoying. | ||||
| | * | | | | Change a log from debug to info | Erik Johnston | 2016-02-09 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| | * | | | Remove dead code | Erik Johnston | 2016-02-09 | 1 | -12/+0 |
| | | | | | |||||
| | * | | | Invalidate get_last_receipt_event_id_for_user cache | Erik Johnston | 2016-02-09 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | Don't load all ephemeral state for a room on every sync | Erik Johnston | 2016-02-09 | 2 | -14/+20 |
| | | | | | |||||
| | * | | | Fix unit tests | Erik Johnston | 2016-02-09 | 2 | -5/+9 |
| | | | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-02-09 | 3 | -6/+6 |
| | |\ \ \ | |||||
| | | * | | | Revert "Reject additional path segments" | Daniel Wagner-Hall | 2016-02-09 | 3 | -6/+6 |
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d19a5ec0fff73af9cee8c21118020b31be47379. iOS Console is apparently relying on these paths. | ||||
| | * | | | Measure some /sync related things | Erik Johnston | 2016-02-09 | 2 | -150/+162 |
| | | | | | |||||
| | * | | | Revert to putting it around the entire block | Erik Johnston | 2016-02-09 | 1 | -124/+124 |
| | | | | | |||||
| | * | | | Don't create new logging context | Erik Johnston | 2016-02-09 | 1 | -12/+15 |
| | |/ / | |||||
| | * | | Fix bug in util.metrics.Measure | Erik Johnston | 2016-02-09 | 1 | -1/+3 |
| | | | | |||||
| | * | | Create new context when measuring | Erik Johnston | 2016-02-09 | 1 | -2/+5 |
| | | | | |||||
| | * | | Don't measure across event stream call, as it lasts for a long time. | Erik Johnston | 2016-02-09 | 1 | -124/+124 |
| | | | | |||||
| | * | | Change logcontext warns to debug | Erik Johnston | 2016-02-09 | 1 | -3/+3 |
| | |/ | |||||
| | * | Merge pull request #564 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-08 | 31 | -229/+356 |
| | |\ | | | | | | | | | Fix up logcontexts | ||||
| | | * | Fix up logcontexts | Erik Johnston | 2016-02-08 | 31 | -229/+356 |
| | | | | |||||
| | * | | Merge pull request #562 from matrix-org/erikj/push_metric | Erik Johnston | 2016-02-08 | 3 | -31/+149 |
| | |\| | | | | | | | | | Add metrics to pushers | ||||
| | | * | Add metrics to pushers | Erik Johnston | 2016-02-08 | 3 | -31/+149 |
| | | | | |||||
| | * | | Reject additional path segments | Daniel Wagner-Hall | 2016-02-08 | 3 | -6/+6 |
| | |/ | |||||
| | * | Allocate guest user IDs numericcally | Daniel Wagner-Hall | 2016-02-05 | 2 | -19/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current random IDs are ugly and confusing when presented in UIs. This makes them prettier and easier to read. Also, disable non-automated registration of numeric IDs so that we don't need to worry so much about people carving out our automated address space and us needing to keep retrying ID registration. | ||||
| | * | Host /media/r0 as well as /media/v1 | Daniel Wagner-Hall | 2016-02-05 | 2 | -3/+6 |
| | | | |||||
| | * | Error if macaroon key is missing from config | Daniel Wagner-Hall | 2016-02-05 | 4 | -23/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we store all access tokens in the DB, and fall back to that check if we can't validate the macaroon, so our fallback works here, but for guests, their macaroons don't get persisted, so we don't get to find them in the database. Each restart, we generate a new ephemeral key, so guests lose access after each server restart. I tried to fix up the config stuff to be less insane, but gave up, so instead I bolt on yet another piece of custom one-off insanity. Also, add some basic tests for config generation and loading. | ||||
| | * | Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null | David Baker | 2016-02-04 | 1 | -6/+17 |
| | |\ | | | | | | | | | Omit keys rather then returning null in profile API | ||||
| | | * | No braces here | David Baker | 2016-02-03 | 1 | -1/+1 |
| | | | | |||||
| | | * | Don't return null if profile display name / avatar url isn't set: omit them ↵ | David Baker | 2016-02-03 | 1 | -6/+17 |
| | | | | | | | | | | | | | | | | instead | ||||
| | * | | Actually return something sensible | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Remove old log line | Erik Johnston | 2016-02-03 | 1 | -2/+0 |
| | | | | |||||
| | * | | We return dicts now. | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add descriptions | Erik Johnston | 2016-02-03 | 4 | -1/+5 |
| | | | | |||||
| | * | | Preserve log context over when deferring to thread pool in media repo | Erik Johnston | 2016-02-03 | 1 | -4/+7 |
| | | | | |||||
| | * | | Merge pull request #555 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-03 | 3 | -16/+42 |
| | |\ \ | | | | | | | | | | | Allowing tagging log contexts | ||||
| | | * | | Allowing tagging log contexts | Erik Johnston | 2016-02-03 | 3 | -16/+42 |
| | | | | | |||||
| | * | | | Merge pull request #554 from matrix-org/erikj/event_push | Erik Johnston | 2016-02-03 | 5 | -21/+67 |
| | |\ \ \ | | | |_|/ | | |/| | | Change event_push_actions_rm_tokens schema | ||||
| | | * | | Change event_push_actions_rm_tokens schema | Erik Johnston | 2016-02-03 | 5 | -21/+67 |
| | | |/ | |||||
| | * | | Merge pull request #556 from matrix-org/daniel/config | Daniel Wagner-Hall | 2016-02-03 | 3 | -6/+6 |
| | |\ \ | | | | | | | | | | | Rename config field to reflect yaml name | ||||
| | | * | | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 3 | -6/+6 |
| | | |/ | |||||
| | * | | Simplify get_rooms | Erik Johnston | 2016-02-03 | 2 | -79/+9 |
| | | | | |||||
| | * | | PEP8 | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Remove unused method | Erik Johnston | 2016-02-03 | 1 | -8/+0 |
| | | | | |||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-02-03 | 35 | -238/+215 |
| | |\| | | | | | | | | | | | | | erikj/public_room_fix | ||||
| | | * | Log more diagnostics for unrecognised access tokens | Daniel Wagner-Hall | 2016-02-02 | 1 | -0/+2 |
| | | | | |||||
| | | * | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 33 | -66/+72 |
| | | | | |||||
| | | * | s/get_room_changes_for_user/get_membership_changes_for_user/ | Erik Johnston | 2016-02-02 | 3 | -4/+4 |
| | | | | |||||
| | | * | Fetch events in a separate transaction. | Erik Johnston | 2016-02-02 | 1 | -26/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has a couple of benefits: - It reduces the time of transactions, allowing other database requests to run. - Fetching events is given a dedicated database thread, and so can't starve other database requests. | ||||
| | | * | Merge pull request #545 from matrix-org/erikj/sync | Erik Johnston | 2016-02-02 | 2 | -141/+99 |
| | | |\ | | | | | | | | | | | Move /sync state calculations from rest to handler | ||||
| | | | * | Comments | Erik Johnston | 2016-02-01 | 1 | -5/+6 |
| | | | | | |||||
| | | | * | Move state calculations from rest to handler | Erik Johnston | 2016-02-01 | 2 | -141/+98 |
| | | | | | |||||
| | | * | | Pass make_guest whne we autogen a user ID | David Baker | 2016-02-02 | 1 | -1/+3 |
| | | | | | |||||
| | | * | | WARN if we get a topo token instead of stream. | Erik Johnston | 2016-02-02 | 1 | -1/+6 |
| | | | | | |||||
| | | * | | Merge pull request #547 from matrix-org/dbkr/fix_guest_upgrade | David Baker | 2016-02-02 | 1 | -0/+1 |
| | | |\ \ | | | | | | | | | | | | | Pull guest access token out of the auth session params | ||||
| | | | * | | Pull guest access token out of the auth session params, otherwise it will ↵ | David Baker | 2016-02-01 | 1 | -0/+1 |
| | | | |/ | | | | | | | | | | | | | | | | break if you open the email on a different device. | ||||
| | * | | | Unused import | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Change the way we do public room list fetching | Erik Johnston | 2016-02-02 | 3 | -24/+80 |
| | |/ / | |||||
| | * | | Order things correctly | Erik Johnston | 2016-02-01 | 2 | -1/+5 |
| | | | | |||||
| | * | | Switch over /events to use per room caches | Erik Johnston | 2016-02-01 | 2 | -7/+22 |
| | |/ | |||||
| | * | Merge pull request #543 from matrix-org/erikj/sync | Erik Johnston | 2016-02-01 | 3 | -0/+15 |
| | |\ | | | | | | | | | Cache get_room_changes_for_user | ||||
| | | * | Cache get_room_changes_for_user | Erik Johnston | 2016-01-29 | 3 | -0/+15 |
| | | | | |||||
| | * | | Only use room_ids if in get_room_events_stream if is_guest | Erik Johnston | 2016-02-01 | 1 | -5/+0 |
| | | | | |||||
| | * | | Don't use before_token. Its wrong. Use actual limit. | Erik Johnston | 2016-01-31 | 1 | -6/+3 |
| | |/ | |||||
| | * | Invalidate _account_data_stream_cache correctly | Erik Johnston | 2016-01-29 | 1 | -0/+4 |
| | | | |||||
| | * | If stream pos is greater then earliest known key and entity hasn't changed, ↵ | Erik Johnston | 2016-01-29 | 1 | -8/+3 |
| | | | | | | | | | | | | then entity hasn't changed | ||||
| | * | Merge pull request #540 from matrix-org/erikj/sync | Erik Johnston | 2016-01-29 | 4 | -19/+56 |
| | |\ | | | | | | | | | Prefill stream change caches | ||||
| | | * | Comment. Remove superfluous order by | Erik Johnston | 2016-01-29 | 1 | -1/+3 |
| | | | | |||||
| | | * | Don't prefill account data | Erik Johnston | 2016-01-29 | 1 | -8/+1 |
| | | | | |||||
| | | * | Actually use cache | Erik Johnston | 2016-01-29 | 1 | -7/+13 |
| | | | | |||||
| | | * | Max is not a function | Erik Johnston | 2016-01-29 | 1 | -1/+1 |
| | | | | |||||
| | | * | Convert param style | Erik Johnston | 2016-01-29 | 1 | -0/+3 |
| | | | | |||||
| | | * | Prefill stream change caches | Erik Johnston | 2016-01-29 | 4 | -19/+52 |
| | | | | |||||
| | * | | Merge pull request #541 from matrix-org/erikj/fixsomeofpush | Erik Johnston | 2016-01-29 | 1 | -9/+14 |
| | |\ \ | | | | | | | | | | | Make /events always return a newer token, if one exists | ||||
| | | * | | Deal with None limit | Erik Johnston | 2016-01-29 | 1 | -1/+5 |
| | | | | | |||||
| | | * | | Make /events always return a newer token, if one exists | Erik Johnston | 2016-01-29 | 1 | -9/+10 |
| | | |/ | |||||
| | * | | Add missing param to the log line | Mark Haines | 2016-01-29 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/develop' into markjh/3pid | Mark Haines | 2016-01-29 | 13 | -336/+557 |
| | |\| | |||||
| | * | | 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 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1 | Erik Johnston | 2016-01-29 | 28 | -702/+859 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bump AccountDataAndTagsChangeCache size | Erik Johnston | 2016-01-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Don't work out unread_notifs_for_room_id unless needed | Erik Johnston | 2016-01-29 | 1 | -11/+12 |
| | | | | |||||
| | * | | Merge pull request #536 from matrix-org/erikj/sync | Erik Johnston | 2016-01-29 | 9 | -316/+500 |
| | |\ \ | | | | | | | | | | | Make /sync "better". | ||||
| | | * | | Amalgamate tags and account data stream caches | Erik Johnston | 2016-01-28 | 2 | -12/+9 |
| | | | | | |||||
| | | * | | If the same as the earliest key, assume nothing has changed. | Erik Johnston | 2016-01-28 | 1 | -0/+5 |
| | | | | | |||||
| | | * | | Correctly update _entity_to_key | Erik Johnston | 2016-01-28 | 1 | -4/+5 |
| | | | | | |||||
| | | * | | Fix inequalities | Erik Johnston | 2016-01-28 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Don't use defer.returnValue | Erik Johnston | 2016-01-28 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Include cache hits with has_entity_changed | Erik Johnston | 2016-01-28 | 1 | -0/+4 |
| | | | | | |||||
| | | * | | Add events index | Erik Johnston | 2016-01-28 | 1 | -0/+16 |
| | | | | | |||||
| | | * | | Change name and doc has_entity_changed | Erik Johnston | 2016-01-28 | 4 | -4/+6 |
| | | | | | |||||
| | | * | | Cache tags and account data | Erik Johnston | 2016-01-28 | 7 | -102/+137 |
| | | | | | |||||
| | | * | | Ensure keys to RoomStreamChangeCache are ints | Erik Johnston | 2016-01-28 | 2 | -5/+12 |
| | | | | | |||||
| | | * | | Invalidate caches properly. Remove unused arg | Erik Johnston | 2016-01-28 | 4 | -10/+15 |
| | | | | | |||||
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-01-28 | 3 | -26/+18 |
| | | |\ \ | |||||
| | | * | | | Change load limit params | Erik Johnston | 2016-01-28 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Amalgamate incremental and full sync for user | Erik Johnston | 2016-01-28 | 1 | -40/+16 |
| | | | | | | |||||
| | | * | | | Allow paginating backwards from stream token | Erik Johnston | 2016-01-28 | 2 | -8/+23 |
| | | | | | | |||||
| | | * | | | Return correct type of token | Erik Johnston | 2016-01-28 | 1 | -3/+6 |
| | | | | | | |||||
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-01-28 | 2 | -23/+22 |
| | | |\ \ \ | |||||
| | | * | | | | No chdir | Erik Johnston | 2016-01-27 | 1 | -1/+0 |
| | | | | | | | |||||
| | | * | | | | PEP8 | Erik Johnston | 2016-01-27 | 3 | -6/+9 |
| | | | | | | | |||||
| | | * | | | | Use the same path for incremental with gap or without gap | Erik Johnston | 2016-01-27 | 3 | -212/+147 |
| | | | | | | | |||||
| | | * | | | | Add cache to room stream | Erik Johnston | 2016-01-27 | 5 | -74/+254 |
| | | | | | | | |||||
| | | * | | | | Don't turn on profiling | Erik Johnston | 2016-01-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #538 from matrix-org/erikj/fix_lru_cache | Erik Johnston | 2016-01-29 | 2 | -8/+38 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Fix LruCache. Make TreeCache track its own size. | ||||
| | | * | | | | | Directly set self.value | Erik Johnston | 2016-01-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Remove spurious self.size | Erik Johnston | 2016-01-29 | 1 | -1/+0 |
| | | | | | | | | |||||
| | | * | | | | | Correctly bookkeep the size of TreeCache | Erik Johnston | 2016-01-29 | 1 | -3/+28 |
| | | | | | | | | |||||
| | | * | | | | | Make TreeCache keep track of its own size. | Erik Johnston | 2016-01-29 | 2 | -6/+10 |
| | | | | | | | | |||||
| | | * | | | | | Reset size on clear | Erik Johnston | 2016-01-29 | 1 | -0/+2 |
| | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Fix test | Erik Johnston | 2016-01-28 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | Cache filters | Erik Johnston | 2016-01-28 | 1 | -1/+2 |
| | |/ / / / | |||||
| | * | | / | 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 |
| | | | | | |||||
| * | | | | Bump version and changelog | Erik Johnston | 2016-01-27 | 1 | -1/+1 |
| |/ / / | |||||
| * / / | 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 |
| | | | | | |