summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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-183-560/+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
|
* Merge pull request #501 from matrix-org/daniel/unbanDaniel Wagner-Hall2016-01-156-58/+116
|\ | | | | Require unbanning before other membership changes
| * Require unbanning before other membership changesDaniel Wagner-Hall2016-01-156-58/+116
|/
* Merge pull request #500 from matrix-org/daniel/cleanupDaniel Wagner-Hall2016-01-152-16/+8
|\ | | | | Remove unused parameters
| * Remove unused parametersDaniel Wagner-Hall2016-01-152-16/+8
|/
* Merge branch 'invalid_user_name' into developDavid Baker2016-01-152-2/+2
|\
| * M_INVALID_USERNAME to be consistent with the parameter nameDavid Baker2016-01-152-2/+2
| |
* | Merge pull request #499 from matrix-org/invalid_user_nameDavid Baker2016-01-152-1/+3
|\| | | | | Add specific error code for invalid user names.
| * 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
|\ \
| * \ Merge pull request #492 from matrix-org/rav/event_context_shiz_release github/release-v0.12.1 release-v0.12.1Richard van der Hoff2016-01-142-12/+29
| |\ \ | | | | | | | | Add 'event' result to 'context' endpoint
| | * | Add 'event' result to 'context' endpointRichard van der Hoff2016-01-132-12/+29
| |/ / | | | | | | | | | ... because the context isn't much use without the event.
* | | Merge pull request #496 from matrix-org/daniel/3Daniel Wagner-Hall2016-01-143-17/+111
|\ \ \ | | | | | | | | | | | | | | | | | | | | Require ID and as_token be unique for ASs Defaults ID to as_token if not specified. This will change when IDs are fully supported.
| * | | Require ID and as_token be unique for ASsDaniel Wagner-Hall2016-01-143-17/+111
|/ / / | | | | | | | | | | | | 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 branch 'release-v0.12.1' into developRichard van der Hoff2016-01-141-0/+8
|\ \ \ | | |/ | |/|
| * | 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.
| * | Merge pull request #476 from koobs/patch-1Matthew Hodgson2016-01-081-0/+8
| |\ \ | | | | | | | | Add FreeBSD install section & instructions
| | * | Add FreeBSD install section & instructionsKubilay Kocak2016-01-091-0/+8
| |/ / | | | | | | | | | | | | Add FreeBSD installation instructions for both Ports and Packages now that matrix-synapse has landed [1] in the tree. [1] https://svnweb.freebsd.org/changeset/ports/405527
* | | 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
| | |
* | | Merge pull request #495 from matrix-org/erikj/disable_notificationErik Johnston2016-01-143-6/+13
|\ \ \ | | | | | | | | Temporarily disable notification branch
| * | | Don't change signature. Return empty listErik Johnston2016-01-131-2/+2
| | | |
| * | | Temporarily disable notification branchErik Johnston2016-01-133-7/+14
|/ / /
* | | Merge pull request #488 from matrix-org/markjh/user_nameMark Haines2016-01-139-99/+99
|\ \ \ | |/ / |/| | Rename 'user_name' to 'user_id' in push
| * | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵Mark Haines2016-01-139-99/+99
|/ / | | | | | | of the code
* | Merge pull request #482 from matrix-org/markjh/table_nameMark Haines2016-01-137-128/+41
|\ \ | | | | | | Finish removing the .*Table objects from the storage layer.
| * \ 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
| * | | Delete the table objects from TransactionStoreMark Haines2016-01-133-60/+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 #483 from matrix-org/erikj/bulk_get_push_rulesErik Johnston2016-01-131-21/+13
|\ \ \ \ | | |/ / | |/| | bulk_get_push_rules should handle empty lists
| * | | 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.
* | | Merge pull request #481 from matrix-org/erikj/SYN-589Erik Johnston2016-01-121-1/+5
|\ \ \ | |/ / |/| | Don't include old left rooms in /sync
| * | Don't include old left roomsErik Johnston2016-01-121-1/+5
|/ /
* | Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-1124-144/+178
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1124-144/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0819-36/+541
|\ \ \ | | | | | | | | 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
| * | | | fix testsDavid Baker2016-01-063-1/+10
| | | | |
| * | | | 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-0517-74/+139
| |\ \ \ \
| * | | | | 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
| | | | | |
| * | | | | fix testsDavid Baker2016-01-042-2/+2
| | | | | |
| * | | | | 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-047-4/+208
| |\ \ \ \ \
| * | | | | | Address minor PR issuesDavid Baker2016-01-047-25/+12
| | | | | | |
| * | | | | | Fix merge fail with anon access stuffDavid Baker2015-12-221-2/+2
| | | | | | |
| * | | | | | Add mocks to make tests work againDavid Baker2015-12-222-0/+16
| | | | | | |
| * | | | | | pep8 & unused variableDavid Baker2015-12-223-4/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-226-91/+210
| |\ \ \ \ \ \
| * | | | | | | Add some comments to areas that could be optimised.David Baker2015-12-223-1/+14
| | | | | | | |
| * | | | | | | Remove the list of problems (moved to jira issues)David Baker2015-12-221-5/+0
| | | | | | | |
| * | | | | | | Insert push actions in a single db query rather than one per user/profile_tagDavid Baker2015-12-222-17/+24
| | | | | | | |
| * | | | | | | clarify problemsDavid Baker2015-12-221-1/+1
| | | | | | | |
| * | | | | | | 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-2120-80/+320
| |\ \ \ \ \ \ \
| * | | | | | | | Only run pushers for users on this hs!David Baker2015-12-213-3/+9
| | | | | | | | |
| * | | | | | | | pep8David Baker2015-12-212-9/+9
| | | | | | | | |
| * | | | | | | | add list of things I want to fix with this branchDavid Baker2015-12-181-0/+5
| | | | | | | | |
| * | | | | | | | 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.
* | | | | | | | | Merge pull request #475 from matrix-org/markjh/fix_thumbnailMark Haines2016-01-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail.
| * | | | | | | | 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
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #465 from matrix-org/syn-453Erik Johnston2016-01-071-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update readme to reflect change in signing key name
| * | | | | | | | Update readme to reflect change in signing key nameErik Johnston2016-01-061-2/+1
| |/ / / / / / /
* | | | | | | | copyrightsMatthew Hodgson2016-01-07295-297/+297
| | | | | | | |
* | | | | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #468 from matrix-org/daniel/versionsyoDaniel Wagner-Hall2016-01-063-0/+43
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Add /_matrix/versions to report supported versions
| * | | | | | | Add /_matrix/versions to report supported versionsDaniel Wagner-Hall2016-01-063-0/+43
|/ / / / / / /
* | | | | | | Merge pull request #469 from matrix-org/markjh/joined_guest_accessMark Haines2016-01-064-139/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Guest users must be joined to a room to see it in /sync
| * | | | | | | 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
| | | | | | |
* | | | | | | Merge pull request #466 from matrix-org/daniel/logloglogDaniel Wagner-Hall2016-01-061-1/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Log when we skip daily messages
| * | | | | | Log when we skip daily messagesDaniel Wagner-Hall2016-01-061-1/+10
|/ / / / / /
* | | | | | Merge pull request #463 from matrix-org/daniel/hashtagnofilterDaniel Wagner-Hall2016-01-055-21/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip, rather than erroring, invalid guest requests 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.
| * | | | | | 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.
* | | | | | Merge pull request #462 from matrix-org/daniel/guestupgradeDaniel Wagner-Hall2016-01-0511-40/+93
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow guests to upgrade their accounts
| * | | | | | Allow guests to upgrade their accountsDaniel Wagner-Hall2016-01-0511-40/+93
|/ / / / / /
* | | | | | Merge pull request #464 from matrix-org/erikj/crop_correctErik Johnston2016-01-051-4/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use larger thumbnails rather than smaller when method=crop
| * | | | | | Use larger thumbnail rather than smaller.Erik Johnston2016-01-051-4/+13
|/ / / / / /
* | | | | | Merge pull request #461 from matrix-org/erikj/sync_leaveErik Johnston2016-01-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return /sync when something under the 'leave' key has changed
| * | | | | | Return /sync when something under the 'leave' key has changedErik Johnston2016-01-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #460 from matrix-org/erikj/create_room_3pid_inviteErik Johnston2016-01-051-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support inviting 3pids in /createRoom
| * | | | | | Use named argsErik Johnston2016-01-051-2/+2
| | | | | | |
| * | | | | | Support inviting 3pids in /createRoomErik Johnston2016-01-051-0/+16
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-01-051-4/+2
|\| | | | |
| * | | | | typoeMatthew Hodgson2016-01-041-1/+1
| | | | | |
| * | | | | fix another whitespace rst bugMatthew Hodgson2016-01-041-1/+1
| | | | | |
| * | | | | fix whitespace bugMatthew Hodgson2016-01-041-2/+0
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/release-v0.12.0' v0.12.0Mark Haines2016-01-0486-873/+2602
|\ \ \ \ \
| * | | | | Bump changelog and version for v0.12.0Mark Haines2016-01-042-4/+5
| | |_|_|/ | |/| | |
| * | | | Update CHANGES github/release-v0.12.0 release-v0.12.0Richard van der Hoff2016-01-041-0/+4
| | | | |
| * | | | Merge pull request #459 from matrix-org/rav/fix_r0_loginRichard van der Hoff2016-01-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | Expose /login under r0
| | * | | | 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-232-1/+25
| | | | |
| * | | | Merge pull request #457 from matrix-org/markjh/cached_syncMark Haines2015-12-233-1/+177
| |\ \ \ \ | | | | | | | | | | | | 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-232-2/+62
| | | | | |
| | * | | | 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
| | | |_|/ | | |/| |
| * | | | Merge pull request #458 from matrix-org/markjh/guest_authMark Haines2015-12-231-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Missing yield on guest access auth check Needs matrix-org/sytest#125 to land first
| | * | | Missing yield on guest access auth checkMark Haines2015-12-231-1/+1
| |/ / / | | | | | | | | | | | | Needs matrix-org/sytest#125 to land first
| * | | Merge pull request #455 from matrix-org/markjh/guest_accessMark Haines2015-12-224-50/+144
| |\ \ \ | | | | | | | | | | Allow guest access to /sync
| | * | | 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
| * | | | Merge pull request #454 from matrix-org/markjh/room_filteringMark Haines2015-12-222-34/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add top level filters for filtering by room id Documented by matrix-org/matrix-doc#246
| | * | | | Add top level filters for filtering by room idMark Haines2015-12-222-34/+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
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #453 from matrix-org/daniel/avatarurlsDaniel Wagner-Hall2015-12-211-2/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return room avatar URLs in /publicRooms Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121
| | * | | | 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 bogus comment about branch coverageMark Haines2015-12-211-1/+0
| |/ / /
| * | | Delete all the .coverage files, including the combined .coverageMark Haines2015-12-211-1/+2
| | | |
| * | | Use an absolute path when specifying the directory for synapse in jenkins.shMark Haines2015-12-211-8/+8
| | |/ | |/|
| * | Remove accidentally committed debug loggingMark Haines2015-12-211-1/+0
| | |
| * | Merge pull request #452 from matrix-org/paul/SYN-558Mark Haines2015-12-211-1/+3
| |\ \ | | | | | | | | Actually look up required remote server key IDs
| | * | 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 #451 from matrix-org/markjh/branch_coverageMark Haines2015-12-182-6/+18
| |\ \ | | | | | | | | Generate code coverage report when running jenkins.sh
| | * | Generate code coverage report when running jenkins.shMark Haines2015-12-182-6/+18
| |/ /
| * | 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
| | | | |
| * | | | Merge pull request #449 from matrix-org/daniel/3pidDaniel Wagner-Hall2015-12-181-1/+31
| |\ \ \ \ | | |_|/ / | |/| | | Add display_name to 3pid invite in m.room.member invites
| | * | | Add display_name to 3pid invite in m.room.member invitesDaniel Wagner-Hall2015-12-171-1/+31
| | | | |
| * | | | Merge pull request #448 from matrix-org/daniel/3pidDaniel Wagner-Hall2015-12-172-2/+13
| |\| | | | | |/ / | |/| | Strip address and such out of 3pid invites
| | * | Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-172-2/+13
| |/ / | | | | | | | | | We're not meant to leak that into the graph
| * | Merge pull request #447 from matrix-org/rav/fix_search_paginationMark Haines2015-12-171-2/+4
| |\ \ | | | | | | | | Fix 500 error when back-paginating search results
| | * | 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
| | |
| * | Merge pull request #446 from matrix-org/daniel/invitemetadataDaniel Wagner-Hall2015-12-161-7/+60
| |\ \ | | | | | | | | | | | | | | | | Give the IS a bunch more 3pid invite context This allows it to form richer emails
| | * | 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-164-5/+21
| |\ \ \
| | * \ \ Merge pull request #445 from matrix-org/markjh/rebind_threepidMark Haines2015-12-151-1/+1
| | |\ \ \ | | | | | | | | | | | | Allow users to change which account a 3pid is bound to
| | | * | | 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-142-1/+12
| | | | |
| | * | | Merge pull request #444 from matrix-org/markjh/presence_raceMark Haines2015-12-141-3/+8
| | |\ \ \ | | | | | | | | | | | | Fix a race between started/stopped stream
| | | * | | Fix a race between started/stopped streamMark Haines2015-12-141-3/+8
| | |/ / /
| * | | | Merge pull request #443 from matrix-org/markjh/commentaryMark Haines2015-12-141-2/+15
| |\ \ \ \ | | | | | | | | | | | | Add commentary for fix in PR #442
| | * | | | 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
| | * | | | Merge pull request #442 from matrix-org/markjh/missing_prev_contentMark Haines2015-12-141-3/+6
| | |\ \ \ \ | | | | | | | | | | | | | | Check whether prev_content or prev_sender is set …
| | | * | | | 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
| | |/ / / /
| | * | | | Merge pull request #437 from matrix-org/markjh/parallel_syncMark Haines2015-12-141-4/+12
| | |\ \ \ \ | | | |/ / / | | |/| | | Do the /sync in parallel across the rooms like /initialSync does
| | | * | | Do the /sync in parallel accross the rooms like /initialSync doesMark Haines2015-12-111-4/+12
| | |/ / /
| * | | | Merge pull request #439 from matrix-org/daniel/typoDaniel Wagner-Hall2015-12-141-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | Fix typo
| | * | | Fix typoDaniel Wagner-Hall2015-12-141-1/+1
| |/ / /
| * | | Merge pull request #438 from matrix-org/markjh/fix_search_sqlMark Haines2015-12-141-1/+1
| |\ \ \ | | | | | | | | | | Fix typo in sql for full text search on sqlite3
| | * | | 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-126-12/+47
| |\| |
| | * | Merge pull request #436 from matrix-org/markjh/pip_instructionsMark Haines2015-12-111-5/+3
| | |\ \ | | | | | | | | | | SYN-90: We don't need --proccess-dependency-links
| | | * | SYN-90: We don't need --proccess-dependency-linksMark Haines2015-12-111-5/+3
| | |/ / | | | | | | | | | | | | When installing synapse since all its dependencies are on PyPI
| | * | Merge pull request #434 from matrix-org/markjh/forget_roomsMark Haines2015-12-103-6/+9
| | |\ \ | | | | | | | | | | Add caches for whether a room has been forgotten by a user
| | | * | 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-102-3/+3
| | | |
| | * | Update release dateMark Haines2015-12-101-1/+1
| | | |
| | * | Bump synapse version to v0.12.0Mark Haines2015-12-091-1/+1
| | | |
| | * | Add to changelogMark Haines2015-12-091-7/+7
| | | |
| | * | Changelog for v0.12.0Mark Haines2015-12-091-0/+34
| | |/
| * | 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
| | | |
| * | | Merge pull request #433 from matrix-org/paul/tiny-fixesPaul Evans2015-12-111-6/+6
| |\ \ \ | | |/ / | |/| | Ensure that the event that gets persisted is the one that was signed
| | * | Ensure that the event that gets persisted is the one that was signedPaul "LeoNerd" Evans2015-12-101-6/+6
| | | |
| | * | Merge branch 'develop' into paul/tiny-fixesPaul "LeoNerd" Evans2015-12-1095-903/+2496
| | |\|
| * | | throwaway 1-liner for generating password hashesMatthew Hodgson2015-12-101-0/+1
| | |/ | |/|
| * | Merge pull request #432 from matrix-org/pushrules_refactorDavid Baker2015-12-092-185/+234
| |\ \ | | | | | | | | Split out the push rule evaluator into a separate file
| | * | 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.
| * | Merge pull request #431 from matrix-org/markjh/filter_inlineMark Haines2015-12-091-9/+21
| |\ \ | | | | | | | | | | | | | | | | Allow filter JSON object in the filter query parameter in /sync Documented by matrix-org/matrix-doc#224
| | * | 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
| | | |
| * | | Merge pull request #429 from matrix-org/markjh/db_countersMark Haines2015-12-085-4/+38
| |\ \ \ | | | | | | | | | | Track the time spent in the database per request.
| | * | | 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-074-2/+30
| |\ \ \ \
| * \ \ \ \ Merge pull request #428 from matrix-org/pusher_api_logDavid Baker2015-12-071-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Add logging to pushers API to log the body of the request
| | * | | | | 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.
| * | | | | Merge pull request #424 from matrix-org/daniel/pushdictificationDaniel Wagner-Hall2015-12-071-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take object not bool Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212
| | * | | | | 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 #425 from MadsRC/developMatthew Hodgson2015-12-051-2/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | Added installation instructions for postgres on CentOS 7
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-11 09:46:46 +0000