| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix GET /push_rules | Erik Johnston | 2016-05-31 | 1 | -0/+3 |
* | Allow clients to specify a server_name to avoid 'No known servers' | Kegan Dougal | 2016-05-19 | 1 | -1/+4 |
* | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 1 | -4/+3 |
* | Move SyncHandler out of the Handlers object | Mark Haines | 2016-05-16 | 1 | -2/+1 |
* | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 4 | -9/+17 |
* | Clean up the blacklist/whitelist handling. | Mark Haines | 2016-05-16 | 1 | -33/+30 |
* | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -0/+71 |
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 3 | -0/+159 |
|\ |
|
| * | Rename openid/token to openid/request_token | Mark Haines | 2016-05-05 | 1 | -2/+2 |
| * | Add an openidish mechanism for proving to third parties that you own a given ... | Mark Haines | 2016-05-05 | 2 | -0/+98 |
| * | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 1 | -0/+2 |
| * | Move event_id to path | Erik Johnston | 2016-05-04 | 1 | -4/+2 |
| * | Add /report endpoint | Erik Johnston | 2016-05-04 | 2 | -0/+61 |
* | | More consistent config naming | David Baker | 2016-05-10 | 1 | -1/+1 |
* | | Add config option to not send email notifs for new users | David Baker | 2016-05-10 | 1 | -1/+4 |
* | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -0/+1 |
|\| |
|
| * | Fix password reset | David Baker | 2016-04-29 | 1 | -0/+1 |
* | | Add an email pusher for new users | David Baker | 2016-04-29 | 1 | -0/+26 |
|/ |
|
* | Report per request metrics for all of the things using request_handler | Mark Haines | 2016-04-28 | 6 | -7/+9 |
* | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 1 | -5/+7 |
* | Merge pull request #687 from nikriek/jwt-fix | Erik Johnston | 2016-04-21 | 1 | -3/+6 |
|\ |
|
| * | Fix issues with JWT login | Niklas Riekenbrauck | 2016-04-21 | 1 | -3/+6 |
* | | Add self.media_repo to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 |
* | | _make_dirs was moved to MediaRepository | Erik Johnston | 2016-04-19 | 1 | -1/+1 |
* | | Add store to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 |
* | | Reorder imports | Erik Johnston | 2016-04-19 | 1 | -7/+8 |
* | | Move MediaRepository to media_repository module | Erik Johnston | 2016-04-19 | 5 | -489/+496 |
* | | Split out BaseMediaResource into MediaRepository | Erik Johnston | 2016-04-19 | 6 | -138/+180 |
* | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes... | Matthew Hodgson | 2016-04-15 | 1 | -6/+18 |
* | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, r... | Matthew Hodgson | 2016-04-15 | 1 | -16/+8 |
* | | fix urlparse import thinko breaking tiny URLs | Matthew Hodgson | 2016-04-14 | 1 | -5/+5 |
* | | Make v2_alpha reg follow the AS API specification | Kegan Dougal | 2016-04-14 | 1 | -0/+5 |
* | | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of https://e... | Matthew Hodgson | 2016-04-14 | 1 | -16/+16 |
* | | Sanitize the optional dependencies for spider API | Erik Johnston | 2016-04-13 | 2 | -27/+3 |
* | | Make the /set part mandatory | David Baker | 2016-04-12 | 1 | -1/+1 |
* | | Mis-named function | David Baker | 2016-04-12 | 1 | -1/+1 |
* | | Split into separate servlet classes | David Baker | 2016-04-12 | 1 | -11/+16 |
* | | Add get endpoint for pushers | David Baker | 2016-04-11 | 1 | -1/+34 |
* | | PEP8 | Erik Johnston | 2016-04-11 | 1 | -1/+0 |
* | | fix typos and needless try/except from PR review | Matthew Hodgson | 2016-04-11 | 1 | -143/+140 |
* | | actually throw meaningful errors | Matthew Hodgson | 2016-04-08 | 1 | -9/+24 |
* | | Fix pep8 warning | Mark Haines | 2016-04-08 | 1 | -3/+4 |
* | | more PR feedback | Matthew Hodgson | 2016-04-08 | 1 | -4/+8 |
* | | Add url_preview_enabled config option to turn on/off preview_url endpoint. de... | Matthew Hodgson | 2016-04-08 | 2 | -18/+64 |
* | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 3 | -36/+133 |
|\| |
|
| * | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -36/+43 |
| * | Remove spurious comment | Erik Johnston | 2016-03-30 | 1 | -1/+0 |
| * | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 1 | -0/+38 |
| * | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 1 | -0/+53 |
* | | report image size (bytewise) in OG meta | Matthew Hodgson | 2016-04-03 | 1 | -0/+2 |
* | | char encoding | Matthew Hodgson | 2016-04-03 | 1 | -0/+1 |
* | | pep8 | Matthew Hodgson | 2016-04-03 | 2 | -55/+73 |
* | | fix etag typing error. fix timestamp typing error | Matthew Hodgson | 2016-04-03 | 1 | -2/+2 |
* | | rebase all image URLs | Matthew Hodgson | 2016-04-03 | 1 | -4/+4 |
* | | remove stale todo | Matthew Hodgson | 2016-04-03 | 1 | -3/+0 |
* | | Ensure only one download for a given URL is active at a time | Matthew Hodgson | 2016-04-03 | 1 | -1/+18 |
* | | add a persistent cache of URL lookups, and fix up the in-memory one to work | Matthew Hodgson | 2016-04-03 | 1 | -10/+54 |
* | | support gzip compression, and don't pass through error msgs | Matthew Hodgson | 2016-04-02 | 1 | -2/+3 |
* | | how was _respond_default_thumbnail ever meant to work? | Matthew Hodgson | 2016-04-02 | 1 | -0/+2 |
* | | pass back SVGs as their own thumbnails | Matthew Hodgson | 2016-04-02 | 1 | -0/+20 |
* | | handle missing dimensions without crashing | Matthew Hodgson | 2016-04-02 | 1 | -4/+13 |
* | | make meta comparisons case insensitive | Matthew Hodgson | 2016-04-02 | 1 | -2/+2 |
* | | refactor calc_og; spider image URLs; fix xpath; add a (broken) expiringcache;... | Matthew Hodgson | 2016-04-02 | 1 | -81/+121 |
* | | fix assorted redirect, unicode and screenscraping bugs | Matthew Hodgson | 2016-04-01 | 1 | -78/+96 |
* | | handle spidered relative images correctly | Matthew Hodgson | 2016-03-31 | 1 | -2/+12 |
* | | prevent choking on invalid utf-8, and handle image thumbnailing smarter | Matthew Hodgson | 2016-03-31 | 1 | -5/+18 |
* | | synthesise basig OG metadata from pages lacking it | Matthew Hodgson | 2016-03-31 | 1 | -0/+47 |
* | | handle requests with missing content-length headers (e.g. YouTube) | Matthew Hodgson | 2016-03-31 | 1 | -2/+2 |
* | | fix bugs | Matthew Hodgson | 2016-03-29 | 1 | -5/+6 |
* | | debug | Matthew Hodgson | 2016-03-29 | 1 | -3/+2 |
* | | make it work | Matthew Hodgson | 2016-03-29 | 2 | -55/+77 |
* | | make it build | Matthew Hodgson | 2016-03-29 | 1 | -8/+9 |
* | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-29 | 2 | -0/+45 |
|\| |
|
| * | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 1 | -0/+3 |
| * | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+42 |
* | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-27 | 28 | -661/+466 |
|\| |
|
| * | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 1 | -1/+2 |
| |\ |
|
| | * | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
| * | | remove debug logging | David Baker | 2016-03-16 | 1 | -3/+0 |
| * | | Unused import | David Baker | 2016-03-16 | 1 | -1/+0 |
| * | | Make registration idempotent, part 2: be idempotent if the client specifies a... | David Baker | 2016-03-16 | 1 | -5/+17 |
| |/ |
|
| * | take extra return val from check_auth in account too | David Baker | 2016-03-16 | 1 | -1/+1 |
| * | pep8 & remove debug logging | David Baker | 2016-03-16 | 1 | -4/+5 |
| * | Make registration idempotent: if you specify the same session, make it give y... | David Baker | 2016-03-16 | 1 | -1/+26 |
| * | Hook up adding a pusher to the notifier for replication. | Mark Haines | 2016-03-15 | 1 | -0/+6 |
| * | Fix regression where synapse checked whether push rules were valid JSON befor... | Mark Haines | 2016-03-14 | 1 | -2/+2 |
| * | Merge pull request #642 from matrix-org/erikj/logout | Erik Johnston | 2016-03-11 | 2 | -0/+74 |
| |\ |
|
| | * | Implement logout | Erik Johnston | 2016-03-11 | 2 | -0/+74 |
| * | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 8 | -81/+31 |
| |/ |
|
| * | Fix cache invalidation so deleting access tokens (which we did when changing ... | David Baker | 2016-03-11 | 1 | -1/+1 |
| * | Register endpoint returns refresh_token | blide | 2016-03-10 | 1 | -5/+8 |
| * | Add a parse_json_object function | Mark Haines | 2016-03-09 | 10 | -116/+32 |
| * | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 6 | -6/+6 |
| * | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 1 | -1/+1 |
| * | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 3 | -10/+11 |
| |\ |
|
| | * | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 1 | -3/+0 |
| | |\ |
|
| | | * | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 1 | -3/+0 |
| | * | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 3 | -7/+11 |
| | |/ |
|
| * | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 1 | -1/+1 |
| * | | Move the code for formatting push rules into a separate function | Mark Haines | 2016-03-03 | 1 | -86/+4 |
| * | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 1 | -15/+29 |
| |/ |
|
| * | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 1 | -4/+27 |
| * | Fix to appease the PEP8 dragon | Gergely Polonkai | 2016-02-26 | 1 | -1/+3 |
| * | Add error codes for malformed/bad JSON in /login | Gergely Polonkai | 2016-02-26 | 1 | -2/+2 |
| * | Make sure we return a JSON object when returning the values of specif… | Mark Haines | 2016-02-25 | 1 | -1/+3 |
| * | Remove unused get_rule_attr method | Mark Haines | 2016-02-24 | 1 | -8/+0 |
| * | Ignore invalid POST bodies when joining rooms | Daniel Wagner-Hall | 2016-02-24 | 1 | -2/+12 |
| * | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -0/+4 |
| * | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 4 | -28/+35 |
| |\ |
|
| | * | "You are not..." | Erik Johnston | 2016-02-18 | 1 | -1/+1 |
| | * | Initial cut | Erik Johnston | 2016-02-17 | 4 | -28/+35 |
| * | | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 2 | -88/+8 |
| * | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 2 | -2/+2 |
| |\| |
|
| | * | client/v1/room: include event_id in response to state event PUT, in accordanc... | Patrik Oldsberg | 2016-02-17 | 1 | -2/+2 |
| | * | Fix typo in request validation for adding push rules. | Mark Haines | 2016-02-16 | 1 | -1/+1 |
| | * | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
| * | | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 1 | -3/+3 |
| * | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -5/+16 |
| * | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
| * | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 1 | -16/+5 |
| * | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 1 | -37/+31 |
| * | | Merge some room joining codepaths | Daniel Wagner-Hall | 2016-02-15 | 1 | -1/+1 |
| |/ |
|
| * | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 1 | -13/+55 |
| * | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 1 | -55/+13 |
| * | Catch the exceptions thrown by twisted when you write to a closed connection | Mark Haines | 2016-02-12 | 4 | -10/+13 |
| * | Add some paranoia logging | Erik Johnston | 2016-02-11 | 1 | -0/+10 |
| * | Revert "Reject additional path segments" | Daniel Wagner-Hall | 2016-02-09 | 3 | -6/+6 |
| * | Merge pull request #564 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-08 | 2 | -4/+4 |
| |\ |
|
| | * | Fix up logcontexts | Erik Johnston | 2016-02-08 | 2 | -4/+4 |
| * | | Reject additional path segments | Daniel Wagner-Hall | 2016-02-08 | 3 | -6/+6 |
| |/ |
|
| * | Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null | David Baker | 2016-02-04 | 1 | -6/+17 |
| |\ |
|
| | * | No braces here | David Baker | 2016-02-03 | 1 | -1/+1 |
| | * | Don't return null if profile display name / avatar url isn't set: omit them i... | David Baker | 2016-02-03 | 1 | -6/+17 |
| * | | Remove old log line | Erik Johnston | 2016-02-03 | 1 | -2/+0 |
| * | | Preserve log context over when deferring to thread pool in media repo | Erik Johnston | 2016-02-03 | 1 | -4/+7 |
| |/ |
|
| * | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 2 | -3/+3 |
| * | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 5 | -8/+8 |
| * | Merge pull request #545 from matrix-org/erikj/sync | Erik Johnston | 2016-02-02 | 1 | -75/+0 |
| |\ |
|
| | * | Move state calculations from rest to handler | Erik Johnston | 2016-02-01 | 1 | -75/+0 |
| * | | Pull guest access token out of the auth session params, otherwise it will bre... | David Baker | 2016-02-01 | 1 | -0/+1 |
| |/ |
|
| * | Allow three_pid_creds as well as threePidCreds in /account/3pid | Mark Haines | 2016-01-29 | 1 | -2/+3 |
| * | Fix adding push rules relative to other rules | Mark Haines | 2016-01-27 | 1 | -5/+10 |
| * | Merge pull request #528 from matrix-org/markjh/missing_yield | Mark Haines | 2016-01-25 | 1 | -2/+2 |
| |\ |
|
| | * | Add missing yield in push_rules set enabled | Mark Haines | 2016-01-25 | 1 | -2/+2 |
| * | | Move logic from rest/ to handlers/ | Erik Johnston | 2016-01-25 | 1 | -34/+23 |
| |/ |
|
| * | Sanitize filters | Erik Johnston | 2016-01-22 | 2 | -13/+13 |
* | | initial WIP of a tentative preview_url endpoint - incomplete, untested, exper... | Matthew Hodgson | 2016-01-24 | 2 | -0/+167 |
|/ |
|
* | Fix change_password | Erik Johnston | 2016-01-20 | 1 | -3/+2 |
* | Whine if we give a from param to /sync | Erik Johnston | 2016-01-20 | 1 | -0/+7 |
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 2 | -4/+3 |
* | Only compute unread notifications for rooms we send down stream | Erik Johnston | 2016-01-19 | 1 | -2/+1 |
* | Return highlight_count in /sync | Erik Johnston | 2016-01-19 | 1 | -0/+1 |
* | Take a deepcopy of push rules before mutating them | Erik Johnston | 2016-01-19 | 1 | -1/+3 |
* | Use static for const dicts | Erik Johnston | 2016-01-18 | 1 | -1/+7 |
* | Remove internal ids | Erik Johnston | 2016-01-18 | 1 | -0/+4 |
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -39/+12 |
* | Merge branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 1 | -0/+6 |
|\ |
|
| * | Add 'event' result to 'context' endpoint | Richard van der Hoff | 2016-01-13 | 1 | -0/+6 |
* | | Fix enabling & disabling push rules | David Baker | 2016-01-14 | 1 | -1/+1 |
* | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest o... | Mark Haines | 2016-01-13 | 2 | -7/+7 |
* | | Merge pull request #478 from matrix-org/daniel/userobject | Daniel Wagner-Hall | 2016-01-11 | 19 | -128/+159 |
|\ \ |
|
| * | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 19 | -128/+159 |
* | | | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 2 | -1/+5 |
|\ \ \ |
|
| * \ \ | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-06 | 1 | -6/+1 |
| |\ \ \ |
|
| * | | | | Add is_guest flag to users db to track whether a user is a guest user or not.... | David Baker | 2016-01-06 | 1 | -1/+4 |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-05 | 2 | -8/+23 |
| |\ \ \ \ |
|
| * | | | | | Only joined rooms have unread_notif_count | David Baker | 2016-01-04 | 1 | -1/+1 |
| * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-04 | 1 | -1/+1 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-22 | 1 | -1/+9 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 2 | -7/+22 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | still very WIP, but now sends unread_notifications_count in the room object o... | David Baker | 2015-12-16 | 1 | -0/+1 |
* | | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail. | Mark Haines | 2016-01-07 | 1 | -1/+1 |
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | copyrights | Matthew Hodgson | 2016-01-07 | 43 | -43/+43 |
* | | | | | | | Add /_matrix/versions to report supported versions | Daniel Wagner-Hall | 2016-01-06 | 2 | -0/+42 |
| |_|_|_|_|/
|/| | | | | |
|
* | | | | | | Guest users must be joined to a room to see it in /sync | Mark Haines | 2016-01-06 | 1 | -6/+1 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 2 | -4/+10 |
* | | | | | Use larger thumbnail rather than smaller. | Erik Johnston | 2016-01-05 | 1 | -4/+13 |
| |_|_|/
|/| | | |
|
* | | | | Expose /login under r0 | Richard van der Hoff | 2016-01-02 | 1 | -1/+1 |
| |_|/
|/| | |
|
* | | | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 1 | -1/+9 |
| |/
|/| |
|
* | | Remove accidentally committed debug logging | Mark Haines | 2015-12-21 | 1 | -1/+0 |
* | | 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 |
* | | 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 |
* | | Missing yield | Mark Haines | 2015-12-10 | 1 | -1/+1 |
|/ |
|
* | Allow filter JSON object in the filter query parameter in /sync | Mark Haines | 2015-12-09 | 1 | -9/+21 |
* | Actually host r0 and unstable prefixes | Daniel Wagner-Hall | 2015-12-08 | 3 | -67/+67 |
* | 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 |
* | Take object not bool | Daniel Wagner-Hall | 2015-12-07 | 1 | -0/+5 |
* | 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 |
* | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 1 | -1/+1 |
|/ |
|
* | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 1 | -5/+2 |
* | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 3 | -0/+119 |
* | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 23 | -104/+118 |
* | Rename presence_handler.send_invite to presence_handler.send_presence_invite ... | Mark Haines | 2015-12-01 | 1 | -1/+1 |
* | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 1 | -3/+10 |
|\ |
|
| * | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 2 | -5/+5 |
| |\ |
|
| * | | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -3/+10 |
* | | | Merge pull request #389 from matrix-org/rav/flatten_sync_response | Richard van der Hoff | 2015-11-20 | 1 | -25/+16 |
|\ \ \ |
|
| * \ \ | Merge branch 'develop' into rav/flatten_sync_response | Paul "LeoNerd" Evans | 2015-11-19 | 2 | -5/+5 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | 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 | 1 | -22/+13 |
| | |/
| |/| |
|
* | | | 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 |
| * | | Remove m.login.token from advertised flows. | Erik Johnston | 2015-11-19 | 1 | -1/+2 |
| |/ |
|
* / | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 2 | -5/+5 |
|/ |
|
* | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 3 | -15/+152 |
|\ |
|
| * | Allow guests to /room/:room_id/{join,leave} | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 |
| * | Implementation of state rollback in /sync | Richard van der Hoff | 2015-11-13 | 1 | -2/+65 |
| * | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 1 | -1/+1 |
| * | Update some comments | Richard van der Hoff | 2015-11-13 | 1 | -0/+56 |
| * | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+2 |
| |\ |
|
| | * | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 1 | -1/+2 |
| * | | Allow guests to set their display names | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+1 |
| * | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 1 | -2/+2 |
| |/ |
|
| * | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -3/+10 |
| * | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 1 | -2/+1 |
| |\ |
|
| | * | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 1 | -2/+1 |
| * | | Add a couple of unit tests for room/<x>/messages | Richard van der Hoff | 2015-11-09 | 1 | -1/+1 |
| |/ |
|
* | | Snakes not camels | Steven Hammerton | 2015-11-11 | 1 | -5/+5 |
* | | Minor review fixes | Steven Hammerton | 2015-11-11 | 1 | -13/+10 |
* | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-05 | 2 | -17/+25 |
|\| |
|
| * | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 1 | -1/+2 |
| |\ |
|
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-11-05 | 19 | -47/+84 |
| | |\ |
|
| | * | | Implement basic pagination for search results | Erik Johnston | 2015-11-05 | 1 | -1/+2 |
| * | | | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 1 | -12/+8 |
| | |/
| |/| |
|
| * | | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 2 | -4/+15 |
* | | | Allow hs to do CAS login completely and issue the client with a login token t... | Steven Hammerton | 2015-11-05 | 1 | -1/+144 |
|/ / |
|
* / | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 19 | -46/+72 |
|/ |
|
* | That TODO was done | Mark Haines | 2015-11-03 | 1 | -1/+0 |
* | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 1 | -0/+5 |
* | Store room tag content and return the content in the m.tag event | Mark Haines | 2015-11-02 | 1 | -2/+10 |
* | Merge branch 'develop' into markjh/room_tags | Mark Haines | 2015-11-02 | 2 | -2/+40 |
|\ |
|
| * | Merge pull request #334 from matrix-org/erikj/context_api | Erik Johnston | 2015-10-28 | 1 | -0/+36 |
| |\ |
|
| | * | Add room context api | Erik Johnston | 2015-10-28 | 1 | -0/+36 |
| * | | Implement full_state incremental sync | Richard van der Hoff | 2015-10-26 | 1 | -2/+4 |
| |/ |
|
* | | Inform the client of new room tags using v1 /events | Mark Haines | 2015-10-29 | 1 | -3/+11 |
* | | Fix pyflakes errors | Mark Haines | 2015-10-28 | 1 | -0/+2 |
* | | Add APIs for adding and removing tags from rooms | Mark Haines | 2015-10-28 | 2 | -0/+91 |
|/ |
|
* | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-10-23 | 1 | -1/+7 |
|\ |
|
| * | Add config option to disable password login | Erik Johnston | 2015-10-22 | 1 | -1/+7 |
* | | Merge pull request #319 from matrix-org/erikj/filter_refactor | Erik Johnston | 2015-10-22 | 1 | -2/+2 |
|\ \ |
|
| * | | Refactor api.filtering to have a Filter API | Erik Johnston | 2015-10-20 | 1 | -2/+2 |
* | | | Merge pull request #316 from matrix-org/markjh/v2_sync_archived | Mark Haines | 2015-10-21 | 1 | -6/+23 |
|\ \ \ |
|
| * | | | Add rooms that the user has left under archived in v2 sync. | Mark Haines | 2015-10-19 | 1 | -6/+23 |