| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #504 from matrix-org/erikj/highlight_count | Erik Johnston | 2016-01-19 | 3 | -8/+40 |
|\ |
|
| * | Return highlight_count in /sync | Erik Johnston | 2016-01-19 | 3 | -8/+40 |
* | | Merge pull request #486 from matrix-org/default_notify | Erik Johnston | 2016-01-19 | 1 | -1/+0 |
|\ \
| |/
|/| |
|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into default_notify | Erik Johnston | 2016-01-19 | 29 | -1222/+945 |
| |\
| |/
|/| |
|
* | | Merge pull request #502 from matrix-org/erikj/push_notif_perf | Erik Johnston | 2016-01-19 | 13 | -954/+550 |
|\ \ |
|
| * | | Take a deepcopy of push rules before mutating them | Erik Johnston | 2016-01-19 | 1 | -1/+3 |
| * | | Update _id | Erik Johnston | 2016-01-19 | 1 | -2/+3 |
| * | | Preserve truthiness | Erik Johnston | 2016-01-18 | 1 | -1/+2 |
| * | | You need to escape backslashes | Erik Johnston | 2016-01-18 | 1 | -2/+2 |
| * | | Fix branch didn't check word_boundary | Erik Johnston | 2016-01-18 | 1 | -3/+9 |
| * | | Remove dead code | Erik Johnston | 2016-01-18 | 1 | -22/+1 |
| * | | Don't split at word boundaries, actually use regex | Erik Johnston | 2016-01-18 | 2 | -63/+48 |
| * | | Drop log levels | Erik Johnston | 2016-01-18 | 1 | -2/+2 |
| * | | Add comments and remove dead code | Erik Johnston | 2016-01-18 | 1 | -12/+11 |
| * | | Do for loop once at start | Erik Johnston | 2016-01-18 | 1 | -8/+17 |
| * | | Use static for const dicts | Erik Johnston | 2016-01-18 | 4 | -198/+209 |
| * | | Remove internal ids | Erik Johnston | 2016-01-18 | 1 | -0/+4 |
| * | | Don't edit ruleset | Erik Johnston | 2016-01-18 | 1 | -5/+4 |
| * | | Make unit tests work | Erik Johnston | 2016-01-18 | 3 | -560/+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 |
* | | | Merge pull request #503 from matrix-org/daniel/nonghosts | Daniel Wagner-Hall | 2016-01-19 | 1 | -31/+30 |
|\ \ \
| |/ /
|/| | |
|
| * | | Don't error on AS non-ghost user use | Daniel Wagner-Hall | 2016-01-18 | 1 | -0/+2 |
| * | | Pull out app service user lookup | Daniel Wagner-Hall | 2016-01-18 | 1 | -31/+28 |
|/ / |
|
* | | Merge pull request #501 from matrix-org/daniel/unban | Daniel Wagner-Hall | 2016-01-15 | 6 | -58/+116 |
|\ \ |
|
| * | | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 6 | -58/+116 |
|/ / |
|
* | | Merge pull request #500 from matrix-org/daniel/cleanup | Daniel Wagner-Hall | 2016-01-15 | 2 | -16/+8 |
|\ \ |
|
| * | | Remove unused parameters | Daniel Wagner-Hall | 2016-01-15 | 2 | -16/+8 |
|/ / |
|
* | | Merge branch 'invalid_user_name' into develop | David Baker | 2016-01-15 | 2 | -2/+2 |
|\ \ |
|
| * | | M_INVALID_USERNAME to be consistent with the parameter name | David Baker | 2016-01-15 | 2 | -2/+2 |
* | | | Merge pull request #499 from matrix-org/invalid_user_name | David Baker | 2016-01-15 | 2 | -1/+3 |
|\| | |
|
| * | | 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 |
|\ \ \ |
|
| * \ \ | Merge pull request #492 from matrix-org/rav/event_context_shiz_release github/release-v0.12.1 release-v0.12.1 | 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 |
| |/ / / |
|
* | | | | Merge pull request #496 from matrix-org/daniel/3 | Daniel Wagner-Hall | 2016-01-14 | 3 | -17/+111 |
|\ \ \ \ |
|
| * | | | | Require ID and as_token be unique for ASs | Daniel Wagner-Hall | 2016-01-14 | 3 | -17/+111 |
|/ / / / |
|
* | | | | 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 branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 1 | -0/+8 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-13 | 5 | -21/+5 |
| * | | | Merge pull request #476 from koobs/patch-1 | Matthew Hodgson | 2016-01-08 | 1 | -0/+8 |
| |\ \ \ |
|
| | * | | | Add FreeBSD install section & instructions | Kubilay Kocak | 2016-01-09 | 1 | -0/+8 |
| |/ / / |
|
* | | | | 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 |
* | | | | Merge pull request #495 from matrix-org/erikj/disable_notification | Erik Johnston | 2016-01-14 | 3 | -6/+13 |
|\ \ \ \ |
|
| * | | | | 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 |
|/ / / / |
|
* | | | | Merge pull request #488 from matrix-org/markjh/user_name | Mark Haines | 2016-01-13 | 9 | -99/+99 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest o... | Mark Haines | 2016-01-13 | 9 | -99/+99 |
|/ / / |
|
| | * | Change default pushrules back to notifying for all messages. | David Baker | 2016-01-13 | 1 | -1/+0 |
| |/
|/| |
|
* | | Merge pull request #482 from matrix-org/markjh/table_name | Mark Haines | 2016-01-13 | 7 | -128/+41 |
|\ \ |
|
| * \ | Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/t... | Mark Haines | 2016-01-13 | 3 | -26/+13 |
| |\ \ |
|
| * | | | Delete the table objects from TransactionStore | Mark Haines | 2016-01-13 | 3 | -60/+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 #483 from matrix-org/erikj/bulk_get_push_rules | Erik Johnston | 2016-01-13 | 1 | -21/+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 |
| |/ / |
|
* | | | Merge pull request #481 from matrix-org/erikj/SYN-589 | Erik Johnston | 2016-01-12 | 1 | -1/+5 |
|\ \ \
| |/ /
|/| | |
|
| * | | Don't include old left rooms | Erik Johnston | 2016-01-12 | 1 | -1/+5 |
|/ / |
|
* | | Merge pull request #478 from matrix-org/daniel/userobject | Daniel Wagner-Hall | 2016-01-11 | 24 | -144/+178 |
|\ \ |
|
| * | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 24 | -144/+178 |
* | | | 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 | 19 | -36/+541 |
|\ \ \ |
|
| * | | | 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 |
| * | | | | 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 not.... | David Baker | 2016-01-06 | 9 | -31/+69 |
| * | | | | 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 one,... | David Baker | 2015-12-22 | 4 | -22/+159 |
| * | | | | | | | 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 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 |
* | | | | | | | | | 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. | 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 |
| | |_|_|_|/ / /
| |/| | | | | | |
|
* | | | | | | | | 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 | 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 | 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 | 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 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | 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 | 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 | Daniel Wagner-Hall | 2016-01-05 | 5 | -21/+5 |
|/ / / / / / |
|
* | | | | | | Merge pull request #462 from matrix-org/daniel/guestupgrade | Daniel Wagner-Hall | 2016-01-05 | 11 | -40/+93 |
|\ \ \ \ \ \ |
|
| * | | | | | | 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 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 | 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 |
|\ \ \ \ \ \ |
|
| * | | | | | | 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 github/release-v0.12.0 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 | 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 | 2 | -1/+25 |
| * | | | | Merge pull request #457 from matrix-org/markjh/cached_sync | Mark Haines | 2015-12-23 | 3 | -1/+177 |
| |\ \ \ \ |
|
| | * | | | | 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 | Mark Haines | 2015-12-23 | 1 | -1/+1 |
| |/ / / |
|
| * | | | Merge pull request #455 from matrix-org/markjh/guest_access | Mark Haines | 2015-12-22 | 4 | -50/+144 |
| |\ \ \ |
|
| | * | | | 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 |
| | |\ \ \
| | |/ / /
| |/| | | |
|
| * | | | | 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 | Mark Haines | 2015-12-22 | 2 | -34/+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 |
| | |\ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Merge pull request #453 from matrix-org/daniel/avatarurls | Daniel Wagner-Hall | 2015-12-21 | 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 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 | Paul "LeoNerd" Evans | 2015-12-18 | 1 | -1/+3 |
| |/ / |
|
| * | | 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 | 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 |
| |\ \ |
|
| | * | | 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 |
| * | | | | 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 | 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 | Daniel Wagner-Hall | 2015-12-17 | 2 | -2/+13 |
| |/ / |
|
| * | | 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 | Richard van der Hoff | 2015-12-17 | 1 | -2/+4 |
| |/ / |
|
| * | | 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 | 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 | 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 | 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 | 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 |
| |\ \ \ \ |
|
| | * | | | | 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 |
| | * | | | | Merge pull request #442 from matrix-org/markjh/missing_prev_content | Mark Haines | 2015-12-14 | 1 | -3/+6 |
| | |\ \ \ \ |
|
| | | * | | | | 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 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 | 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 | 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 | Mark Haines | 2015-12-11 | 1 | -5/+3 |
| | |/ / |
|
| | * | | Merge pull request #434 from matrix-org/markjh/forget_rooms | Mark Haines | 2015-12-10 | 3 | -6/+9 |
| | |\ \ |
|
| | | * | | 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 | 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 | 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 |
| |\ \ |
|
| | * | | 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 |
| |/ / |
|
| * | | 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 | 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 |
| |\ \ \
| | |/ /
| |/| | |
|