| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Postgres doesn't like booleans | David Baker | 2016-01-11 | 1 | -2/+2 |
| | | |||||
| * | Remove rogue 'admin' | David Baker | 2016-01-11 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #474 from matrix-org/erikj/core_dump | Erik Johnston | 2016-01-08 | 1 | -2/+5 |
| |\ | | | | | Turn on core dumps | ||||
| | * | Turn on core dumps | Erik Johnston | 2016-01-07 | 1 | -2/+5 |
| | | | |||||
| * | | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 19 | -36/+541 |
| |\ \ | | | | | | | Send unread notification counts | ||||
| | * | | This comma is actually important | David Baker | 2016-01-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | more commas | David Baker | 2016-01-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | comma style | David Baker | 2016-01-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-06 | 6 | -142/+60 |
| | |\ \ | |||||
| | * | | | Adding is_guest here won't work because it just constructs a dict of uid -> ↵ | David Baker | 2016-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | password hash | ||||
| | * | | | fix tests | David Baker | 2016-01-06 | 3 | -1/+10 |
| | | | | | |||||
| | * | | | Delete notifications for redacted events | David Baker | 2016-01-06 | 2 | -0/+19 |
| | | | | | |||||
| | * | | | Add schema change file for is_guest flag | David Baker | 2016-01-06 | 1 | -0/+22 |
| | | | | | |||||
| | * | | | Add is_guest flag to users db to track whether a user is a guest user or ↵ | David Baker | 2016-01-06 | 9 | -31/+69 |
| | | | | | | | | | | | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions. | ||||
| | * | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-05 | 17 | -74/+139 |
| | |\ \ \ | |||||
| | * | | | | comment typo | David Baker | 2016-01-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | = not == in sql | David Baker | 2016-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Only joined rooms have unread_notif_count | David Baker | 2016-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | comma | David Baker | 2016-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add unread_notif_count in incremental_sync_with_gap | David Baker | 2016-01-04 | 1 | -0/+8 |
| | | | | | | |||||
| | * | | | | fix tests | David Baker | 2016-01-04 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Rename event-actions to event_push_actions as per PR request | David Baker | 2016-01-04 | 6 | -17/+17 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-04 | 7 | -4/+208 |
| | |\ \ \ \ | |||||
| | * | | | | | Address minor PR issues | David Baker | 2016-01-04 | 7 | -25/+12 |
| | | | | | | | |||||
| | * | | | | | Fix merge fail with anon access stuff | David Baker | 2015-12-22 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Add mocks to make tests work again | David Baker | 2015-12-22 | 2 | -0/+16 |
| | | | | | | | |||||
| | * | | | | | pep8 & unused variable | David Baker | 2015-12-22 | 3 | -4/+3 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-22 | 6 | -91/+210 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Add some comments to areas that could be optimised. | David Baker | 2015-12-22 | 3 | -1/+14 |
| | | | | | | | | |||||
| | * | | | | | | Remove the list of problems (moved to jira issues) | David Baker | 2015-12-22 | 1 | -5/+0 |
| | | | | | | | | |||||
| | * | | | | | | Insert push actions in a single db query rather than one per user/profile_tag | David Baker | 2015-12-22 | 2 | -17/+24 |
| | | | | | | | | |||||
| | * | | | | | | clarify problems | David Baker | 2015-12-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Add bulk push rule evaluator which actually still evaluates rules one by ↵ | David Baker | 2015-12-22 | 4 | -22/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one, but does far fewer db queries to fetch the rules | ||||
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 20 | -80/+320 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Only run pushers for users on this hs! | David Baker | 2015-12-21 | 3 | -3/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | pep8 | David Baker | 2015-12-21 | 2 | -9/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | add list of things I want to fix with this branch | David Baker | 2015-12-18 | 1 | -0/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Make unread notification count sending work: put the correct count in ↵ | David Baker | 2015-12-18 | 2 | -20/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user... | ||||
| | * | | | | | | | still very WIP, but now sends unread_notifications_count in the room object ↵ | David Baker | 2015-12-16 | 5 | -5/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs). | ||||
| | * | | | | | | | Store nothing instead of ['dont_notify'] for events with no notification ↵ | David Baker | 2015-12-10 | 3 | -21/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required: much as it would be nice to be able to tell between the event not having been processed and there being no notification for it, this isn't worth filling up the table with ['dont_notify'] I think. Consequently treat the empty actions array as dont_notify and filter dont_notify out of the result. | ||||
| | * | | | | | | | Save event actions to the db | David Baker | 2015-12-10 | 4 | -2/+72 |
| | | | | | | | | | |||||
| | * | | | | | | | Having consulted The Erikle, this should go at the end of on_receive_pdu, ↵ | David Baker | 2015-12-10 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise it will be triggered whenever we backfill too. | ||||
| | * | | | | | | | Very first cut of calculating actions for events as they come in. Doesn't ↵ | David Baker | 2015-12-10 | 4 | -1/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store them yet. Not very efficient. | ||||
| * | | | | | | | | Merge pull request #475 from matrix-org/markjh/fix_thumbnail | Mark Haines | 2016-01-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail. | ||||
| | * | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail. | Mark Haines | 2016-01-07 | 1 | -1/+1 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Even though ones cropped with scale might be technically valid. | ||||
| * | | | | | | | Use logger not logging | Erik Johnston | 2016-01-07 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #473 from matrix-org/erikj/ssh_manhole | Erik Johnston | 2016-01-07 | 2 | -6/+22 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Change manhole to use ssh | ||||
| | * | | | | | | | s/telnet/ssh/ | Erik Johnston | 2016-01-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Change manhole to use ssh | Erik Johnston | 2016-01-07 | 1 | -5/+21 |
| | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #465 from matrix-org/syn-453 | Erik Johnston | 2016-01-07 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update readme to reflect change in signing key name | ||||
| | * | | | | | | | Update readme to reflect change in signing key name | Erik Johnston | 2016-01-06 | 1 | -2/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | copyrights | Matthew Hodgson | 2016-01-07 | 295 | -297/+297 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #472 from roblabla/patch-1 | Matthew Hodgson | 2016-01-06 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Config Comment mixup in captcha public/private key | ||||
| | * | | | | | | | Config Comment mixup in captcha public/private key | Robin Lambertz | 2016-01-06 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #468 from matrix-org/daniel/versionsyo | Daniel Wagner-Hall | 2016-01-06 | 3 | -0/+43 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Add /_matrix/versions to report supported versions | ||||
| | * | | | | | | | Add /_matrix/versions to report supported versions | Daniel Wagner-Hall | 2016-01-06 | 3 | -0/+43 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #469 from matrix-org/markjh/joined_guest_access | Mark Haines | 2016-01-06 | 4 | -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 streams | Mark Haines | 2016-01-06 | 1 | -5/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Guest users must be joined to a room to see it in /sync | Mark Haines | 2016-01-06 | 4 | -137/+50 |
| |/ / / / / / / | |||||
| * | | | | | | | Log when starting stats reporting | Daniel Wagner-Hall | 2016-01-06 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Log on stats scheduling | Daniel Wagner-Hall | 2016-01-06 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #466 from matrix-org/daniel/logloglog | Daniel Wagner-Hall | 2016-01-06 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Log when we skip daily messages | ||||
| | * | | | | | | Log when we skip daily messages | Daniel Wagner-Hall | 2016-01-06 | 1 | -1/+10 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #463 from matrix-org/daniel/hashtagnofilter | Daniel Wagner-Hall | 2016-01-05 | 5 | -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 requests | Daniel Wagner-Hall | 2016-01-05 | 5 | -21/+5 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour. | ||||
| * | | | | | | Merge pull request #462 from matrix-org/daniel/guestupgrade | Daniel Wagner-Hall | 2016-01-05 | 11 | -40/+93 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow guests to upgrade their accounts | ||||
| | * | | | | | | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 11 | -40/+93 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #464 from matrix-org/erikj/crop_correct | Erik Johnston | 2016-01-05 | 1 | -4/+13 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Use larger thumbnails rather than smaller when method=crop | ||||
| | * | | | | | | Use larger thumbnail rather than smaller. | Erik Johnston | 2016-01-05 | 1 | -4/+13 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #461 from matrix-org/erikj/sync_leave | Erik Johnston | 2016-01-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Return /sync when something under the 'leave' key has changed | ||||
| | * | | | | | | Return /sync when something under the 'leave' key has changed | Erik Johnston | 2016-01-05 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #460 from matrix-org/erikj/create_room_3pid_invite | Erik Johnston | 2016-01-05 | 1 | -0/+16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Support inviting 3pids in /createRoom | ||||
| | * | | | | | | Use named args | Erik Johnston | 2016-01-05 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Support inviting 3pids in /createRoom | Erik Johnston | 2016-01-05 | 1 | -0/+16 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-01-05 | 1 | -4/+2 |
| |\| | | | | | |||||
| | * | | | | | typoe | Matthew Hodgson | 2016-01-04 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix another whitespace rst bug | Matthew Hodgson | 2016-01-04 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix whitespace bug | Matthew Hodgson | 2016-01-04 | 1 | -2/+0 |
| |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/release-v0.12.0' v0.12.0 | Mark Haines | 2016-01-04 | 86 | -873/+2602 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bump changelog and version for v0.12.0 | Mark Haines | 2016-01-04 | 2 | -4/+5 |
| | | |_|_|/ | |/| | | | |||||
| | * | | | | Update CHANGES release-v0.12.0 | Richard van der Hoff | 2016-01-04 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | Merge pull request #459 from matrix-org/rav/fix_r0_login | Richard van der Hoff | 2016-01-04 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | Expose /login under r0 | ||||
| | | * | | | | Expose /login under r0 | Richard van der Hoff | 2016-01-02 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | The spec says /login should be available at r0 and 'unstable', so make it so. | ||||
| | * | | | | Bump version and update changelog for v0.12.0-rc3 v0.12.0-rc3 | Mark Haines | 2015-12-23 | 2 | -1/+25 |
| | | | | | | |||||
| | * | | | | Merge pull request #457 from matrix-org/markjh/cached_sync | Mark Haines | 2015-12-23 | 3 | -1/+177 |
| | |\ \ \ \ | | | | | | | | | | | | | Add a cache for initialSync responses that expires after 5 minutes | ||||
| | | * | | | | Add some docstring explaining the snapshot cache does | Mark Haines | 2015-12-23 | 1 | -1/+23 |
| | | | | | | | |||||
| | | * | | | | Add a unit test for the snapshot cache | Mark Haines | 2015-12-23 | 2 | -2/+62 |
| | | | | | | | |||||
| | | * | | | | Move the doc string to the public facing method | Mark Haines | 2015-12-22 | 1 | -16/+17 |
| | | | | | | | |||||
| | | * | | | | Add a cache for initialSync responses that expires after 5 minutes | Mark Haines | 2015-12-22 | 2 | -1/+94 |
| | | | |_|/ | | |/| | | |||||
| | * | | | | Merge pull request #458 from matrix-org/markjh/guest_auth | Mark Haines | 2015-12-23 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Missing yield on guest access auth check Needs matrix-org/sytest#125 to land first | ||||
| | | * | | | Missing yield on guest access auth check | Mark Haines | 2015-12-23 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | Needs matrix-org/sytest#125 to land first | ||||
| | * | | | Merge pull request #455 from matrix-org/markjh/guest_access | Mark Haines | 2015-12-22 | 4 | -50/+144 |
| | |\ \ \ | | | | | | | | | | | Allow guest access to /sync | ||||
| | | * | | | Include the list of bad room ids in the error | Mark Haines | 2015-12-22 | 2 | -2/+24 |
| | | | | | | |||||
| | | * | | | Use a list comprehension | Mark Haines | 2015-12-22 | 1 | -3/+4 |
| | | | | | | |||||
| | | * | | | Merge remote-tracking branch 'origin/develop' into markjh/guest_access | Mark Haines | 2015-12-22 | 1 | -0/+5 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: synapse/api/filtering.py | ||||
| | * | | | | Merge pull request #454 from matrix-org/markjh/room_filtering | Mark Haines | 2015-12-22 | 2 | -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 id | Mark Haines | 2015-12-22 | 2 | -34/+35 |
| | |/ / / / | | | | | | | | | | | | | | | | Documented by matrix-org/matrix-doc#246 | ||||
| | | * | | | Hook up read receipts and typing notifications for guest access | Mark Haines | 2015-12-22 | 1 | -13/+11 |
| | | | | | | |||||
| | | * | | | Merge branch 'develop' into markjh/guest_access | Mark Haines | 2015-12-22 | 1 | -2/+21 |
| | | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #453 from matrix-org/daniel/avatarurls | Daniel Wagner-Hall | 2015-12-21 | 1 | -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 /publicRooms | Daniel Wagner-Hall | 2015-12-21 | 1 | -2/+21 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121 | ||||
| | | * | | | Allow guest access to /sync | Mark Haines | 2015-12-22 | 1 | -46/+98 |
| | | | | | | |||||
| | | * | | | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 3 | -1/+22 |
| | | | | | | |||||
| | | * | | | Add top level filtering by room id | Mark Haines | 2015-12-21 | 1 | -33/+30 |
| | | | | | | |||||
| | | * | | | Remove bogus comment about branch coverage | Mark Haines | 2015-12-21 | 1 | -1/+0 |
| | |/ / / | |||||
| | * | | | Delete all the .coverage files, including the combined .coverage | Mark Haines | 2015-12-21 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Use an absolute path when specifying the directory for synapse in jenkins.sh | Mark Haines | 2015-12-21 | 1 | -8/+8 |
| | | |/ | |/| | |||||
| | * | | Remove accidentally committed debug logging | Mark Haines | 2015-12-21 | 1 | -1/+0 |
| | | | | |||||
| | * | | Merge pull request #452 from matrix-org/paul/SYN-558 | Mark Haines | 2015-12-21 | 1 | -1/+3 |
| | |\ \ | | | | | | | | | Actually look up required remote server key IDs | ||||
| | | * | | Actually look up required remote server key IDs | Paul "LeoNerd" Evans | 2015-12-18 | 1 | -1/+3 |
| | |/ / | | | | | | | | | | | | | | | | set.union() is a side-effect-free function that returns the union of two sets. This clearly wanted .update(), which is the side-effecting mutator version. | ||||
| | * | | Merge pull request #451 from matrix-org/markjh/branch_coverage | Mark Haines | 2015-12-18 | 2 | -6/+18 |
| | |\ \ | | | | | | | | | Generate code coverage report when running jenkins.sh | ||||
| | | * | | Generate code coverage report when running jenkins.sh | Mark Haines | 2015-12-18 | 2 | -6/+18 |
| | |/ / | |||||
| | * | | Merge pull request #450 from matrix-org/matthew/no-identicons | Matthew Hodgson | 2015-12-18 | 1 | -19/+3 |
| | |\ \ | | | | | | | | | Matthew/no identicons | ||||
| | | * | | fix indentation level | Matthew Hodgson | 2015-12-17 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | stop generating default identicons. reverts most of ↵ | Matthew Hodgson | 2015-12-17 | 1 | -19/+3 |
| | | | | | | | | | | | | | | | | | 582019f870adbc4a8a8a9ef97b527e0fead77761 and solves vector-web/vector-im#346 | ||||
| | * | | | Merge branch 'release-v0.12.0' into develop | David Baker | 2015-12-18 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Fix typo that broke registration on the mobile clients | David Baker | 2015-12-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #449 from matrix-org/daniel/3pid | Daniel Wagner-Hall | 2015-12-18 | 1 | -1/+31 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Add display_name to 3pid invite in m.room.member invites | ||||
| | | * | | | Add display_name to 3pid invite in m.room.member invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+31 |
| | | | | | | |||||
| | * | | | | Merge pull request #448 from matrix-org/daniel/3pid | Daniel Wagner-Hall | 2015-12-17 | 2 | -2/+13 |
| | |\| | | | | |/ / | |/| | | Strip address and such out of 3pid invites | ||||
| | | * | | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 2 | -2/+13 |
| | |/ / | | | | | | | | | | We're not meant to leak that into the graph | ||||
| | * | | Merge pull request #447 from matrix-org/rav/fix_search_pagination | Mark Haines | 2015-12-17 | 1 | -2/+4 |
| | |\ \ | | | | | | | | | Fix 500 error when back-paginating search results | ||||
| | | * | | Fix 500 error when back-paginating search results | Richard van der Hoff | 2015-12-17 | 1 | -2/+4 |
| | |/ / | | | | | | | | | | | | | We were mistakenly adding pagination clauses to the count query, which then failed because the count query doesn't join to the events table. | ||||
| | * | | Fix typo | Daniel Wagner-Hall | 2015-12-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge pull request #446 from matrix-org/daniel/invitemetadata | Daniel Wagner-Hall | 2015-12-16 | 1 | -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 context | Daniel Wagner-Hall | 2015-12-16 | 1 | -7/+60 |
| | |/ / | | | | | | | | | | This allows it to form richer emails | ||||
| | * | | Merge pull request #440 from matrix-org/daniel/ise | Mark Haines | 2015-12-16 | 1 | -2/+5 |
| | |\ \ | | | | | | | | | Include errcode on Internal Server Error | ||||
| | | * | | Include errcode on Internal Server Error | Daniel Wagner-Hall | 2015-12-14 | 1 | -2/+5 |
| | | | | | |||||
| | * | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-16 | 4 | -5/+21 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #445 from matrix-org/markjh/rebind_threepid | Mark Haines | 2015-12-15 | 1 | -1/+1 |
| | | |\ \ \ | | | | | | | | | | | | | Allow users to change which account a 3pid is bound to | ||||
| | | | * | | | Allow users to change which account a 3pid is bound to | Mark Haines | 2015-12-15 | 1 | -1/+1 |
| | | |/ / / | |||||
| | | * | | | Changelog and version bump for v0.12.0-rc2 v0.12.0-rc2 | Mark Haines | 2015-12-14 | 2 | -1/+12 |
| | | | | | | |||||
| | | * | | | Merge pull request #444 from matrix-org/markjh/presence_race | Mark Haines | 2015-12-14 | 1 | -3/+8 |
| | | |\ \ \ | | | | | | | | | | | | | Fix a race between started/stopped stream | ||||
| | | | * | | | Fix a race between started/stopped stream | Mark Haines | 2015-12-14 | 1 | -3/+8 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #443 from matrix-org/markjh/commentary | Mark Haines | 2015-12-14 | 1 | -2/+15 |
| | |\ \ \ \ | | | | | | | | | | | | | Add commentary for fix in PR #442 | ||||
| | | * | | | | Fix spacing | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fix logging to lie less | Mark Haines | 2015-12-14 | 1 | -2/+9 |
| | | | | | | | |||||
| | | * | | | | Add commentary for fix in PR#442 | Mark Haines | 2015-12-14 | 1 | -0/+6 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-14 | 3 | -7/+23 |
| | |\| | | | |||||
| | | * | | | Merge pull request #441 from matrix-org/markjh/fts_skip_invalid | Mark Haines | 2015-12-14 | 1 | -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 Haines | 2015-12-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | populating the FTS index | ||||
| | | * | | | | Merge pull request #442 from matrix-org/markjh/missing_prev_content | Mark Haines | 2015-12-14 | 1 | -3/+6 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Check whether prev_content or prev_sender is set … | ||||
| | | | * | | | | Combine the prev content tests | Mark Haines | 2015-12-14 | 1 | -14/+12 |
| | | | | | | | | |||||
| | | | * | | | | Check whether prev_content or prev_sender is set before trying to rollback state | Mark Haines | 2015-12-14 | 1 | -8/+13 |
| | | |/ / / / | |||||
| | | * | | | | Merge pull request #437 from matrix-org/markjh/parallel_sync | Mark Haines | 2015-12-14 | 1 | -4/+12 |
| | | |\ \ \ \ | | | |/ / / | | |/| | | | Do the /sync in parallel across the rooms like /initialSync does | ||||
| | | | * | | | Do the /sync in parallel accross the rooms like /initialSync does | Mark Haines | 2015-12-11 | 1 | -4/+12 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #439 from matrix-org/daniel/typo | Daniel Wagner-Hall | 2015-12-14 | 1 | -1/+1 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Fix typo | ||||
| | | * | | | Fix typo | Daniel Wagner-Hall | 2015-12-14 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #438 from matrix-org/markjh/fix_search_sql | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | Fix typo in sql for full text search on sqlite3 | ||||
| | | * | | | Fix typo in sql for full text search on sqlite3 | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-12 | 6 | -12/+47 |
| | |\| | | |||||
| | | * | | Merge pull request #436 from matrix-org/markjh/pip_instructions | Mark Haines | 2015-12-11 | 1 | -5/+3 |
| | | |\ \ | | | | | | | | | | | SYN-90: We don't need --proccess-dependency-links | ||||
| | | | * | | SYN-90: We don't need --proccess-dependency-links | Mark Haines | 2015-12-11 | 1 | -5/+3 |
| | | |/ / | | | | | | | | | | | | | When installing synapse since all its dependencies are on PyPI | ||||
| | | * | | Merge pull request #434 from matrix-org/markjh/forget_rooms | Mark Haines | 2015-12-10 | 3 | -6/+9 |
| | | |\ \ | | | | | | | | | | | Add caches for whether a room has been forgotten by a user | ||||
| | | | * | | Missing yield | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| | | | | | | |||||
| | | | * | | Add caches for whether a room has been forgotten by a user | Mark Haines | 2015-12-10 | 2 | -5/+8 |
| | | |/ / | |||||
| | | * | | Mark the version as a -rc1 release candidate v0.12.0-rc1 | Mark Haines | 2015-12-10 | 2 | -3/+3 |
| | | | | | |||||
| | | * | | Update release date | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Bump synapse version to v0.12.0 | Mark Haines | 2015-12-09 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Add to changelog | Mark Haines | 2015-12-09 | 1 | -7/+7 |
| | | | | | |||||
| | | * | | Changelog for v0.12.0 | Mark Haines | 2015-12-09 | 1 | -0/+34 |
| | | |/ | |||||
| | * | | Merge pull request #435 from matrix-org/erikj/search | Erik Johnston | 2015-12-11 | 2 | -9/+72 |
| | |\ \ | | | | | | | | | Include approximate count of search results | ||||
| | | * | | Include approximate count of search results | Erik Johnston | 2015-12-11 | 2 | -3/+61 |
| | | | | | |||||
| | | * | | Use more efficient query form | Erik Johnston | 2015-12-11 | 1 | -8/+13 |
| | | | | | |||||
| | * | | | Merge pull request #433 from matrix-org/paul/tiny-fixes | Paul Evans | 2015-12-11 | 1 | -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 signed | Paul "LeoNerd" Evans | 2015-12-10 | 1 | -6/+6 |
| | | | | | |||||
| | | * | | Merge branch 'develop' into paul/tiny-fixes | Paul "LeoNerd" Evans | 2015-12-10 | 95 | -903/+2496 |
| | | |\| | |||||
| | * | | | throwaway 1-liner for generating password hashes | Matthew Hodgson | 2015-12-10 | 1 | -0/+1 |
| | | |/ | |/| | |||||
| | * | | Merge pull request #432 from matrix-org/pushrules_refactor | David Baker | 2015-12-09 | 2 | -185/+234 |
| | |\ \ | | | | | | | | | Split out the push rule evaluator into a separate file | ||||
| | | * | | pep8 | David Baker | 2015-12-09 | 1 | -4/+4 |
| | | | | | |||||
| | | * | | Split out the push rule evaluator into a separate file so it can be more ↵ | David Baker | 2015-12-09 | 2 | -185/+234 |
| | |/ / | | | | | | | | | | readily reused. Should be functionally identical. | ||||
| | * | | Merge pull request #431 from matrix-org/markjh/filter_inline | Mark Haines | 2015-12-09 | 1 | -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 /sync | Mark Haines | 2015-12-09 | 1 | -9/+21 |
| | |/ / | | | | | | | | | | Documented by matrix-org/matrix-doc#224 | ||||
| | * | | Merge pull request #430 from matrix-org/daniel/unstable | Daniel Wagner-Hall | 2015-12-09 | 5 | -85/+80 |
| | |\ \ | | | | | | | | | Merge pull request #430 from matrix-org/daniel/unstable | ||||
| | | * | | Actually host r0 and unstable prefixes | Daniel Wagner-Hall | 2015-12-08 | 5 | -85/+80 |
| | | | | | |||||
| | * | | | Merge pull request #405 from matrix-org/erikj/search-ts | Erik Johnston | 2015-12-08 | 1 | -6/+4 |
| | |\ \ \ | | |/ / | |/| | | Change the result dict to be a list in /search response | ||||
| | | * | | Change the result tict to be a list | Erik Johnston | 2015-12-01 | 1 | -6/+4 |
| | | | | | |||||
| | * | | | Merge pull request #429 from matrix-org/markjh/db_counters | Mark Haines | 2015-12-08 | 5 | -4/+38 |
| | |\ \ \ | | | | | | | | | | | Track the time spent in the database per request. | ||||
| | | * | | | Track the time spent in the database per request. | Mark Haines | 2015-12-07 | 5 | -4/+38 |
| | |/ / / | | | | | | | | | | | | | and track the number of transactions that request started. | ||||
| | * | | | Merge pull request #423 from matrix-org/markjh/archived_flag | Mark Haines | 2015-12-07 | 2 | -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 filter | Mark Haines | 2015-12-04 | 2 | -6/+10 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/master' into develop | Mark Haines | 2015-12-07 | 4 | -2/+30 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #428 from matrix-org/pusher_api_log | David Baker | 2015-12-07 | 1 | -0/+6 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add logging to pushers API to log the body of the request | ||||
| | | * | | | | | also do more structured logging | David Baker | 2015-12-07 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | * | | | | | pep8 | David Baker | 2015-12-07 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | * | | | | | Add logging to pushers API to log the body of the request | David Baker | 2015-12-07 | 1 | -0/+4 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #427 from matrix-org/markjh/log_context | Mark Haines | 2015-12-07 | 1 | -16/+24 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add a setter for the current log context. | ||||
| | | * | | | | | Add a setter for the current log context. | Mark Haines | 2015-12-07 | 1 | -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/pushdictification | Daniel Wagner-Hall | 2015-12-07 | 1 | -0/+5 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take object not bool Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212 | ||||
| | | * | | | | | Take object not bool | Daniel Wagner-Hall | 2015-12-07 | 1 | -0/+5 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212 | ||||
| | * | | | | | Merge pull request #425 from MadsRC/develop | Matthew Hodgson | 2015-12-05 | 1 | -2/+15 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Added installation instructions for postgres on CentOS 7 | ||||
| | | * | | | | | Added installation instructions for postgres on CentOS 7 | Mads R. Christensen | 2015-12-05 | 1 | -2/+15 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #422 from matrix-org/markjh/schema | Mark Haines | 2015-12-04 | 5 | -24/+37 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Bump schema version. | ||||
| | | * | | | | | | Bump schema version. | Mark Haines | 2015-12-04 | 5 | -24/+37 |
| | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | As we released version 26 in v0.11.1 | ||||
| | * | | | | | | Merge pull request #421 from matrix-org/markjh/resource_metrics | Mark Haines | 2015-12-04 | 1 | -0/+17 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Add metrics to track the cpu on the main thread consumed by each type… | ||||
| | | * | | | | | Add metrics to track the cpu on the main thread consumed by each type of request | Mark Haines | 2015-12-04 | 1 | -0/+17 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #420 from matrix-org/markjh/resource_usage | Mark Haines | 2015-12-04 | 4 | -11/+91 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Track the cpu used in the main thread by each logging context | ||||
| | | * | | | | | Add comments to explain why we are hardcoding RUSAGE_THREAD | Mark Haines | 2015-12-04 | 1 | -0/+8 |
| | | | | | | | | |||||
| | | * | | | | | Fix warnings | Mark Haines | 2015-12-04 | 2 | -3/+13 |
| | | | | | | | | |||||
| | | * | | | | | Track the cpu used in the main thread by each logging context | Mark Haines | 2015-12-03 | 3 | -10/+72 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #419 from matrix-org/markjh/reuse_captcha_client | Mark Haines | 2015-12-03 | 1 | -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 request | Mark Haines | 2015-12-03 | 1 | -4/+2 |
| | | |/ / / / / | |||||
| | * / / / / / | Flatten devices into a dict, not a list | Daniel Wagner-Hall | 2015-12-03 | 1 | -4/+3 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #414 from matrix-org/erikj/if_not_exists | Erik Johnston | 2015-12-03 | 1 | -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 tables | Erik Johnston | 2015-12-02 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #415 from matrix-org/daniel/endpoints | Daniel Wagner-Hall | 2015-12-03 | 6 | -35/+11 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merge pull request #415 from matrix-org/daniel/endpoints | ||||
| | | * | | | | | | Update endpoints to reflect current spec | Daniel Wagner-Hall | 2015-12-02 | 6 | -35/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #418 from matrix-org/daniel/whois | Daniel Wagner-Hall | 2015-12-03 | 2 | -18/+12 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merge pull request #418 from matrix-org/daniel/whois | ||||
| | | * | | | | | | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 2 | -18/+12 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Merge pull request #417 from matrix-org/fix_db_v15_postgres | David Baker | 2015-12-02 | 1 | -12/+11 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix schema delta 15 on postgres | ||||
| | | * | | | | | | | Just replace the table definition with the one from full_schema 16 | David Baker | 2015-12-02 | 1 | -11/+10 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fix schema delta 15 on postgres in the very unlikley event that anyone ↵ | David Baker | 2015-12-02 | 1 | -1/+1 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | upgrades to 15... | ||||
| | * | | | | | | | Merge pull request #416 from matrix-org/markjh/idempotent_state | Mark Haines | 2015-12-02 | 1 | -0/+12 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Make state updates in the C+S API idempotent | ||||
| | | * | | | | | | Make state updates in the C+S API idempotent | Mark Haines | 2015-12-02 | 1 | -0/+12 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #412 from matrix-org/erikj/search | Erik Johnston | 2015-12-02 | 1 | -11/+36 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Search: Add prefix matching support | ||||
| | | * | | | | | Throw if unrecognized DB type | Erik Johnston | 2015-12-02 | 1 | -1/+4 |
| | | | | | | | | |||||
| | | * | | | | | Fix so highlight matching works again | Erik Johnston | 2015-12-02 | 1 | -8/+13 |
| | | | | | | | | |||||
| | | * | | | | | Remove deuplication. Add comment about regex. | Erik Johnston | 2015-12-02 | 1 | -21/+11 |
| | | | | | | | | |||||
| | | * | | | | | Search: Add prefix matching support | Erik Johnston | 2015-12-02 | 1 | -5/+32 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #410 from matrix-org/markjh/edu_frequency | Mark Haines | 2015-12-02 | 2 | -5/+15 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Only fire user_joined_room if the user has actually joined. | ||||
| | | * | | | | | | Use the context returned by _handle_new_event | Mark Haines | 2015-12-02 | 1 | -4/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Add comments | Mark Haines | 2015-12-02 | 2 | -0/+6 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 11 | -69/+109 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py | ||||
| | | * | | | | | | | | Only fire user_joined_room if the membership has changed | Mark Haines | 2015-12-01 | 1 | -3/+8 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-01 | 45 | -243/+845 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Only fire user_joined_room on the distributor if the user has actually ↵ | Mark Haines | 2015-12-01 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | joined the room | ||||
| | * | | | | | | | | | | Merge pull request #413 from matrix-org/markjh/reuse_http_client | Mark Haines | 2015-12-02 | 3 | -18/+10 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Reuse a single http client, rather than creating new ones | ||||
| | | * | | | | | | | | | | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 3 | -18/+10 |
| | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #411 from matrix-org/default_dont_notify | David Baker | 2015-12-02 | 1 | -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 Baker | 2015-12-02 | 1 | -0/+1 |
| | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | for 1:1 rooms / highlights out-of-the-box | ||||
| | * | | | | | | | | | Fix typo in collect_presencelike_data | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | Merge pull request #409 from MadsRC/develop | Erik Johnston | 2015-12-02 | 2 | -0/+5 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | Develop | ||||
| | | * | | | | | | | Added a single line to explain what the server_name is used for | Mads R. Christensen | 2015-12-02 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Added a few lines to better explain how to run Synapse on a FQDN that is not ↵ | Mads R. Christensen | 2015-12-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | part of the UserID | ||||
| | * | | | | | | | | Merge pull request #408 from matrix-org/markjh/distributor_facade | Mark Haines | 2015-12-02 | 7 | -53/+78 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Wrap calls to distributor.fire in appropriately named functions | ||||
| | | * \ \ \ \ \ \ \ | Merge branch 'develop' into markjh/distributor_facade | Mark Haines | 2015-12-01 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Wrap calls to distributor.fire in appropriately named functions so that ↵ | Mark Haines | 2015-12-01 | 7 | -53/+78 |
| | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | static analysis can work out want is calling what | ||||
| | * | | | | | | | | | Merge pull request #406 from matrix-org/erikj/search | Erik Johnston | 2015-12-02 | 1 | -3/+12 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | Search: Don't disregard grouping info in pagination tokens | ||||
| | | * | | | | | | | | Search: Don't disregard grouping info in pagination tokens | Erik Johnston | 2015-12-01 | 1 | -3/+12 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | various fixes - thanks to Mark White for pointing out you need to run ↵ | Matthew Hodgson | 2015-12-01 | 1 | -12/+13 |
| | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | synapse before you try to register a new user | ||||
| | * | | | | | | | | Fix definitions script | Mark Haines | 2015-12-01 | 1 | -1/+1 |
| | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | | Merge pull request #392 from matrix-org/markjh/client_config | Mark Haines | 2015-12-01 | 11 | -25/+476 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add API for setting per user account data at the top level or room level. | ||||
| | | * | | | | | | | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 11 | -25/+476 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #407 from MadsRC/develop | Matthew Hodgson | 2015-12-01 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | Develop | ||||
| | | * | | | | | | Added --report-status=yes|no as Synapse won't generate the config without it | Mads R. Christensen | 2015-12-01 | 1 | -2/+3 |
| | | | | | | | | | |||||
| | | * | | | | | | Added libffi-devel in CentOS 7 installation requirements and fixed ↵ | Mads R. Christensen | 2015-12-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indentation of yum groupinstall. Signed-off-by: Mads Robin Christensen <mads@v42.dk> | ||||
| | * | | | | | | | Merge pull request #400 from matrix-org/daniel/versioning | Daniel Wagner-Hall | 2015-12-01 | 27 | -117/+133 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Merge pull request # 400 from matrix-org/daniel/versioning | ||||
| | | * | | | | | | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 27 | -117/+133 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #404 from matrix-org/markjh/trivial_rename | Mark Haines | 2015-12-01 | 3 | -5/+5 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Rename presence_handler.send_invite | ||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |