summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Add stuff pulled from the DB to the cacheErik Johnston2016-02-181-2/+4
|
* PEP8Erik Johnston2016-02-181-2/+2
|
* Prefix TS fields with _tsErik Johnston2016-02-184-43/+44
|
* Remove status_msg when going offline. Don't offline -> online if you send a ↵Erik Johnston2016-02-181-5/+15
| | | | message
* Check presence state is a valid oneErik Johnston2016-02-182-1/+6
|
* Move if statementErik Johnston2016-02-181-8/+8
|
* CommentErik Johnston2016-02-181-0/+2
|
* Remove spurious commentErik Johnston2016-02-171-1/+0
|
* Initial cutErik Johnston2016-02-1716-1136/+933
|
* Add wheeltimer implErik Johnston2016-02-172-0/+162
|
* Merge pull request #581 from Rugvip/event_idErik Johnston2016-02-171-2/+2
|\ | | | | client/v1/room: include event_id in response to state event PUT
| * client/v1/room: include event_id in response to state event PUT, in ↵Patrik Oldsberg2016-02-171-2/+2
|/ | | | | | accordance with the spec Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* Fix typo in request validation for adding push rules.Mark Haines2016-02-161-1/+1
|
* Merge pull request #578 from matrix-org/markjh/idempotent_rulesMark Haines2016-02-161-82/+86
|\ | | | | | | | | | | | | Make adding push rules idempotent Also remove the **kwargs from the add_push_rule method. Fixes https://matrix.org/jira/browse/SYN-391
| * Make adding push rules idempotentMark Haines2016-02-161-82/+86
|/ | | | | | Also remove the **kwargs from the add_push_rule method. Fixes https://matrix.org/jira/browse/SYN-391
* Merge pull request #577 from matrix-org/daniel/createroomDaniel Wagner-Hall2016-02-162-55/+31
|\ | | | | Simplify room creation code
| * Simplify room creation codeDaniel Wagner-Hall2016-02-152-55/+31
|/
* Revert "Merge two of the room join codepaths"Daniel Wagner-Hall2016-02-125-73/+69
| | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check
* Merge pull request #575 from matrix-org/daniel/roomcleanupDaniel Wagner-Hall2016-02-125-69/+73
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Merge two of the room join codepaths There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point.
| * Merge two of the room join codepathsDaniel Wagner-Hall2016-02-125-69/+73
|/ | | | | | | | | | | | | There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point.
* Merge pull request #574 from matrix-org/markjh/connection_closedMark Haines2016-02-125-11/+33
|\ | | | | Catch the exceptions thrown by twisted when you write to a closed con…
| * Catch the exceptions thrown by twisted when you write to a closed connectionMark Haines2016-02-125-11/+33
|/
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-122-1/+12
|\
| * Merge branch 'release-v0.13.3' of github.com:matrix-org/synapse v0.13.3Erik Johnston2016-02-113-2/+7
| |\
| | * Bump version and changelogErik Johnston2016-02-112-1/+6
| | |
| | * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-112-1/+7
| | |\ | | |/ | |/|
| * | Merge branch 'release-v0.13.2' of github.com:matrix-org/synapse v0.13.2Erik Johnston2016-02-115-9/+29
| |\ \
| | * | Bump version and changelogErik Johnston2016-02-112-1/+7
| | | |
* | | | Merge pull request #572 from matrix-org/daniel/exclusivityDaniel Wagner-Hall2016-02-111-5/+12
|\ \ \ \ | |_|_|/ |/| | | Enforce user_id exclusivity for AS registrations
| * | | Enforce user_id exclusivity for AS registrationsDaniel Wagner-Hall2016-02-111-5/+12
|/ / / | | | | | | | | | | | | This whole set of checks is kind of an ugly mess, which I may clean up at some point, but for now let's be correct.
* | / Fix SYN-627, events are in incorrect room in /syncErik Johnston2016-02-111-1/+1
| |/ |/|
* | Merge pull request #570 from matrix-org/erikj/events_fixesErik Johnston2016-02-112-8/+12
|\ \ | | | | | | Return events in correct order for /events
| * | Return events in correct order for /eventsErik Johnston2016-02-112-8/+12
|/ /
* | Add some paranoia loggingErik Johnston2016-02-111-0/+10
| |
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-103-2/+9
|\|
| * 0.13.1 v0.13.1Matthew Hodgson2016-02-101-1/+1
| |
| * bump for 0.13.1Matthew Hodgson2016-02-101-0/+7
| |
| * Merge branch 'master' of git+ssh://github.com/matrix-org/synapseMatthew Hodgson2016-02-10339-3968/+5722
| |\
| | * Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse v0.13.0Erik Johnston2016-02-10339-3968/+5714
| | |\ | |_|/ |/| |
* | | Update CHANGESErik Johnston2016-02-101-2/+4
| | |
* | | Bump version and changelogErik Johnston2016-02-102-1/+23
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0Erik Johnston2016-02-1091-1106/+1801
|\ \ \
| * \ \ Merge pull request #569 from matrix-org/erikj/initial_syncErik Johnston2016-02-102-72/+73
| |\ \ \ | | | | | | | | | | Improvements to initial /syncs
| | * | | Batch fetch _get_state_groups_from_groupsErik Johnston2016-02-101-32/+34
| | | | |
| | * | | Use _simple_select_many for _get_state_group_for_eventsErik Johnston2016-02-102-17/+11
| | | | |
| | * | | Only calculate initial sync for 10 rooms at a timeErik Johnston2016-02-101-24/+29
| |/ / / | | | | | | | | | | | | This helps to ensure we don't completely starve other requests.
| * | | Merge pull request #566 from matrix-org/erikj/logcontextErik Johnston2016-02-102-25/+14
| |\ \ \ | | | | | | | | | | Don't bother copying records on parent context
| | * | | Remove commentErik Johnston2016-02-101-1/+1
| | | | |
| | * | | s/parent_context/previous_context/Erik Johnston2016-02-101-9/+9
| | | | |
| | * | | Set parent context on instansiationErik Johnston2016-02-101-2/+7
| | | | |
| | * | | Fix testErik Johnston2016-02-091-9/+1
| | | | |
| | * | | Don't bother copying records on parent contextErik Johnston2016-02-091-8/+0
| | | | |
| * | | | Merge pull request #568 from matrix-org/erikj/unread_notifErik Johnston2016-02-107-89/+66
| |\ \ \ \ | | | | | | | | | | | | Atomically persit push actions when we persist the event
| | * | | | Rename functionsErik Johnston2016-02-102-4/+4
| | | | | |
| | * | | | Atomically persit push actions when we persist the eventErik Johnston2016-02-096-65/+49
| | | | | |
| | * | | | Pass in current state to push action handlerErik Johnston2016-02-093-27/+20
| | | | | |
| * | | | | Merge pull request #532 from floviolleau/floviolleau/documentationErik Johnston2016-02-102-1/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | Update documentation
| | * | | | | Update documentationFlorent VIOLLEAU2016-01-272-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Florent VIOLLEAU <floviolleau@gmail.com>
| * | | | | | Merge pull request #565 from matrix-org/erikj/macaroon_configErik Johnston2016-02-093-19/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Derive macaroon_secret_key from signing key.
| | * | | | | | TypoErik Johnston2016-02-091-1/+1
| | | | | | | |
| | * | | | | | Fix testErik Johnston2016-02-091-3/+4
| | | | | | | |
| | * | | | | | Derive macaroon_secret_key from signing key.Erik Johnston2016-02-082-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 infoErik Johnston2016-02-091-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Remove dead codeErik Johnston2016-02-091-12/+0
| | | | | | |
| * | | | | | Invalidate get_last_receipt_event_id_for_user cacheErik Johnston2016-02-091-0/+5
| | | | | | |
| * | | | | | Merge pull request #567 from matrix-org/erikj/sync_ephemeralErik Johnston2016-02-092-14/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't load all ephemeral state for a room on every sync
| | * | | | | | Don't load all ephemeral state for a room on every syncErik Johnston2016-02-092-14/+20
| |/ / / / / /
| * | | | | | Fix unit testsErik Johnston2016-02-092-5/+9
| | | | | | |
| * | | | | | Merge pull request #560 from matrix-org/daniel/toxDaniel Wagner-Hall2016-02-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove pyc files before running tests
| | * | | | | | Remove pyc files before running testsDaniel Wagner-Hall2016-02-091-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2016-02-093-6/+6
| |\ \ \ \ \ \
| | * | | | | | Revert "Reject additional path segments"Daniel Wagner-Hall2016-02-093-6/+6
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d19a5ec0fff73af9cee8c21118020b31be47379. iOS Console is apparently relying on these paths.
| * | | | | | Measure some /sync related thingsErik Johnston2016-02-092-150/+162
| | | | | | |
| * | | | | | Revert to putting it around the entire blockErik Johnston2016-02-091-124/+124
| | | | | | |
| * | | | | | Don't create new logging contextErik Johnston2016-02-091-12/+15
| |/ / / / /
| * | | | | Fix bug in util.metrics.MeasureErik Johnston2016-02-091-1/+3
| | | | | |
| * | | | | Create new context when measuringErik Johnston2016-02-091-2/+5
| | | | | |
| * | | | | Don't measure across event stream call, as it lasts for a long time.Erik Johnston2016-02-091-124/+124
| | | | | |
| * | | | | Change logcontext warns to debugErik Johnston2016-02-091-3/+3
| |/ / / /
| * | | | Merge pull request #564 from matrix-org/erikj/logcontextErik Johnston2016-02-0831-229/+356
| |\ \ \ \ | | | | | | | | | | | | Fix up logcontexts
| | * | | | Fix up logcontextsErik Johnston2016-02-0831-229/+356
| | | | | |
| * | | | | Merge pull request #562 from matrix-org/erikj/push_metricErik Johnston2016-02-083-31/+149
| |\| | | | | | | | | | | | | | | | Add metrics to pushers
| | * | | | Add metrics to pushersErik Johnston2016-02-083-31/+149
| | | | | |
| * | | | | Merge pull request #563 from matrix-org/daniel/dollarzDaniel Wagner-Hall2016-02-083-6/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | | Reject additional path segments
| | * | | | Reject additional path segmentsDaniel Wagner-Hall2016-02-083-6/+6
| |/ / / /
| * | | | Report the v1 and v2 patterns separatelyMark Haines2016-02-051-4/+12
| | | | |
| * | | | List the URL patterns in synapseMark Haines2016-02-051-0/+54
| | | | |
| * | | | Merge pull request #550 from matrix-org/daniel/guestnamesDaniel Wagner-Hall2016-02-052-19/+72
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocate guest user IDs numericcally 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.
| | * | | | Allocate guest user IDs numericcallyDaniel Wagner-Hall2016-02-052-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.
| * | | | Merge pull request #559 from matrix-org/daniel/mediaDaniel Wagner-Hall2016-02-052-3/+6
| |\ \ \ \ | | | | | | | | | | | | Host /media/r0 as well as /media/v1
| | * | | | Host /media/r0 as well as /media/v1Daniel Wagner-Hall2016-02-052-3/+6
| |/ / / /
| * | | | Merge pull request #558 from matrix-org/daniel/configDaniel Wagner-Hall2016-02-057-23/+198
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error if macaroon key is missing from config 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.
| | * | | | Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-057-23/+198
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_nullDavid Baker2016-02-041-6/+17
| |\ \ \ \ | | | | | | | | | | | | Omit keys rather then returning null in profile API
| | * | | | No braces hereDavid Baker2016-02-031-1/+1
| | | | | |
| | * | | | Don't return null if profile display name / avatar url isn't set: omit them ↵David Baker2016-02-031-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | instead
| * | | | | Actually return something sensibleErik Johnston2016-02-031-1/+1
| | | | | |
| * | | | | Remove old log lineErik Johnston2016-02-031-2/+0
| | | | | |
| * | | | | We return dicts now.Erik Johnston2016-02-031-1/+1
| | | | | |
| * | | | | Add descriptionsErik Johnston2016-02-034-1/+5
| | | | | |
| * | | | | Preserve log context over when deferring to thread pool in media repoErik Johnston2016-02-031-4/+7
| | | | | |
| * | | | | Merge pull request #555 from matrix-org/erikj/logcontextErik Johnston2016-02-033-16/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | Allowing tagging log contexts
| | * | | | | Allowing tagging log contextsErik Johnston2016-02-033-16/+42
| | | | | | |
| * | | | | | Merge pull request #554 from matrix-org/erikj/event_pushErik Johnston2016-02-035-21/+67
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Change event_push_actions_rm_tokens schema
| | * | | | | Change event_push_actions_rm_tokens schemaErik Johnston2016-02-035-21/+67
| | |/ / / /
| * | | | | Merge pull request #556 from matrix-org/daniel/configDaniel Wagner-Hall2016-02-036-10/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Rename config field to reflect yaml name
| | * | | | | Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-036-10/+10
| | | | | | |
| * | | | | | Merge pull request #552 from matrix-org/erikj/public_room_fixErik Johnston2016-02-035-136/+88
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Change the way we do public room list fetching
| | * | | | | Simplify get_roomsErik Johnston2016-02-033-105/+9
| | | | | | |
| | * | | | | PEP8Erik Johnston2016-02-031-1/+1
| | | | | | |
| | * | | | | Remove unused methodErik Johnston2016-02-031-8/+0
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-02-0336-238/+216
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | erikj/public_room_fix
| | * | | | | Unused importErik Johnston2016-02-031-1/+1
| | | | | | |
| | * | | | | Change the way we do public room list fetchingErik Johnston2016-02-023-24/+80
| | | | | | |
| * | | | | | Add macaroon inspection scriptDaniel Wagner-Hall2016-02-031-0/+24
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #553 from matrix-org/daniel/accesstokenloggingDaniel Wagner-Hall2016-02-021-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Log more diagnostics for unrecognised access tokens
| | * | | | | Log more diagnostics for unrecognised access tokensDaniel Wagner-Hall2016-02-021-0/+2
| |/ / / / /
| * | | | | Explain what W503 isDaniel Wagner-Hall2016-02-021-1/+1
| | | | | |
| * | | | | Merge pull request #551 from matrix-org/daniel/flake8Daniel Wagner-Hall2016-02-0234-66/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix flake8 warnings for new flake8
| | * | | | | Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-0234-66/+73
| |/ / / / /
| * | | | | Merge pull request #549 from matrix-org/erikj/syncErik Johnston2016-02-023-29/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | Fetch events in a separate transaction.
| | * | | | | s/get_room_changes_for_user/get_membership_changes_for_user/Erik Johnston2016-02-023-4/+4
| | | | | | |
| | * | | | | Fetch events in a separate transaction.Erik Johnston2016-02-021-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/syncErik Johnston2016-02-022-141/+99
| |\ \ \ \ \ | | | | | | | | | | | | | | Move /sync state calculations from rest to handler
| | * | | | | CommentsErik Johnston2016-02-011-5/+6
| | | | | | |
| | * | | | | Move state calculations from rest to handlerErik Johnston2016-02-012-141/+98
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-02-011-5/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-02-011-6/+3
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge pull request #548 from matrix-org/dbkr/fix_guest_db_columnDavid Baker2016-02-021-1/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Pass make_guest when we autogen a user ID
| | * | | | | | | | Pass make_guest whne we autogen a user IDDavid Baker2016-02-021-1/+3
| |/ / / / / / / /
| * | | | | | | | WARN if we get a topo token instead of stream.Erik Johnston2016-02-021-1/+6
| | | | | | | | |
| * | | | | | | | Merge pull request #547 from matrix-org/dbkr/fix_guest_upgradeDavid Baker2016-02-021-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 Baker2016-02-011-0/+1
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | break if you open the email on a different device.
| * | | | | | | Merge pull request #546 from matrix-org/erikj/eventsErik Johnston2016-02-012-7/+26
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Switch over /events to use per room caches
| | * | | | | | Order things correctlyErik Johnston2016-02-012-1/+5
| | | | | | | |
| | * | | | | | Switch over /events to use per room cachesErik Johnston2016-02-012-7/+22
| |/ / / / / /
| * | | | | | Merge pull request #543 from matrix-org/erikj/syncErik Johnston2016-02-013-0/+15
| |\| | | | | | | | | | | | | | | | | | | Cache get_room_changes_for_user
| | * | | | | Cache get_room_changes_for_userErik Johnston2016-01-293-0/+15
| | | | | | |
| * | | | | | Merge pull request #544 from matrix-org/erikj/stream_roomsErik Johnston2016-02-011-5/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Only use room_ids if in get_room_events_stream if is_guest
| | * | | | | Only use room_ids if in get_room_events_stream if is_guestErik Johnston2016-02-011-5/+0
| |/ / / / /
| * | | | | Don't use before_token. Its wrong. Use actual limit.Erik Johnston2016-01-311-6/+3
| | | | | |
| * | | | | Merge pull request #542 from matrix-org/erikj/cache_fixErik Johnston2016-01-292-8/+7
| |\| | | | | | | | | | | | | | | | Cache fixes
| | * | | | Invalidate _account_data_stream_cache correctlyErik Johnston2016-01-291-0/+4
| | | | | |
| | * | | | If stream pos is greater then earliest known key and entity hasn't changed, ↵Erik Johnston2016-01-291-8/+3
| |/ / / / | | | | | | | | | | | | | | | then entity hasn't changed
| * | | | Merge pull request #540 from matrix-org/erikj/syncErik Johnston2016-01-294-19/+56
| |\ \ \ \ | | | | | | | | | | | | Prefill stream change caches
| | * | | | Comment. Remove superfluous order byErik Johnston2016-01-291-1/+3
| | | | | |
| | * | | | Don't prefill account dataErik Johnston2016-01-291-8/+1
| | | | | |
| | * | | | Actually use cacheErik Johnston2016-01-291-7/+13
| | | | | |
| | * | | | Max is not a functionErik Johnston2016-01-291-1/+1
| | | | | |
| | * | | | Convert param styleErik Johnston2016-01-291-0/+3
| | | | | |
| | * | | | Prefill stream change cachesErik Johnston2016-01-294-19/+52
| | | | | |
| * | | | | Merge pull request #541 from matrix-org/erikj/fixsomeofpushErik Johnston2016-01-291-9/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | Make /events always return a newer token, if one exists
| | * | | | | Deal with None limitErik Johnston2016-01-291-1/+5
| | | | | | |
| | * | | | | Make /events always return a newer token, if one existsErik Johnston2016-01-291-9/+10
| | |/ / / /
| * | | | | Merge pull request #539 from matrix-org/markjh/3pidMark Haines2016-01-294-10/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix up the /account/3pid API
| | * | | | Add missing param to the log lineMark Haines2016-01-291-1/+2
| | | | | |
| | * | | | Fix the mock homserver used in the testsMark Haines2016-01-291-0/+1
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/develop' into markjh/3pidMark Haines2016-01-2917-347/+581
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add config option for setting the trusted id servers, disabling checking the ↵Mark Haines2016-01-292-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | ID server in integration tests
| | * | | | Allow three_pid_creds as well as threePidCreds in /account/3pidMark Haines2016-01-291-2/+3
| | | | | |
* | | | | | Update CHANGES v0.12.1-rc1Erik Johnston2016-01-291-4/+4
| | | | | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1Erik Johnston2016-01-2940-1031/+936
|\| | | | |
| * | | | | Bump AccountDataAndTagsChangeCache sizeErik Johnston2016-01-291-1/+1
| | | | | |
| * | | | | Don't work out unread_notifs_for_room_id unless neededErik Johnston2016-01-291-11/+12
| | | | | |
| * | | | | Merge pull request #536 from matrix-org/erikj/syncErik Johnston2016-01-2910-324/+501
| |\ \ \ \ \ | | | | | | | | | | | | | | Make /sync "better".
| | * | | | | Amalgamate tags and account data stream cachesErik Johnston2016-01-282-12/+9
| | | | | | |
| | * | | | | If the same as the earliest key, assume nothing has changed.Erik Johnston2016-01-281-0/+5
| | | | | | |
| | * | | | | Correctly update _entity_to_keyErik Johnston2016-01-281-4/+5
| | | | | | |
| | * | | | | Fix inequalitiesErik Johnston2016-01-281-2/+2
| | | | | | |
| | * | | | | Don't use defer.returnValueErik Johnston2016-01-281-1/+1
| | | | | | |
| | * | | | | Include cache hits with has_entity_changedErik Johnston2016-01-281-0/+4
| | | | | | |
| | * | | | | Add events indexErik Johnston2016-01-281-0/+16
| | | | | | |
| | * | | | | Change name and doc has_entity_changedErik Johnston2016-01-284-4/+6
| | | | | | |
| | * | | | | Cache tags and account dataErik Johnston2016-01-287-102/+137
| | | | | | |
| | * | | | | Ensure keys to RoomStreamChangeCache are intsErik Johnston2016-01-282-5/+12
| | | | | | |
| | * | | | | Invalidate caches properly. Remove unused argErik Johnston2016-01-284-10/+15
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-284-28/+20
| | |\ \ \ \ \
| | * | | | | | Change load limit paramsErik Johnston2016-01-281-2/+2
| | | | | | | |
| | * | | | | | Amalgamate incremental and full sync for userErik Johnston2016-01-281-40/+16
| | | | | | | |
| | * | | | | | Allow paginating backwards from stream tokenErik Johnston2016-01-283-16/+24
| | | | | | | |
| | * | | | | | Return correct type of tokenErik Johnston2016-01-281-3/+6
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-283-25/+36
| | |\ \ \ \ \ \
| | * | | | | | | No chdirErik Johnston2016-01-271-1/+0
| | | | | | | | |
| | * | | | | | | PEP8Erik Johnston2016-01-273-6/+9
| | | | | | | | |
| | * | | | | | | Use the same path for incremental with gap or without gapErik Johnston2016-01-273-212/+147
| | | | | | | | |
| | * | | | | | | Add cache to room streamErik Johnston2016-01-275-74/+254
| | | | | | | | |
| | * | | | | | | Don't turn on profilingErik Johnston2016-01-271-1/+1
| | | | | | | | |
| * | | | | | | | Merge pull request #538 from matrix-org/erikj/fix_lru_cacheErik Johnston2016-01-294-8/+57
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix LruCache. Make TreeCache track its own size.
| | * | | | | | | | Add testsErik Johnston2016-01-292-0/+19
| | | | | | | | | |
| | * | | | | | | | Directly set self.valueErik Johnston2016-01-291-1/+1
| | | | | | | | | |
| | * | | | | | | | Remove spurious self.sizeErik Johnston2016-01-291-1/+0
| | | | | | | | | |
| | * | | | | | | | Correctly bookkeep the size of TreeCacheErik Johnston2016-01-291-3/+28
| | | | | | | | | |
| | * | | | | | | | Make TreeCache keep track of its own size.Erik Johnston2016-01-292-6/+10
| | | | | | | | | |
| | * | | | | | | | Reset size on clearErik Johnston2016-01-291-0/+2
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #537 from matrix-org/erikj/cache_filtersErik Johnston2016-01-283-4/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Cache user filters.
| | * | | | | | | Fix testErik Johnston2016-01-282-3/+9
| | | | | | | | |
| | * | | | | | | Cache filtersErik Johnston2016-01-281-1/+2
| |/ / / / / / /
| * | | | | | | Prune on fetchingDaniel Wagner-Hall2016-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we don't try to checkout a stale ref
| * | | | | | | Pin pynacl to 0.3.0Daniel Wagner-Hall2016-01-281-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/setupErik Johnston2016-01-2812-120/+123
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add a Homeserver.setup method
| | * | | | | | Clean up a bit. Add commentErik Johnston2016-01-283-26/+18
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-271-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix testsErik Johnston2016-01-273-5/+12
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-274-9/+27
| | |\ \ \ \ \ \
| | * | | | | | | PEP 8Erik Johnston2016-01-271-1/+0
| | | | | | | | |
| | * | | | | | | Add a Homeserver.setup method.Erik Johnston2016-01-269-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.
| * | | | | | | | Quot all the thingsDaniel Wagner-Hall2016-01-281-2/+2
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Up get_rooms_for_user cache sizeErik Johnston2016-01-281-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #535 from matrix-org/rav/paginate_from_stream_tokenRichard van der Hoff2016-01-282-24/+35
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make it possible to paginate forwards from stream tokens
| | * | | | | | | Make it possible to paginate forwards from stream tokensRichard van der Hoff2016-01-272-24/+35
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order that we can fill the gap after a /sync, make it possible to paginate forwards from a stream token.
| * | | | | | | Remove chdirErik Johnston2016-01-281-1/+0
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #530 from matrix-org/erikj/server_refactorErik Johnston2016-01-2712-544/+190
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Remove redundant BaseHomeServer
| | * | | | | Don't turn on profilingErik Johnston2016-01-261-1/+1
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-01-262-2/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / erikj/server_refactor
| | * | | | Remove redundated BaseHomeServerErik Johnston2016-01-2612-545/+191
| | | | | |
| * | | | | Merge pull request #533 from matrix-org/rav/hashtest_federationRichard van der Hoff2016-01-271-1/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix federation for #test:matrix.org
| | * | | | | Federation: drop events which cause SynapseErrorsRichard van der Hoff2016-01-271-1/+7
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | ... rather than rejecting any attempt to federate channels which contain such events.
| * | | | | Merge pull request #531 from matrix-org/markjh/relative_push_rulesMark Haines2016-01-272-6/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix adding push rules relative to other rules
| | * | | | Fix adding push rules relative to other rulesMark Haines2016-01-272-6/+12
| | | | | |
* | | | | | Bump version and changelogErik Johnston2016-01-272-1/+46
|/ / / / /
* | | | | Merge pull request #529 from matrix-org/dbkr/one_to_one_only_messagesDavid Baker2016-01-261-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | Only notify for messages in one to one rooms, not every event
| * | | | Only notify for messages in one to one rooms, not every eventDavid Baker2016-01-261-0/+6
|/ / / / | | | | | | | | | | | | Fixes the fact that candidate events and hangups generated notifications.
* | | | Merge pull request #528 from matrix-org/markjh/missing_yieldMark Haines2016-01-251-2/+2
|\ \ \ \ | |/ / / |/| | | Add missing yield in push_rules set enabled
| * | | Add missing yield in push_rules set enabledMark Haines2016-01-251-2/+2
| | | |
* | | | Merge pull request #524 from matrix-org/erikj/syncErik Johnston2016-01-254-93/+178
|\ \ \ \ | | | | | | | | | | Move some sync logic from rest to handlers pacakege
| * | | | PEP8Erik Johnston2016-01-251-1/+0
| | | | |
| * | | | Remove weird stuffErik Johnston2016-01-251-6/+0
| | | | |
| * | | | Fix testsErik Johnston2016-01-252-7/+5
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-251-3/+7
| |\| | |
| * | | | Move logic from rest/ to handlers/Erik Johnston2016-01-253-87/+181
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-228-19/+275
| |\ \ \ \
* | \ \ \ \ Merge pull request #525 from matrix-org/erikj/select_manyErik Johnston2016-01-253-60/+110
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement a `_simple_select_many_batch`
| * | | | | | Guard against empty iterablesErik Johnston2016-01-251-0/+6
| | | | | | |
| * | | | | | Correct docstringErik Johnston2016-01-251-1/+0
| | | | | | |
| * | | | | | Implement a _simple_select_many_batchErik Johnston2016-01-253-60/+105
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #527 from matrix-org/erikj/push_cacheErik Johnston2016-01-252-17/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Push: Use storage apis that are cached
| * | | | | | Push: Use storage apis that are cachedErik Johnston2016-01-252-17/+14
| |/ / / / /
* | | | | | Merge pull request #526 from matrix-org/erikj/push_indexErik Johnston2016-01-251-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add index to event_push_actions
| * | | | | | Add index to event_push_actionsErik Johnston2016-01-251-0/+1
| |/ / / / /
* | | | | | Merge pull request #521 from matrix-org/erikj/underscoresErik Johnston2016-01-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Underscores are allowed in user ids
| * | | | | Underscores are allowed in user idsErik Johnston2016-01-221-1/+1
| | | | | |
* | | | | | Merge branch 'erikj/filters' of github.com:matrix-org/synapse into developErik Johnston2016-01-254-35/+41
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix testsErik Johnston2016-01-221-1/+1
| | | | | |
| * | | | | Sanitize filtersErik Johnston2016-01-223-34/+40
| | | | | |
* | | | | | Merge pull request #523 from matrix-org/dbkr/no_push_unless_notifyDavid Baker2016-01-221-9/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Better fix for actions with both dont_notify and tweaks
| * | | | | | Better fix for actions with both dont_notify and tweaksDavid Baker2016-01-221-1/+1
| | | | | | |
| * | | | | | Revert b4a41aa542203c03bb8a6c93097b94bc5d167265 as it's just broken.David Baker2016-01-221-9/+1
| | | | | | |
* | | | | | | Merge pull request #522 from matrix-org/dbkr/no_push_unless_notifyDavid Baker2016-01-221-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' actionDavid Baker2016-01-221-1/+9
| | |_|/ / / | |/| | | |
* / | | | | Don't mutate cached valuesErik Johnston2016-01-221-2/+6
|/ / / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-07 08:44:20 +0000