| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | | * | 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 |
| | |/ | | | | | | | This will enable more detailed decisions | ||||
| * | | 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 |
| | | | | | | | See matrix-org/matrix-doc#283 Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules`` | ||||
| * | 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 |
| | | | | | Signed-off-by: Gergely Polonkai <gergely@polonkaieu> | ||||
| * | Make sure we return a JSON object when returning the values of specif… | Mark Haines | 2016-02-25 | 1 | -1/+3 |
| | | | | | …ic keys from a push rule | ||||
| * | 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 |
| |\ | | | | | Rewrite presence for performance. | ||||
| | * | "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 |
| | | | | | | | | | | | | | It wasn't possible to hit the code from the API because of a typo in parsing the request path. Since no-one was using the feature we might as well remove the dead code. | ||||
| * | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 2 | -2/+2 |
| |\| | | | | | | | | | Conflicts: synapse/rest/client/v1/room.py | ||||
| | * | client/v1/room: include event_id in response to state event PUT, in ↵ | Patrik Oldsberg | 2016-02-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | accordance with the spec Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| | * | 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 |
| | | | | | | | | | | | I'm not particularly happy with the "action" switching, but there's no convenient way to defer the work that needs to happen after it, so... :( | ||||
| * | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -5/+16 |
| | | | | | | | | | Unclean, needs tidy-up, but works | ||||
| * | | 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 |
| | | | | | | | | | | | This code is kind of rough (passing the remote servers down a long chain), but is a step towards improvement. | ||||
| * | | Merge some room joining codepaths | Daniel Wagner-Hall | 2016-02-15 | 1 | -1/+1 |
| |/ | | | | | | Force joining by alias to go through the send_membership_event checks, rather than bypassing them straight into _do_join. This is the first of many stages of cleanup. | ||||
| * | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 1 | -13/+55 |
| | | | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check | ||||
| * | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 1 | -55/+13 |
| | | | | | | | | | | | | | | There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point. | ||||
| * | 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 |
| | | | | | | | This reverts commit 1d19a5ec0fff73af9cee8c21118020b31be47379. iOS Console is apparently relying on these paths. | ||||
| * | Merge pull request #564 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-08 | 2 | -4/+4 |
| |\ | | | | | Fix up logcontexts | ||||
| | * | 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 |
| |\ | | | | | Omit keys rather then returning null in profile API | ||||
| | * | 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 ↵ | David Baker | 2016-02-03 | 1 | -6/+17 |
| | | | | | | | | | instead | ||||
| * | | 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 /sync state calculations from rest to handler | ||||
| | * | 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 ↵ | David Baker | 2016-02-01 | 1 | -0/+1 |
| |/ | | | | break if you open the email on a different device. | ||||
| * | 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 | ||||
| | * | 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 |
| | | |||||
| * | 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 |
| | | | | | | | | | ... because the context isn't much use without the event. | ||||
| * | | 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 ↵ | Mark Haines | 2016-01-13 | 2 | -7/+7 |
| | | | | | | | | | of the code | ||||
| * | | Merge pull request #478 from matrix-org/daniel/userobject | Daniel Wagner-Hall | 2016-01-11 | 19 | -128/+159 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a User object I'm sick of passing around more and more things as tuple items around the whole world, and needing to edit every call site every time there is more information about a user. So pass them around together as an object. This object has incredibly poorly named fields because we have a convention that `user` indicates a UserID object, and `user_id` indicates a string. I tried to clean up the whole repo to fix this, but gave up. So instead, I introduce a second convention. A user_object is a User, and a user_id_object is a UserId. I may have cried a little bit. | ||||
| | * | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 19 | -128/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up. | ||||
| * | | | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 2 | -1/+5 |
| |\ \ \ | | | | | | | | | Send unread notification counts | ||||
| | * \ \ | 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 ↵ | David Baker | 2016-01-06 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | 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 | 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 ↵ | David Baker | 2015-12-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs). | ||||
| * | | | | | | | | 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. | ||||
| * | | | | | | | 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 |
| | |_|/ |/| | | | | | | | | The spec says /login should be available at r0 and 'unstable', so make it so. | ||||
| * | | | 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 |
| | | | | | Documented by matrix-org/matrix-doc#224 | ||||
| * | 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 |
| | | | | | | | Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212 | ||||
| * | 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 |
| | | | |||||
| * | | 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 |
| | | | | | to distinguish it from normal invites | ||||
| * | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 1 | -3/+10 |
| |\ | | | | | Allow users to forget rooms | ||||
| | * | 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 |
| |\ \ \ | | | | | | | | | v2 sync: Get rid of the event_map, and rename the keys of the rooms obj | ||||
| | * \ \ | 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 |
| | | | | | | | | | | | | | | | | | We're keeping 'events', in case we decide to add more keys later. | ||||
| | * | | | v2 /sync: Rename the keys of the 'rooms' object to match member states | Richard van der Hoff | 2015-11-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | joined->join invited->invite archived->leave | ||||
| | * | | | 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 |
| |\ \ \ | |_|/ |/| | | Remove m.login.token from advertised flows. | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | Implementation of SPEC-254: roll back the state dictionary to how it looked at the start of the timeline. Merged PR https://github.com/matrix-org/synapse/pull/373 | ||||
| | * | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371 | ||||
| | * | Update some comments | Richard van der Hoff | 2015-11-13 | 1 | -0/+56 |
| | | | | | | | | | | | | | | | Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370. | ||||
| | * | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+2 |
| | |\ | | | | | | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync | ||||
| | | * | 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 |
| | | | | | | | | | | | | | | | | Depends: https://github.com/matrix-org/synapse/pull/363 Tests in https://github.com/matrix-org/sytest/pull/66 | ||||
| | * | | 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 | ||||
| | | * | 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 |
| | |/ | | | | | | | ... merely because I was trying to figure out how it worked, and couldn't. | ||||
| * | | 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 |
| | |\ | | | | | | | Implement pagination, order by and groups in search | ||||
| | | * | 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 |
| | | | | | | | | | | | | | Squash-merge of PR #345 from daniel/anonymousevents | ||||
| * | | | Allow hs to do CAS login completely and issue the client with a login token ↵ | Steven Hammerton | 2015-11-05 | 1 | -1/+144 |
| |/ / | | | | | | | that can be redeemed for the usual successful login response | ||||
| * / | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 19 | -46/+72 |
| |/ | | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices. | ||||
| * | 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 | ||||
| | | * | 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 |
| | |/ | | | | | | | | | | | | | | | A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation. | ||||
| * | | 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 | ||||
| | * | | 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. | ||||
| | * | | | Add rooms that the user has left under archived in v2 sync. | Mark Haines | 2015-10-19 | 1 | -6/+23 |
| | | | | | |||||
| * | | | | Use 403 and message to match handlers/auth | Kegan Dougal | 2015-10-21 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Don't 500 when the email doesn't map to a valid user ID. | Kegan Dougal | 2015-10-20 | 1 | -0/+4 |
| | |/ / |/| | | |||||
| * | | | Merge pull request #307 from matrix-org/erikj/search | Erik Johnston | 2015-10-19 | 1 | -0/+17 |
| |\ \ \ | | | | | | | | | Add basic search API | ||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 1 | -5/+31 |
| | |\| | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-15 | 1 | -78/+92 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Merge branch 'erikj/store_engine' into erikj/search | Erik Johnston | 2015-10-13 | 1 | -27/+57 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/develop' into erikj/search | Erik Johnston | 2015-10-12 | 2 | -2/+78 |
| | |\ \ \ \ | |||||
| | * | | | | | Keep FTS indexes up to date. Only search through rooms currently joined | Erik Johnston | 2015-10-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Add basic full text search impl. | Erik Johnston | 2015-10-09 | 1 | -0/+17 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #306 from matrix-org/markjh/unused_methods | Mark Haines | 2015-10-16 | 1 | -30/+0 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Remove some login classes from synapse. | ||||
| | * | | | | | synapse.client.v1.login.LoginFallbackRestServlet and ↵ | Mark Haines | 2015-10-15 | 1 | -30/+0 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | synapse.client.v1.login.PasswordResetRestServlet are unused | ||||
| * | | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-15 | 1 | -78/+92 |
| |\| | | | | |||||
| | * | | | | Include invites in incremental sync | Mark Haines | 2015-10-13 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Include invited rooms in the initial sync | Mark Haines | 2015-10-13 | 1 | -1/+20 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' into markjh/v2_sync_api | Mark Haines | 2015-10-13 | 2 | -2/+108 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | Start spliting out the rooms into joined and invited in v2 sync | Mark Haines | 2015-10-13 | 1 | -9/+9 |
| | | | | | | |||||
| | * | | | | Update the filters to match the latest spec. | Mark Haines | 2015-10-12 | 1 | -15/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response. | ||||
| | * | | | | Set the user as online if they start polling the v2 sync | Mark Haines | 2015-10-09 | 1 | -3/+11 |
| | | | | | | |||||
| | * | | | | Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api | Mark Haines | 2015-10-09 | 1 | -0/+4 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | | Format the presence events correctly for v2 | Mark Haines | 2015-10-09 | 1 | -3/+9 |
| | | | | | | |||||
| | * | | | | Update the v2 room sync format to match the current v2 spec | Mark Haines | 2015-10-08 | 1 | -7/+7 |
| | | | | | | |||||
| | * | | | | Update the sync response to match the latest spec | Mark Haines | 2015-10-07 | 1 | -24/+22 |
| | | | | | | |||||
| | * | | | | Move the rooms out into a room_map mapping from room_id to room. | Mark Haines | 2015-10-05 | 1 | -13/+31 |
| | | | | | | |||||
| | * | | | | Start updating the sync API to match the specification | Mark Haines | 2015-10-01 | 1 | -53/+22 |
| | | | | | | |||||
| * | | | | | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 1 | -5/+6 |
| | | | | | | |||||
| * | | | | | Move logic into handler | Daniel Wagner-Hall | 2015-10-13 | 1 | -115/+18 |
| | | | | | | |||||
| * | | | | | Add logging | Daniel Wagner-Hall | 2015-10-13 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-13 | 2 | -2/+108 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Add a comment to clarify why we split on closing curly brace when reading ↵ | Steven Hammerton | 2015-10-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | CAS attribute tags | ||||
| | * | | | | Unpack dictionary in for loop for nicer syntax | Steven Hammerton | 2015-10-12 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Remove not required parenthesis | Steven Hammerton | 2015-10-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Support multiple required attributes in CAS response, and in a nicer config ↵ | Steven Hammerton | 2015-10-12 | 1 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | format too | ||||
| | * | | | | Allow optional config params for a required attribute and it's value, if ↵ | Steven Hammerton | 2015-10-12 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | specified any CAS user must have the given attribute and the value must equal | ||||
| | * | | | | Parse both user and attributes from CAS response | Steven Hammerton | 2015-10-12 | 1 | -26/+38 |
| | | |_|/ | |/| | | |||||
| | * | | | Raise LoginError if CasResponse doensn't contain user | Steven Hammerton | 2015-10-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix my broken line splitting | Steven Hammerton | 2015-10-10 | 1 | -4/+6 |
| | | | | | |||||
| | * | | | Use UserId to create FQ user id | Steven Hammerton | 2015-10-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than ↵ | Steven Hammerton | 2015-10-10 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | requests | ||||
| | * | | | Formatting changes | Steven Hammerton | 2015-10-10 | 1 | -5/+12 |
| | | | | | |||||
| | * | | | Provide ability to login using CAS | Steven Hammerton | 2015-10-10 | 1 | -1/+63 |
| | | | | | |||||
| | * | | | Use 'true' rather than '1' for archived flag | Mark Haines | 2015-10-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add a flag to initial sync to indicate we want rooms that the user has left | Mark Haines | 2015-10-08 | 1 | -1/+3 |
| | | |/ | |/| | |||||
| * | | | Fix lint errors | Daniel Wagner-Hall | 2015-10-06 | 1 | -3/+4 |
| | | | | |||||
| * | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-05 | 1 | -0/+4 |
| |\| | | |||||
| | * | | Validate the receipt type before passing it on to the receipt handler | Kegan Dougal | 2015-10-01 | 1 | -0/+4 |
| | |/ | |||||
| * / | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 1 | -6/+126 |
| |/ | |||||
| * | Merge pull request #276 from ↵ | Mark Haines | 2015-09-21 | 2 | -9/+13 |
| |\ | | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left. | ||||
| | * | Remove undocumented and unimplemented 'feedback' parameter from the ↵ | Mark Haines | 2015-09-09 | 2 | -4/+0 |
| | | | | | | | | | Client-Server API | ||||
| | * | Allow users that have left the room to view the member list from the point ↵ | Mark Haines | 2015-09-09 | 1 | -5/+13 |
| | | | | | | | | | they left | ||||
| * | | Merge pull request #274 from matrix-org/add_threepid_fix | David Baker | 2015-09-10 | 1 | -0/+1 |
| |\ \ | |/ |/| | Fix adding threepids to an existing account | ||||
| | * | Fix adding threepids to an existing account | David Baker | 2015-09-10 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'release-v0.10.0' into develop | Mark Haines | 2015-08-28 | 2 | -15/+51 |
| |\| | | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py | ||||
| | * | Consistency | Erik Johnston | 2015-08-27 | 1 | -3/+3 |
| | | | |||||
| | * | Check for an internationalised filename first | Erik Johnston | 2015-08-27 | 1 | -8/+14 |
| | | | |||||
| | * | None check the correct variable | Erik Johnston | 2015-08-27 | 1 | -2/+3 |
| | | | |||||
| | * | Check for None | Erik Johnston | 2015-08-27 | 1 | -1/+1 |
| | | | |||||
| | * | Give a sensible error message if the filename is invalid UTF-8 | Mark Haines | 2015-08-26 | 2 | -2/+8 |
| | | | |||||
| | * | Handle unicode filenames given when downloading or received over federation | Mark Haines | 2015-08-26 | 1 | -5/+21 |
| | | | |||||
| | * | Allow non-ascii filenames for attachments | Mark Haines | 2015-08-26 | 2 | -8/+15 |
| | | | |||||
| | * | When logging in fetch user by user_id case insensitively, *unless* there are ↵ | Erik Johnston | 2015-08-21 | 1 | -2/+3 |
| | | | | | | | | | multiple case insensitive matches, in which case require the exact user_id | ||||
| * | | Merge erikj/user_dedup to develop | Daniel Wagner-Hall | 2015-08-26 | 1 | -2/+3 |
| | | | |||||
| * | | Merge pull request #248 from matrix-org/deviceid | Daniel Wagner-Hall | 2015-08-25 | 16 | -45/+44 |
| |\ \ | | | | | | | Remove completely unused concepts from codebase | ||||
| | * | | Fix up one more reference | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+2 |
| | | | | |||||
| | * | | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 16 | -43/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly. | ||||
| * | | | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 4 | -8/+9 |
| |/ / | |||||
| * | | Return fully qualified user_id as per spec | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 5 | -26/+207 |
| |\| | | | | | | | | | Conflicts: synapse/rest/client/v1/login.py | ||||
| | * | Remove spurious extra arg to set_password | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails | Mark Haines | 2015-08-20 | 2 | -21/+167 |
| | |\ | | | | | | | Always return a thumbnail of the requested size. | ||||
| | | * | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 2 | -88/+116 |
| | | |\ | | | | | | | | | | | | | erikj/generate_presice_thumbnails | ||||
| | | * | | Add config option for setting the list of thumbnail sizes to precalculate | Mark Haines | 2015-08-12 | 1 | -16/+2 |
| | | | | | |||||
| | | * | | Make a config option for whether to generate new thumbnail sizes dynamically | Mark Haines | 2015-08-12 | 2 | -7/+19 |
| | | | | | |||||
| | | * | | Factor out thumbnail() | Erik Johnston | 2015-07-23 | 1 | -56/+40 |
| | | | | | |||||
| | | * | | Fix remote thumbnailing | Erik Johnston | 2015-07-23 | 2 | -7/+11 |
| | | | | | |||||
| | | * | | Always return a thumbnail of the requested size. | Erik Johnston | 2015-07-23 | 2 | -2/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Before, we returned a thumbnail that was at least as big (if possible) as the requested size. Now, if we don't have a thumbnail of the given size we generate (and persist) one of that size. | ||||
| | * | | | Comma comma comma comma comma chameleon | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'develop' into email_login | David Baker | 2015-08-20 | 4 | -44/+80 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #211 from matrix-org/email_in_use | Mark Haines | 2015-08-20 | 1 | -0/+28 |
| | | |\ \ \ | | | | | | | | | | | | | Changes for unique emails | ||||
| | | | * | | | Check absent before trying to access keys | David Baker | 2015-08-12 | 1 | -3/+3 |
| | | | | | | | |||||
| | | | * | | | Just leaving off the $ is fine. r* == registerrrrrrrrr | David Baker | 2015-08-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Allow sign in using email address | David Baker | 2015-08-04 | 1 | -5/+12 |
| | | |/ / / | |/| | | | |||||
| | * | | | | Remember to yield: not much point testing is a deferred is not None | David Baker | 2015-08-04 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | splt long line | David Baker | 2015-08-04 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Add endpoint that proxies ID server request token and errors if the given ↵ | David Baker | 2015-08-04 | 1 | -1/+26 |
| | | |_|/ | |/| | | | | | | | | | | email is in use on this Home Server. | ||||
| * | | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 3 | -2/+62 |
| | |/ / |/| | | | | | | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them. | ||||
| * | | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation | Mark Haines | 2015-08-18 | 1 | -30/+70 |
| |\ \ \ | | | | | | | | | Federation for end-to-end key requests. | ||||
| | * | | | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 3 | -89/+118 |
| | |\| | | | | | | | | | | | | | | markjh/end-to-end-key-federation | ||||
| | * | | | Get the end-to-end key federation working | Mark Haines | 2015-07-24 | 1 | -5/+5 |
| | | | | | |||||
| | * | | | Add federation support for end-to-end key requests | Mark Haines | 2015-07-23 | 1 | -30/+70 |
| | | | | | |||||
| * | | | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 3 | -10/+6 |
| | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | * Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly | ||||
| * | | | Don't try & check the username if we don't have one (which we won't if it's ↵ | David Baker | 2015-08-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | been saved in the auth layer) | ||||
| * | | | Use the same reg paths as register v1 for ASes. | Kegan Dougal | 2015-07-29 | 1 | -4/+6 |
| | | | | | | | | | | | | | Namely this means using registration_handler.appservice_register. | ||||
| * | | | Fix v2_alpha registration. Add unit tests. | Kegan Dougal | 2015-07-28 | 1 | -54/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag. | ||||
| * | | | Generate local thumbnails on a thread | Erik Johnston | 2015-07-23 | 1 | -34/+43 |
| | |/ |/| | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |