| Commit message (Expand) | Author | Age | Files | Lines |
* | Don't edit ruleset | Erik Johnston | 2016-01-18 | 1 | -5/+4 |
* | Make unit tests work | Erik Johnston | 2016-01-18 | 1 | -1/+1 |
* | Re-enable urnead notifications | Erik Johnston | 2016-01-18 | 3 | -13/+6 |
* | Make notifications go quicker | Erik Johnston | 2016-01-18 | 4 | -131/+260 |
* | Make Event objects behave more like dicts | Erik Johnston | 2016-01-18 | 1 | -0/+9 |
* | Allow filtering events for multiple users at once | Erik Johnston | 2016-01-18 | 2 | -39/+67 |
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 5 | -55/+113 |
* | Remove unused parameters | Daniel Wagner-Hall | 2016-01-15 | 2 | -16/+8 |
* | M_INVALID_USERNAME to be consistent with the parameter name | David Baker | 2016-01-15 | 2 | -2/+2 |
* | Add specific error code for invalid user names. | David Baker | 2016-01-14 | 2 | -1/+3 |
* | Merge pull request #497 from matrix-org/erikj/max_limit | Erik Johnston | 2016-01-14 | 1 | -2/+5 |
|\ |
|
| * | Clamp pagination limits to at most 1000 | Erik Johnston | 2016-01-14 | 1 | -2/+5 |
* | | Merge branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 2 | -12/+29 |
|\ \ |
|
| * | | Add 'event' result to 'context' endpoint | Richard van der Hoff | 2016-01-13 | 2 | -12/+29 |
| * | | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-13 | 5 | -21/+5 |
* | | | Require ID and as_token be unique for ASs | Daniel Wagner-Hall | 2016-01-14 | 1 | -1/+25 |
* | | | Merge pull request #498 from matrix-org/push_rule_enabled_fix | David Baker | 2016-01-14 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix enabling & disabling push rules | David Baker | 2016-01-14 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge pull request #487 from matrix-org/daniel/forceregistration | Daniel Wagner-Hall | 2016-01-14 | 1 | -0/+5 |
|\ \ \ |
|
| * | | | Require AS users to be registered before use | Daniel Wagner-Hall | 2016-01-13 | 1 | -0/+5 |
* | | | | Merge pull request #494 from matrix-org/daniel/2 | Daniel Wagner-Hall | 2016-01-14 | 1 | -0/+1 |
|\ \ \ \ |
|
| * | | | | Don't start server if ASes are invalidly configured | Daniel Wagner-Hall | 2016-01-13 | 1 | -0/+1 |
| |/ / / |
|
* | | | | Merge pull request #493 from matrix-org/daniel/1 | Daniel Wagner-Hall | 2016-01-14 | 1 | -59/+0 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Delete unused code | Daniel Wagner-Hall | 2016-01-13 | 1 | -59/+0 |
| |/ / |
|
* | | | Use logger not logging | Erik Johnston | 2016-01-14 | 1 | -2/+2 |
* | | | Don't change signature. Return empty list | Erik Johnston | 2016-01-13 | 1 | -2/+2 |
* | | | Temporarily disable notification branch | Erik Johnston | 2016-01-13 | 3 | -7/+14 |
* | | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest o... | Mark Haines | 2016-01-13 | 9 | -99/+99 |
|/ / |
|
* | | Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/t... | Mark Haines | 2016-01-13 | 3 | -26/+13 |
|\ \ |
|
| * | | bulk_get_push_rules should handle empty lists | Erik Johnston | 2016-01-13 | 1 | -21/+13 |
| * | | Merge pull request #480 from matrix-org/erikj/guest_event_tightloop | Erik Johnston | 2016-01-13 | 1 | -7/+0 |
| |\ \ |
|
| | * | | Dont fire user_joined_room when guest hits /events | Erik Johnston | 2016-01-12 | 1 | -7/+0 |
| * | | | Don't include old left rooms | Erik Johnston | 2016-01-12 | 1 | -1/+5 |
| |/ / |
|
* | | | Delete the table objects from TransactionStore | Mark Haines | 2016-01-13 | 1 | -58/+10 |
* | | | Remove the RoomsTable object | Mark Haines | 2016-01-13 | 1 | -13/+3 |
* | | | Remove the PushersTable and EventPushActionsTable objects | Mark Haines | 2016-01-12 | 2 | -14/+6 |
* | | | Remove the PushRuleTable and PushRuleEnableTable objects | Mark Haines | 2016-01-12 | 1 | -50/+33 |
|/ / |
|
* | | Merge pull request #478 from matrix-org/daniel/userobject | Daniel Wagner-Hall | 2016-01-11 | 21 | -131/+167 |
|\ \ |
|
| * | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 21 | -131/+167 |
* | | | 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 | Erik Johnston | 2016-01-07 | 1 | -2/+5 |
| |/ / |
|
* | | | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 16 | -35/+515 |
|\ \ \ |
|
| * | | | 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 -> p... | David Baker | 2016-01-06 | 1 | -1/+1 |
| * | | | | 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 not.... | David Baker | 2016-01-06 | 9 | -31/+69 |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-05 | 14 | -58/+120 |
| |\ \ \ \ |
|
| * | | | | | 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 |
| * | | | | | 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 | 5 | -4/+120 |
| |\ \ \ \ \ |
|
| * | | | | | | 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 |
| * | | | | | | 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 | 5 | -81/+200 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Add some comments to areas that could be optimised. | David Baker | 2015-12-22 | 3 | -1/+14 |
| * | | | | | | | Insert push actions in a single db query rather than one per user/profile_tag | David Baker | 2015-12-22 | 2 | -17/+24 |
| * | | | | | | | Add bulk push rule evaluator which actually still evaluates rules one by one,... | David Baker | 2015-12-22 | 4 | -22/+159 |
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 15 | -69/+253 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | 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 |
| * | | | | | | | | Make unread notification count sending work: put the correct count in increme... | David Baker | 2015-12-18 | 2 | -20/+49 |
| * | | | | | | | | still very WIP, but now sends unread_notifications_count in the room object o... | David Baker | 2015-12-16 | 5 | -5/+82 |
| * | | | | | | | | Store nothing instead of ['dont_notify'] for events with no notification requ... | David Baker | 2015-12-10 | 3 | -21/+14 |
| * | | | | | | | | 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, oth... | David Baker | 2015-12-10 | 1 | -11/+6 |
| * | | | | | | | | Very first cut of calculating actions for events as they come in. Doesn't sto... | David Baker | 2015-12-10 | 4 | -1/+81 |
* | | | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail. | Mark Haines | 2016-01-07 | 1 | -1/+1 |
| |_|_|_|_|_|/ /
|/| | | | | | | |
|
* | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | s/telnet/ssh/ | Erik Johnston | 2016-01-07 | 1 | -1/+1 |
| * | | | | | | | | Change manhole to use ssh | Erik Johnston | 2016-01-07 | 1 | -5/+21 |
| | |_|_|_|/ / /
| |/| | | | | | |
|
* | | | | | | | | copyrights | Matthew Hodgson | 2016-01-07 | 231 | -231/+231 |
* | | | | | | | | Merge pull request #472 from roblabla/patch-1 | Matthew Hodgson | 2016-01-06 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Config Comment mixup in captcha public/private key | Robin Lambertz | 2016-01-06 | 1 | -2/+2 |
| | |_|_|_|_|_|/
| |/| | | | | | |
|
* | | | | | | | | Add /_matrix/versions to report supported versions | Daniel Wagner-Hall | 2016-01-06 | 3 | -0/+43 |
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | 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 |
* | | | | | | | Log when we skip daily messages | Daniel Wagner-Hall | 2016-01-06 | 1 | -1/+10 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-05 | 5 | -21/+5 |
* | | | | | | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 10 | -31/+84 |
* | | | | | | Use larger thumbnail rather than smaller. | Erik Johnston | 2016-01-05 | 1 | -4/+13 |
* | | | | | | Return /sync when something under the 'leave' key has changed | Erik Johnston | 2016-01-05 | 1 | -1/+1 |
* | | | | | | Use named args | Erik Johnston | 2016-01-05 | 1 | -2/+2 |
* | | | | | | Support inviting 3pids in /createRoom | Erik Johnston | 2016-01-05 | 1 | -0/+16 |
|/ / / / / |
|
* | | | / | Bump changelog and version for v0.12.0 | Mark Haines | 2016-01-04 | 1 | -1/+1 |
| |_|_|/
|/| | | |
|
* | | | | Expose /login under r0 | Richard van der Hoff | 2016-01-02 | 1 | -1/+1 |
* | | | | Bump version and update changelog for v0.12.0-rc3 v0.12.0-rc3 | Mark Haines | 2015-12-23 | 1 | -1/+1 |
* | | | | Merge pull request #457 from matrix-org/markjh/cached_sync | Mark Haines | 2015-12-23 | 2 | -1/+117 |
|\ \ \ \ |
|
| * | | | | 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 | 1 | -2/+2 |
| * | | | | 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 |
| | |_|/
| |/| | |
|
* / | | | Missing yield on guest access auth check | Mark Haines | 2015-12-23 | 1 | -1/+1 |
|/ / / |
|
* | | | 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 |
|\ \ \ |
|
| * | | | Add top level filters for filtering by room id | Mark Haines | 2015-12-22 | 1 | -33/+35 |
* | | | | 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 |
|\| | | |
|
| * | | | Return room avatar URLs in /publicRooms | Daniel Wagner-Hall | 2015-12-21 | 1 | -2/+21 |
| | |/
| |/| |
|
* | | | 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 accidentally committed debug logging | Mark Haines | 2015-12-21 | 1 | -1/+0 |
* | | Actually look up required remote server key IDs | Paul "LeoNerd" Evans | 2015-12-18 | 1 | -1/+3 |
* | | Merge pull request #450 from matrix-org/matthew/no-identicons | Matthew Hodgson | 2015-12-18 | 1 | -19/+3 |
|\ \ |
|
| * | | fix indentation level | Matthew Hodgson | 2015-12-17 | 1 | -3/+3 |
| * | | stop generating default identicons. reverts most of 582019f870adbc4a8a8a9ef97... | Matthew Hodgson | 2015-12-17 | 1 | -19/+3 |
* | | | 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 |
* | | | | Add display_name to 3pid invite in m.room.member invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+31 |
| |/ /
|/| | |
|
* | | | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 2 | -2/+13 |
|/ / |
|
* | | Fix 500 error when back-paginating search results | Richard van der Hoff | 2015-12-17 | 1 | -2/+4 |
* | | Fix typo | Daniel Wagner-Hall | 2015-12-16 | 1 | -1/+1 |
* | | Give the IS a bunch more 3pid invite context | Daniel Wagner-Hall | 2015-12-16 | 1 | -7/+60 |
* | | Merge pull request #440 from matrix-org/daniel/ise | Mark Haines | 2015-12-16 | 1 | -2/+5 |
|\ \ |
|
| * | | 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 | 3 | -5/+10 |
|\ \ \ |
|
| * | | | 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 | 1 | -1/+1 |
| * | | | Fix a race between started/stopped stream | Mark Haines | 2015-12-14 | 1 | -3/+8 |
* | | | | 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 when back popul... | Mark Haines | 2015-12-14 | 1 | -0/+5 |
| * | | | | 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 |
| * | | | | Do the /sync in parallel accross the rooms like /initialSync does | Mark Haines | 2015-12-11 | 1 | -4/+12 |
| |/ / / |
|
* | / / | Fix typo | Daniel Wagner-Hall | 2015-12-14 | 1 | -1/+1 |
| |/ /
|/| | |
|
* | | | 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 | 4 | -7/+10 |
|\| | |
|
| * | | 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 | 1 | -1/+1 |
| * | | Bump synapse version to v0.12.0 | Mark Haines | 2015-12-09 | 1 | -1/+1 |
| |/ |
|
* | | Merge pull request #435 from matrix-org/erikj/search | Erik Johnston | 2015-12-11 | 2 | -9/+72 |
|\ \ |
|
| * | | 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 |
| |/ |
|
* / | Ensure that the event that gets persisted is the one that was signed | Paul "LeoNerd" Evans | 2015-12-10 | 1 | -6/+6 |
|/ |
|
* | pep8 | David Baker | 2015-12-09 | 1 | -4/+4 |
* | Split out the push rule evaluator into a separate file so it can be more read... | David Baker | 2015-12-09 | 2 | -185/+234 |
* | Allow filter JSON object in the filter query parameter in /sync | Mark Haines | 2015-12-09 | 1 | -9/+21 |
* | Merge pull request #430 from matrix-org/daniel/unstable | Daniel Wagner-Hall | 2015-12-09 | 5 | -85/+80 |
|\ |
|
| * | 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 tict to be a list | Erik Johnston | 2015-12-01 | 1 | -6/+4 |
* | | Track the time spent in the database per request. | Mark Haines | 2015-12-07 | 5 | -4/+38 |
* | | 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 filter | Mark Haines | 2015-12-04 | 2 | -6/+10 |
* | | | Merge remote-tracking branch 'origin/master' into develop | Mark Haines | 2015-12-07 | 1 | -1/+1 |
|\ \ \ |
|
| * \ \ | Merge branch 'erikj/perspective_limiter' into release-v0.11.1 | Erik Johnston | 2015-11-20 | 2 | -22/+21 |
| |\ \ \ |
|
| * | | | | Bump changes and version | Erik Johnston | 2015-11-20 | 1 | -1/+1 |
* | | | | | 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. | Mark Haines | 2015-12-07 | 1 | -16/+24 |
| | |_|/ /
| |/| | | |
|
* | | | | | Take object not bool | Daniel Wagner-Hall | 2015-12-07 | 1 | -0/+5 |
* | | | | | Merge pull request #422 from matrix-org/markjh/schema | Mark Haines | 2015-12-04 | 5 | -24/+37 |
|\ \ \ \ \ |
|
| * | | | | | Bump schema version. | Mark Haines | 2015-12-04 | 5 | -24/+37 |
| |/ / / / |
|
* / / / / | 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 |
|\ \ \ \ |
|
| * | | | | 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 | 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 | 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 |
|\ \ \ \ \ |
|
| * | | | | | 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 |
|\ \ \ \ \ \ |
|
| * | | | | | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 2 | -18/+12 |
| |/ / / / / |
|
* | | | | | | 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 upgrad... | David Baker | 2015-12-02 | 1 | -1/+1 |
* | | | | | | 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 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | 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 |
|\ \ \ \ \ |
|
| * | | | | | 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 | 9 | -56/+91 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | 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 | 42 | -235/+835 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | Only fire user_joined_room on the distributor if the user has actually joined... | Mark Haines | 2015-12-01 | 1 | -4/+6 |
* | | | | | | | | | 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 | 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 so we only notify fo... | David Baker | 2015-12-02 | 1 | -0/+1 |
| | |/ / / / / /
| |/| | | | | | |
|
* | | | | | | | | 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 | 1 | -0/+1 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Added a single line to explain what the server_name is used for | Mads R. Christensen | 2015-12-02 | 1 | -0/+1 |
* | | | | | | | | 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 so that stati... | Mark Haines | 2015-12-01 | 7 | -53/+78 |
| | |/ / / / / /
| |/| | | | | | |
|
* | | | | | | | | 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 | Erik Johnston | 2015-12-01 | 1 | -3/+12 |
* | | | | | | | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 11 | -25/+476 |
* | | | | | | | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 26 | -115/+130 |
|/ / / / / / |
|
* | | | | | | Merge pull request #404 from matrix-org/markjh/trivial_rename | Mark Haines | 2015-12-01 | 2 | -2/+2 |
|\ \ \ \ \ \ |
|
| * | | | | | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ... | Mark Haines | 2015-12-01 | 2 | -2/+2 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | Merge pull request #402 from matrix-org/markjh/event_formatting | Mark Haines | 2015-12-01 | 1 | -9/+7 |
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | Only add the user_id if the sender is present | Mark Haines | 2015-12-01 | 1 | -1/+3 |
| * | | | | | Copy rather than move the fields to shuffle between a v1 and a v2 event. | Mark Haines | 2015-11-30 | 1 | -9/+5 |
* | | | | | | Tidy up a bit | Erik Johnston | 2015-12-01 | 1 | -8/+9 |
* | | | | | | Allow paginating search ordered by recents | Erik Johnston | 2015-11-30 | 4 | -84/+219 |
| |/ / / /
|/| | | | |
|
* | | | | | Return words to highlight in search results | Erik Johnston | 2015-11-27 | 2 | -22/+120 |
|/ / / / |
|
* | | | | Allow user to redact with an equal power | Erik Johnston | 2015-11-26 | 1 | -1/+1 |
* | | | | Fix SQL for postgres again | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+1 |
* | | | | Fix SQL for postgres | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+1 |
* | | | | Remove size specifier for database column | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+3 |
* | | | | Merge pull request #375 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-23 | 1 | -10/+15 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Clean up room initialSync for guest users | Daniel Wagner-Hall | 2015-11-13 | 1 | -10/+15 |
* | | | | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 6 | -5/+118 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into danie... | Daniel Wagner-Hall | 2015-11-19 | 14 | -74/+112 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 14 | -74/+112 |
| | |\ \ \ |
|
| * | | | | | Ignore forgotten rooms in v2 sync | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 |
| |/ / / / |
|
| * | | | | Simplify code | Daniel Wagner-Hall | 2015-11-19 | 2 | -8/+6 |
| * | | | | Apply forgetting properly to historical events | Daniel Wagner-Hall | 2015-11-18 | 2 | -3/+41 |
| * | | | | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 6 | -4/+81 |
* | | | | | Fix typo | Erik Johnston | 2015-11-20 | 2 | -3/+3 |
* | | | | | Don't limit connections to perspective servers | Erik Johnston | 2015-11-20 | 2 | -22/+21 |
| |_|_|/
|/| | | |
|
* | | | | Merge pull request #394 from matrix-org/erikj/search | Erik Johnston | 2015-11-20 | 1 | -1/+54 |
|\ \ \ \ |
|
| * | | | | Add option to include the current room state | Erik Johnston | 2015-11-20 | 1 | -0/+24 |
| * | | | | Optionally include historic profile info | Erik Johnston | 2015-11-20 | 1 | -1/+30 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #389 from matrix-org/rav/flatten_sync_response | Richard van der Hoff | 2015-11-20 | 2 | -27/+17 |
|\ \ \ \ |
|
| * | | | | Merge branch 'develop' into rav/flatten_sync_response | Paul "LeoNerd" Evans | 2015-11-19 | 15 | -75/+113 |
| |\| | | |
|
| * | | | | Put back the 'state.events' subobject | Richard van der Hoff | 2015-11-19 | 1 | -1/+1 |
| * | | | | v2 /sync: Rename the keys of the 'rooms' object to match member states | Richard van der Hoff | 2015-11-19 | 1 | -3/+3 |
| * | | | | Flatten the /sync response to remove the event_map | Richard van der Hoff | 2015-11-19 | 2 | -24/+14 |
* | | | | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flow | Erik Johnston | 2015-11-20 | 1 | -1/+10 |
|\ \ \ \ \ |
|
| * | | | | | Comment | Erik Johnston | 2015-11-20 | 1 | -0/+8 |