summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #504 from matrix-org/erikj/highlight_countErik Johnston2016-01-193-8/+40
|\ | | | | Return highlight_count in /sync
| * Return highlight_count in /syncErik Johnston2016-01-193-8/+40
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into default_notifyErik Johnston2016-01-1924-647/+851
|\|
| * Merge pull request #502 from matrix-org/erikj/push_notif_perfErik Johnston2016-01-1911-395/+550
| |\ | | | | | | Unread notification performance.
| | * Take a deepcopy of push rules before mutating themErik Johnston2016-01-191-1/+3
| | |
| | * Update _idErik Johnston2016-01-191-2/+3
| | |
| | * Preserve truthinessErik Johnston2016-01-181-1/+2
| | |
| | * You need to escape backslashesErik Johnston2016-01-181-2/+2
| | |
| | * Fix branch didn't check word_boundaryErik Johnston2016-01-181-3/+9
| | |
| | * Remove dead codeErik Johnston2016-01-181-22/+1
| | |
| | * Don't split at word boundaries, actually use regexErik Johnston2016-01-182-63/+48
| | |
| | * Drop log levelsErik Johnston2016-01-181-2/+2
| | |
| | * Add comments and remove dead codeErik Johnston2016-01-181-12/+11
| | |
| | * Do for loop once at startErik Johnston2016-01-181-8/+17
| | |
| | * Use static for const dictsErik Johnston2016-01-184-198/+209
| | |
| | * Remove internal idsErik Johnston2016-01-181-0/+4
| | |
| | * Don't edit rulesetErik Johnston2016-01-181-5/+4
| | |
| | * Make unit tests workErik Johnston2016-01-181-1/+1
| | |
| | * Re-enable urnead notificationsErik Johnston2016-01-183-13/+6
| | |
| | * Make notifications go quickerErik Johnston2016-01-184-131/+260
| | |
| | * Make Event objects behave more like dictsErik Johnston2016-01-181-0/+9
| | |
| | * Allow filtering events for multiple users at onceErik Johnston2016-01-182-39/+67
| | |
| * | Don't error on AS non-ghost user useDaniel Wagner-Hall2016-01-181-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 lookupDaniel Wagner-Hall2016-01-181-31/+28
| |/ | | | | | | I find this a lot simpler than nested try-catches and stuff
| * Require unbanning before other membership changesDaniel Wagner-Hall2016-01-155-55/+113
| |
| * Remove unused parametersDaniel Wagner-Hall2016-01-152-16/+8
| |
| * M_INVALID_USERNAME to be consistent with the parameter nameDavid Baker2016-01-152-2/+2
| |
| * Add specific error code for invalid user names.David Baker2016-01-142-1/+3
| |
| * Merge pull request #497 from matrix-org/erikj/max_limitErik Johnston2016-01-141-2/+5
| |\ | | | | | | Clamp pagination limits to at most 1000
| | * Clamp pagination limits to at most 1000Erik Johnston2016-01-141-2/+5
| | |
| * | Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-142-12/+29
| |\ \
| | * | Add 'event' result to 'context' endpointRichard van der Hoff2016-01-132-12/+29
| | | | | | | | | | | | | | | | ... because the context isn't much use without the event.
| | * | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-135-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 ASsDaniel Wagner-Hall2016-01-141-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_fixDavid Baker2016-01-141-1/+1
| |\ \ \ | | | | | | | | | | Fix enabling & disabling push rules
| | * | | Fix enabling & disabling push rulesDavid Baker2016-01-141-1/+1
| | | |/ | | |/|
| * | | Merge pull request #487 from matrix-org/daniel/forceregistrationDaniel Wagner-Hall2016-01-141-0/+5
| |\ \ \ | | | | | | | | | | Require AS users to be registered before use
| | * | | Require AS users to be registered before useDaniel Wagner-Hall2016-01-131-0/+5
| | | | |
| * | | | Merge pull request #494 from matrix-org/daniel/2Daniel Wagner-Hall2016-01-141-0/+1
| |\ \ \ \ | | | | | | | | | | | | Don't start server if ASes are invalidly configured
| | * | | | Don't start server if ASes are invalidly configuredDaniel Wagner-Hall2016-01-131-0/+1
| | |/ / /
| * | | | Merge pull request #493 from matrix-org/daniel/1Daniel Wagner-Hall2016-01-141-59/+0
| |\ \ \ \ | | |_|/ / | |/| | | Delete unused code
| | * | | Delete unused codeDaniel Wagner-Hall2016-01-131-59/+0
| | |/ /
| * | | Use logger not loggingErik Johnston2016-01-141-2/+2
| | | |
| * | | Don't change signature. Return empty listErik Johnston2016-01-131-2/+2
| | | |
| * | | Temporarily disable notification branchErik Johnston2016-01-133-7/+14
| | | |
| * | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵Mark Haines2016-01-139-99/+99
| |/ / | | | | | | | | | of the code
* / / Change default pushrules back to notifying for all messages.David Baker2016-01-131-1/+0
|/ /
* | Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into ↵Mark Haines2016-01-133-26/+13
|\ \ | | | | | | | | | | | | | | | | | | markjh/table_name Conflicts: synapse/storage/push_rule.py
| * | bulk_get_push_rules should handle empty listsErik Johnston2016-01-131-21/+13
| | |
| * | Merge pull request #480 from matrix-org/erikj/guest_event_tightloopErik Johnston2016-01-131-7/+0
| |\ \ | | | | | | | | Dont fire user_joined_room when guest hits /events
| | * | Dont fire user_joined_room when guest hits /eventsErik Johnston2016-01-121-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 roomsErik Johnston2016-01-121-1/+5
| |/ /
* | | Delete the table objects from TransactionStoreMark Haines2016-01-131-58/+10
| | |
* | | Remove the RoomsTable objectMark Haines2016-01-131-13/+3
| | |
* | | Remove the PushersTable and EventPushActionsTable objectsMark Haines2016-01-122-14/+6
| | |
* | | Remove the PushRuleTable and PushRuleEnableTable objectsMark Haines2016-01-121-50/+33
|/ /
* | Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-1121-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 objectDaniel Wagner-Hall2016-01-1121-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 booleansDavid Baker2016-01-111-2/+2
| | |
* | | Remove rogue 'admin'David Baker2016-01-111-1/+1
| | |
* | | Merge pull request #474 from matrix-org/erikj/core_dumpErik Johnston2016-01-081-2/+5
|\ \ \ | | | | | | | | Turn on core dumps
| * | | Turn on core dumpsErik Johnston2016-01-071-2/+5
| |/ /
* | | Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-0816-35/+515
|\ \ \ | | | | | | | | Send unread notification counts
| * | | This comma is actually importantDavid Baker2016-01-071-1/+1
| | | |
| * | | more commasDavid Baker2016-01-071-1/+1
| | | |
| * | | comma styleDavid Baker2016-01-061-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-066-142/+60
| |\ \ \
| * | | | Adding is_guest here won't work because it just constructs a dict of uid -> ↵David Baker2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | password hash
| * | | | Delete notifications for redacted eventsDavid Baker2016-01-062-0/+19
| | | | |
| * | | | Add schema change file for is_guest flagDavid Baker2016-01-061-0/+22
| | | | |
| * | | | Add is_guest flag to users db to track whether a user is a guest user or ↵David Baker2016-01-069-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_actionsDavid Baker2016-01-0514-58/+120
| |\ \ \ \
| * | | | | comment typoDavid Baker2016-01-051-1/+1
| | | | | |
| * | | | | = not == in sqlDavid Baker2016-01-041-1/+1
| | | | | |
| * | | | | Only joined rooms have unread_notif_countDavid Baker2016-01-041-1/+1
| | | | | |
| * | | | | commaDavid Baker2016-01-041-1/+1
| | | | | |
| * | | | | Add unread_notif_count in incremental_sync_with_gapDavid Baker2016-01-041-0/+8
| | | | | |
| * | | | | Rename event-actions to event_push_actions as per PR requestDavid Baker2016-01-046-17/+17
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-045-4/+120
| |\ \ \ \ \
| * | | | | | Address minor PR issuesDavid Baker2016-01-047-25/+12
| | | | | | |
| * | | | | | Fix merge fail with anon access stuffDavid Baker2015-12-221-2/+2
| | | | | | |
| * | | | | | pep8 & unused variableDavid Baker2015-12-223-4/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-225-81/+200
| |\ \ \ \ \ \
| * | | | | | | Add some comments to areas that could be optimised.David Baker2015-12-223-1/+14
| | | | | | | |
| * | | | | | | Insert push actions in a single db query rather than one per user/profile_tagDavid Baker2015-12-222-17/+24
| | | | | | | |
| * | | | | | | Add bulk push rule evaluator which actually still evaluates rules one by ↵David Baker2015-12-224-22/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one, but does far fewer db queries to fetch the rules
| * | | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-2115-69/+253
| |\ \ \ \ \ \ \
| * | | | | | | | Only run pushers for users on this hs!David Baker2015-12-213-3/+9
| | | | | | | | |
| * | | | | | | | pep8David Baker2015-12-212-9/+9
| | | | | | | | |
| * | | | | | | | Make unread notification count sending work: put the correct count in ↵David Baker2015-12-182-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 Baker2015-12-165-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 Baker2015-12-103-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 dbDavid Baker2015-12-104-2/+72
| | | | | | | | |
| * | | | | | | | Having consulted The Erikle, this should go at the end of on_receive_pdu, ↵David Baker2015-12-101-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 Baker2015-12-104-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store them yet. Not very efficient.
* | | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail.Mark Haines2016-01-071-1/+1
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Even though ones cropped with scale might be technically valid.
* | | | | | | | Use logger not loggingErik Johnston2016-01-071-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #473 from matrix-org/erikj/ssh_manholeErik Johnston2016-01-072-6/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change manhole to use ssh
| * | | | | | | | s/telnet/ssh/Erik Johnston2016-01-071-1/+1
| | | | | | | | |
| * | | | | | | | Change manhole to use sshErik Johnston2016-01-071-5/+21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | copyrightsMatthew Hodgson2016-01-07231-231/+231
| | | | | | | |
* | | | | | | | Merge pull request #472 from roblabla/patch-1Matthew Hodgson2016-01-061-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Config Comment mixup in captcha public/private key
| * | | | | | | | Config Comment mixup in captcha public/private keyRobin Lambertz2016-01-061-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Add /_matrix/versions to report supported versionsDaniel Wagner-Hall2016-01-063-0/+43
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Pass whether the user was a guest to some of the event streamsMark Haines2016-01-061-5/+3
| | | | | | |
* | | | | | | Guest users must be joined to a room to see it in /syncMark Haines2016-01-064-137/+50
| | | | | | |
* | | | | | | Log when starting stats reportingDaniel Wagner-Hall2016-01-061-0/+1
| | | | | | |
* | | | | | | Log on stats schedulingDaniel Wagner-Hall2016-01-061-0/+1
| | | | | | |
* | | | | | | Log when we skip daily messagesDaniel Wagner-Hall2016-01-061-1/+10
| |/ / / / / |/| | | | |
* | | | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-055-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 accountsDaniel Wagner-Hall2016-01-0510-31/+84
| | | | | |
* | | | | | Use larger thumbnail rather than smaller.Erik Johnston2016-01-051-4/+13
| | | | | |
* | | | | | Return /sync when something under the 'leave' key has changedErik Johnston2016-01-051-1/+1
| | | | | |
* | | | | | Use named argsErik Johnston2016-01-051-2/+2
| | | | | |
* | | | | | Support inviting 3pids in /createRoomErik Johnston2016-01-051-0/+16
|/ / / / /
* | | | / Bump changelog and version for v0.12.0Mark Haines2016-01-041-1/+1
| |_|_|/ |/| | |
* | | | Expose /login under r0Richard van der Hoff2016-01-021-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-rc3Mark Haines2015-12-231-1/+1
| | | |
* | | | Merge pull request #457 from matrix-org/markjh/cached_syncMark Haines2015-12-232-1/+117
|\ \ \ \ | | | | | | | | | | Add a cache for initialSync responses that expires after 5 minutes
| * | | | Add some docstring explaining the snapshot cache doesMark Haines2015-12-231-1/+23
| | | | |
| * | | | Add a unit test for the snapshot cacheMark Haines2015-12-231-2/+2
| | | | |
| * | | | Move the doc string to the public facing methodMark Haines2015-12-221-16/+17
| | | | |
| * | | | Add a cache for initialSync responses that expires after 5 minutesMark Haines2015-12-222-1/+94
| | |_|/ | |/| |
* / | | Missing yield on guest access auth checkMark Haines2015-12-231-1/+1
|/ / / | | | | | | | | | Needs matrix-org/sytest#125 to land first
* | | Include the list of bad room ids in the errorMark Haines2015-12-222-2/+24
| | |
* | | Use a list comprehensionMark Haines2015-12-221-3/+4
| | |
* | | Merge remote-tracking branch 'origin/develop' into markjh/guest_accessMark Haines2015-12-221-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: synapse/api/filtering.py
| * | | Add top level filters for filtering by room idMark Haines2015-12-221-33/+35
| | | | | | | | | | | | | | | | Documented by matrix-org/matrix-doc#246
* | | | Hook up read receipts and typing notifications for guest accessMark Haines2015-12-221-13/+11
| | | |
* | | | Merge branch 'develop' into markjh/guest_accessMark Haines2015-12-221-2/+21
|\| | |
| * | | Return room avatar URLs in /publicRoomsDaniel Wagner-Hall2015-12-211-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 /syncMark Haines2015-12-221-46/+98
| | |
* | | Allow guest access if the user provides a list of rooms in the filterMark Haines2015-12-223-1/+22
| | |
* | | Add top level filtering by room idMark Haines2015-12-211-33/+30
|/ /
* | Remove accidentally committed debug loggingMark Haines2015-12-211-1/+0
| |
* | Actually look up required remote server key IDsPaul "LeoNerd" Evans2015-12-181-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-identiconsMatthew Hodgson2015-12-181-19/+3
|\ \ | | | | | | Matthew/no identicons
| * | fix indentation levelMatthew Hodgson2015-12-171-3/+3
| | |
| * | stop generating default identicons. reverts most of ↵Matthew Hodgson2015-12-171-19/+3
| | | | | | | | | | | | 582019f870adbc4a8a8a9ef97b527e0fead77761 and solves vector-web/vector-im#346
* | | Merge branch 'release-v0.12.0' into developDavid Baker2015-12-181-1/+1
|\ \ \
| * | | Fix typo that broke registration on the mobile clientsDavid Baker2015-12-181-1/+1
| | | |
* | | | Add display_name to 3pid invite in m.room.member invitesDaniel Wagner-Hall2015-12-171-1/+31
| |/ / |/| |
* | | Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-172-2/+13
|/ / | | | | | | We're not meant to leak that into the graph
* | Fix 500 error when back-paginating search resultsRichard van der Hoff2015-12-171-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 typoDaniel Wagner-Hall2015-12-161-1/+1
| |
* | Give the IS a bunch more 3pid invite contextDaniel Wagner-Hall2015-12-161-7/+60
| | | | | | | | This allows it to form richer emails
* | Merge pull request #440 from matrix-org/daniel/iseMark Haines2015-12-161-2/+5
|\ \ | | | | | | Include errcode on Internal Server Error
| * | Include errcode on Internal Server ErrorDaniel Wagner-Hall2015-12-141-2/+5
| | |
* | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-163-5/+10
|\ \ \
| * | | Allow users to change which account a 3pid is bound toMark Haines2015-12-151-1/+1
| | | |
| * | | Changelog and version bump for v0.12.0-rc2 v0.12.0-rc2Mark Haines2015-12-141-1/+1
| | | |
| * | | Fix a race between started/stopped streamMark Haines2015-12-141-3/+8
| | | |
* | | | Fix spacingMark Haines2015-12-141-1/+1
| | | |
* | | | Fix logging to lie lessMark Haines2015-12-141-2/+9
| | | |
* | | | Add commentary for fix in PR#442Mark Haines2015-12-141-0/+6
| | | |
* | | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-143-7/+23
|\| | |
| * | | Merge pull request #441 from matrix-org/markjh/fts_skip_invalidMark Haines2015-12-141-0/+5
| |\ \ \ | | | | | | | | | | Skip events that where the body, name or topic isn't a string
| | * | | Skip events that where the body, name or topic isn't a string when back ↵Mark Haines2015-12-141-0/+5
| | | | | | | | | | | | | | | | | | | | populating the FTS index
| * | | | Combine the prev content testsMark Haines2015-12-141-14/+12
| | | | |
| * | | | Check whether prev_content or prev_sender is set before trying to rollback stateMark Haines2015-12-141-8/+13
| | | | |
| * | | | Do the /sync in parallel accross the rooms like /initialSync doesMark Haines2015-12-111-4/+12
| |/ / /
* | / / Fix typoDaniel Wagner-Hall2015-12-141-1/+1
| |/ / |/| |
* | | Fix typo in sql for full text search on sqlite3Mark Haines2015-12-141-1/+1
| | |
* | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-124-7/+10
|\| |
| * | Missing yieldMark Haines2015-12-101-1/+1
| | |
| * | Add caches for whether a room has been forgotten by a userMark Haines2015-12-102-5/+8
| | |
| * | Mark the version as a -rc1 release candidate v0.12.0-rc1Mark Haines2015-12-101-1/+1
| | |
| * | Bump synapse version to v0.12.0Mark Haines2015-12-091-1/+1
| |/
* | Merge pull request #435 from matrix-org/erikj/searchErik Johnston2015-12-112-9/+72
|\ \ | | | | | | Include approximate count of search results
| * | Include approximate count of search resultsErik Johnston2015-12-112-3/+61
| | |
| * | Use more efficient query formErik Johnston2015-12-111-8/+13
| |/
* / Ensure that the event that gets persisted is the one that was signedPaul "LeoNerd" Evans2015-12-101-6/+6
|/
* pep8David Baker2015-12-091-4/+4
|
* Split out the push rule evaluator into a separate file so it can be more ↵David Baker2015-12-092-185/+234
| | | | readily reused. Should be functionally identical.
* Allow filter JSON object in the filter query parameter in /syncMark Haines2015-12-091-9/+21
| | | | Documented by matrix-org/matrix-doc#224
* Merge pull request #430 from matrix-org/daniel/unstableDaniel Wagner-Hall2015-12-095-85/+80
|\ | | | | Merge pull request #430 from matrix-org/daniel/unstable
| * Actually host r0 and unstable prefixesDaniel Wagner-Hall2015-12-085-85/+80
| |
* | Merge pull request #405 from matrix-org/erikj/search-tsErik Johnston2015-12-081-6/+4
|\ \ | |/ |/| Change the result dict to be a list in /search response
| * Change the result tict to be a listErik Johnston2015-12-011-6/+4
| |
* | Track the time spent in the database per request.Mark Haines2015-12-075-4/+38
| | | | | | | | and track the number of transactions that request started.
* | Merge pull request #423 from matrix-org/markjh/archived_flagMark Haines2015-12-072-6/+10
|\ \ | | | | | | Only include the archived rooms if a include_leave flag in set in the…
| * | Only include the archived rooms if a include_leave flag in set in the filterMark Haines2015-12-042-6/+10
| | |
* | | Merge remote-tracking branch 'origin/master' into developMark Haines2015-12-071-1/+1
|\ \ \
| * \ \ Merge branch 'erikj/perspective_limiter' into release-v0.11.1Erik Johnston2015-11-202-22/+21
| |\ \ \
| * | | | Bump changes and versionErik Johnston2015-11-201-1/+1
| | | | |
* | | | | also do more structured loggingDavid Baker2015-12-071-0/+1
| | | | |
* | | | | pep8David Baker2015-12-071-0/+1
| | | | |
* | | | | Add logging to pushers API to log the body of the requestDavid Baker2015-12-071-0/+4
| | | | |
* | | | | Merge pull request #427 from matrix-org/markjh/log_contextMark Haines2015-12-071-16/+24
|\ \ \ \ \ | | | | | | | | | | | | Add a setter for the current log context.
| * | | | | Add a setter for the current log context.Mark Haines2015-12-071-16/+24
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Move the resource tracking inside that setter so that it is easier to make sure that the resource tracking isn't double counting the resource usage.
* | | | | Take object not boolDaniel Wagner-Hall2015-12-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212
* | | | | Merge pull request #422 from matrix-org/markjh/schemaMark Haines2015-12-045-24/+37
|\ \ \ \ \ | | | | | | | | | | | | Bump schema version.
| * | | | | Bump schema version.Mark Haines2015-12-045-24/+37
| |/ / / / | | | | | | | | | | | | | | | As we released version 26 in v0.11.1
* / / / / Add metrics to track the cpu on the main thread consumed by each type of requestMark Haines2015-12-041-0/+17
|/ / / /
* | | | Merge pull request #420 from matrix-org/markjh/resource_usageMark Haines2015-12-044-11/+91
|\ \ \ \ | | | | | | | | | | Track the cpu used in the main thread by each logging context
| * | | | Add comments to explain why we are hardcoding RUSAGE_THREADMark Haines2015-12-041-0/+8
| | | | |
| * | | | Fix warningsMark Haines2015-12-042-3/+13
| | | | |
| * | | | Track the cpu used in the main thread by each logging contextMark Haines2015-12-033-10/+72
| | | | |
* | | | | Merge pull request #419 from matrix-org/markjh/reuse_captcha_clientMark Haines2015-12-031-4/+2
|\ \ \ \ \ | | | | | | | | | | | | Reuse the captcha client rather than creating a new one for each request
| * | | | | Reuse the captcha client rather than creating a new one for each requestMark Haines2015-12-031-4/+2
| |/ / / /
* / / / / Flatten devices into a dict, not a listDaniel Wagner-Hall2015-12-031-4/+3
|/ / / /
* | | | Merge pull request #414 from matrix-org/erikj/if_not_existsErik Johnston2015-12-031-1/+1
|\ \ \ \ | | | | | | | | | | Older versions of SQLite don't like IF NOT EXISTS in virtual tables
| * | | | Older versions of SQLite don't like IF NOT EXISTS in virtual tablesErik Johnston2015-12-021-1/+1
| | | | |
* | | | | Merge pull request #415 from matrix-org/daniel/endpointsDaniel Wagner-Hall2015-12-036-35/+11
|\ \ \ \ \ | | | | | | | | | | | | Merge pull request #415 from matrix-org/daniel/endpoints
| * | | | | Update endpoints to reflect current specDaniel Wagner-Hall2015-12-026-35/+11
| | | | | |
* | | | | | Merge pull request #418 from matrix-org/daniel/whoisDaniel Wagner-Hall2015-12-032-18/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge pull request #418 from matrix-org/daniel/whois
| * | | | | | Fix implementation of /admin/whoisDaniel Wagner-Hall2015-12-022-18/+12
| |/ / / / /
* | | | | | Just replace the table definition with the one from full_schema 16David Baker2015-12-021-11/+10
| | | | | |
* | | | | | Fix schema delta 15 on postgres in the very unlikley event that anyone ↵David Baker2015-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | upgrades to 15...
* | | | | | Make state updates in the C+S API idempotentMark Haines2015-12-021-0/+12
|/ / / / /
* | | | | Merge pull request #412 from matrix-org/erikj/searchErik Johnston2015-12-021-11/+36
|\ \ \ \ \ | |/ / / / |/| | | | Search: Add prefix matching support
| * | | | Throw if unrecognized DB typeErik Johnston2015-12-021-1/+4
| | | | |
| * | | | Fix so highlight matching works againErik Johnston2015-12-021-8/+13
| | | | |
| * | | | Remove deuplication. Add comment about regex.Erik Johnston2015-12-021-21/+11
| | | | |
| * | | | Search: Add prefix matching supportErik Johnston2015-12-021-5/+32
| | | | |
* | | | | Merge pull request #410 from matrix-org/markjh/edu_frequencyMark Haines2015-12-022-5/+15
|\ \ \ \ \ | | | | | | | | | | | | Only fire user_joined_room if the user has actually joined.
| * | | | | Use the context returned by _handle_new_eventMark Haines2015-12-021-4/+1
| | | | | |
| * | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-021-1/+1
| |\ \ \ \ \
| * | | | | | Add commentsMark Haines2015-12-022-0/+6
| | | | | | |
| * | | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-029-56/+91
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py
| * | | | | | | Only fire user_joined_room if the membership has changedMark Haines2015-12-011-3/+8
| | | | | | | |
| * | | | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-0142-235/+835
| |\ \ \ \ \ \ \
| * | | | | | | | Only fire user_joined_room on the distributor if the user has actually ↵Mark Haines2015-12-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | joined the room
* | | | | | | | | Merge pull request #413 from matrix-org/markjh/reuse_http_clientMark Haines2015-12-023-18/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Reuse a single http client, rather than creating new ones
| * | | | | | | | | Reuse a single http client, rather than creating new onesMark Haines2015-12-023-18/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #411 from matrix-org/default_dont_notifyDavid Baker2015-12-021-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Change the m.room.message rule to be disabled by default
| * | | | | | | | Change the m.room.message rule to be disabled by default so we only notify ↵David Baker2015-12-021-0/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | for 1:1 rooms / highlights out-of-the-box
* | | | | | | | Fix typo in collect_presencelike_dataMark Haines2015-12-021-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #409 from MadsRC/developErik Johnston2015-12-021-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Develop
| * | | | | | | Added a single line to explain what the server_name is used forMads R. Christensen2015-12-021-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #408 from matrix-org/markjh/distributor_facadeMark Haines2015-12-027-53/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Wrap calls to distributor.fire in appropriately named functions
| * | | | | | | | Wrap calls to distributor.fire in appropriately named functions so that ↵Mark Haines2015-12-017-53/+78
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | static analysis can work out want is calling what
* | | | | | | | Merge pull request #406 from matrix-org/erikj/searchErik Johnston2015-12-021-3/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | Search: Don't disregard grouping info in pagination tokens
| * | | | | | Search: Don't disregard grouping info in pagination tokensErik Johnston2015-12-011-3/+12
| | | | | | |
* | | | | | | Add API for setting account_data globaly or on a per room basisMark Haines2015-12-0111-25/+476
| | | | | | |
* | | | | | | Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0126-115/+130
|/ / / / / /
* | | | | | Merge pull request #404 from matrix-org/markjh/trivial_renameMark Haines2015-12-012-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename presence_handler.send_invite
| * | | | | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ↵Mark Haines2015-12-012-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | to distinguish it from normal invites
* | | | | | Merge pull request #402 from matrix-org/markjh/event_formattingMark Haines2015-12-011-9/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Copy rather than move the fields to shuffle between a v1 and a v2 event.
| * | | | | Only add the user_id if the sender is presentMark Haines2015-12-011-1/+3
| | | | | |
| * | | | | Copy rather than move the fields to shuffle between a v1 and a v2 event.Mark Haines2015-11-301-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make all v1 APIs compatible with v2 clients. While still allowing v1 clients to access the fields. This makes the documentation easier since we can just document the v2 format and explain that some of the fields, in some of the APIs are duplicated for backwards compatibility, rather than having to document two separate event formats.
* | | | | | Tidy up a bitErik Johnston2015-12-011-8/+9
| | | | | |
* | | | | | Allow paginating search ordered by recentsErik Johnston2015-11-304-84/+219
| |/ / / / |/| | | |
* | | | | Return words to highlight in search resultsErik Johnston2015-11-272-22/+120
|/ / / /
* | | | Allow user to redact with an equal powerErik Johnston2015-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | Users only need their power level to be equal to the redact level for them to be allowed to redact events.
* | | | Fix SQL for postgres againDaniel Wagner-Hall2015-11-231-1/+1
| | | |
* | | | Fix SQL for postgresDaniel Wagner-Hall2015-11-231-1/+1
| | | |
* | | | Remove size specifier for database columnDaniel Wagner-Hall2015-11-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Postgres doesn't support them like this. We don't have a bool type in common between postgres and sqlite.
* | | | Merge pull request #375 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-231-10/+15
|\ \ \ \ | |/ / / |/| | | Clean up room initialSync for guest users
| * | | Clean up room initialSync for guest usersDaniel Wagner-Hall2015-11-131-10/+15
| | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-24 23:02:26 +0000