Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 2 | -22/+22 |
|\ | | | | | Rewrite presence for performance. | ||||
| * | "You are not..." | Erik Johnston | 2016-02-18 | 1 | -1/+1 |
| | | |||||
| * | Initial cut | Erik Johnston | 2016-02-17 | 2 | -22/+22 |
| | | |||||
* | | 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 | 1 | -4/+6 |
| | |||||
* | 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. | ||||
* | 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 |
|/ | |||||
* | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 1 | -2/+2 |
| | |||||
* | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 3 | -4/+5 |
| | |||||
* | Fix adding push rules relative to other rules | Mark Haines | 2016-01-27 | 1 | -5/+10 |
| | |||||
* | Add missing yield in push_rules set enabled | Mark Haines | 2016-01-25 | 1 | -2/+2 |
| | |||||
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 2 | -4/+3 |
| | |||||
* | 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 | ||||
* | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 10 | -85/+113 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | copyrights | Matthew Hodgson | 2016-01-07 | 15 | -15/+15 |
|/ | |||||
* | 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. | ||||
* | Missing yield | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| | |||||
* | Actually host r0 and unstable prefixes | Daniel Wagner-Hall | 2015-12-08 | 1 | -30/+0 |
| | |||||
* | 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 | 4 | -32/+8 |
|\ | | | | | Merge pull request #415 from matrix-org/daniel/endpoints | ||||
| * | Update endpoints to reflect current spec | Daniel Wagner-Hall | 2015-12-02 | 4 | -32/+8 |
| | | |||||
* | | 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 |
| | |||||
* | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 13 | -77/+83 |
| | |||||
* | 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 | ||||
| * | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -3/+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 |
|/ | |||||
* | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 2 | -13/+31 |
|\ | |||||
| * | Allow guests to /room/:room_id/{join,leave} | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 |
| | | |||||
| * | 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 | 10 | -31/+43 |
| | |\ | |||||
| | * | | 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 | 10 | -30/+31 |
|/ | | | | | | | 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. | ||||
* | Add room context api | Erik Johnston | 2015-10-28 | 1 | -0/+36 |
| | |||||
* | 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 |
| | | |||||
* | | 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 '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 | ||||
* | | | | 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 |
| | | |||||
* | | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 1 | -6/+126 |
|/ | |||||
* | 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 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 | 9 | -32/+32 |
|\ | | | | | Remove completely unused concepts from codebase | ||||
| * | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 9 | -32/+32 |
| | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
|/ | |||||
* | 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 | 1 | -4/+11 |
|\ | | | | | | | | | Conflicts: synapse/rest/client/v1/login.py | ||||
| * | 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 | 1 | -3/+2 |
| |\ | |||||
| * | | Allow sign in using email address | David Baker | 2015-08-04 | 1 | -5/+12 |
| | | | |||||
* | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 1 | -2/+4 |
| |/ |/| | | | | | | | | | | | | | 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. | ||||
* | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 1 | -3/+2 |
|/ | | | | | | | | | * 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 | ||||
* | Remove semicolon. | Kegan Dougal | 2015-07-20 | 1 | -1/+1 |
| | |||||
* | Parse the ID given to /invite|ban|kick to make sure it looks like a user ID. | Kegan Dougal | 2015-07-20 | 1 | -0/+2 |
| | |||||
* | Small tweaks to SAML2 configuration. | Erik Johnston | 2015-07-10 | 1 | -4/+4 |
| | | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled. | ||||
* | Make SAML2 optional and add some references/comments | Muthu Subramanian | 2015-07-09 | 1 | -4/+9 |
| | |||||
* | code beautify | Muthu Subramanian | 2015-07-09 | 1 | -9/+4 |
| | |||||
* | code beautify | Muthu Subramanian | 2015-07-08 | 1 | -10/+23 |
| | |||||
* | Integrate SAML2 basic authentication - uses pysaml2 | Muthu Subramanian | 2015-07-08 | 1 | -1/+61 |
| | |||||
* | Remove access_token from synapse.rest.client.v1.transactions ↵ | Erik Johnston | 2015-06-16 | 1 | -3/+3 |
| | | | | {get,store}_response logging | ||||
* | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 1 | -1/+1 |
| | | | | ujson.loads | ||||
* | SYN-390: Don't modify the dictionary returned from the data store | Mark Haines | 2015-05-26 | 1 | -5/+8 |
| | |||||
* | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ↵ | David Baker | 2015-03-25 | 1 | -1/+12 |
| | | | | flag in the API. | ||||
* | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 2 | -2/+3 |
| | | | | 2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it. | ||||
* | Factor out user id validation checks | Erik Johnston | 2015-03-18 | 1 | -9/+5 |
| | |||||
* | Do more validation of incoming request | Erik Johnston | 2015-03-18 | 1 | -3/+3 |
| | |||||
* | Use 403 instead of 400 | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| | |||||
* | Implement registering with shared secret. | Erik Johnston | 2015-03-13 | 1 | -2/+55 |
| | |||||
* | Add the master push rule for the break-my-push button. Allow server default ↵ | David Baker | 2015-03-10 | 1 | -1/+4 |
| | | | | rules to be disabled by default. | ||||
* | s/user_name/user/ as per mjark's comment | David Baker | 2015-03-02 | 1 | -3/+3 |
| | |||||
* | Oops, missed a replacement. | David Baker | 2015-03-02 | 1 | -1/+1 |
| | |||||
* | Blank lines | David Baker | 2015-03-02 | 1 | -0/+1 |
| | |||||
* | It's set_tweak now, not set_sound | David Baker | 2015-02-27 | 1 | -1/+1 |
| | |||||
* | Add API for getting/setting enabled-ness of push rules. | David Baker | 2015-02-26 | 1 | -5/+49 |
| | |||||
* | SYWEB-278 Don't allow rules with no rule_id. | David Baker | 2015-02-25 | 1 | -1/+1 |
| | |||||
* | Always allow AS to register | Erik Johnston | 2015-02-20 | 1 | -3/+5 |
| | |||||
* | Disable registration if config option was set. | Erik Johnston | 2015-02-19 | 1 | -0/+4 |
| | |||||
* | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 2 | -14/+70 |
|\ | | | | | Application Services | ||||
| * | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 3 | -8/+16 |
| |\ | |||||
| * \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Grant ASes the ability to delete aliases in their own namespace. | Kegan Dougal | 2015-02-06 | 1 | -2/+29 |
| | | | | |||||
| * | | | Grant ASes the ability to create alias in their own namespace. | Kegan Dougal | 2015-02-06 | 1 | -11/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace. | ||||
| * | | | Add m.login.application_service registration procedure. | Kegan Dougal | 2015-02-05 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s). | ||||
* | | | | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 8 | -8/+8 |
| |_|/ |/| | | |||||
* | | | Fix code-style | Mark Haines | 2015-02-10 | 1 | -1/+1 |
| | | | |||||
* | | | Code-style fixes | Mark Haines | 2015-02-10 | 2 | -7/+15 |
| |/ |/| | |||||
* | | Log when we receive a request, when we send a response and how long it took ↵ | Erik Johnston | 2015-02-09 | 1 | -1/+1 |
|/ | | | | to process it. | ||||
* | priority class now dealt with in namespaced rule_id | David Baker | 2015-02-05 | 1 | -4/+0 |
| | |||||
* | Give server default rules the 'default' attribute and fix various brokenness. | David Baker | 2015-02-05 | 1 | -1/+3 |
| | |||||
* | Server default rules now of all kinds rather than all being at lowest prio. | David Baker | 2015-02-05 | 1 | -39/+32 |
| | |||||
* | namespace rule IDs to be unique within their scope and rule type. | David Baker | 2015-02-05 | 1 | -123/+129 |
| | |||||
* | More s/instance_handle/profile_tag/ | David Baker | 2015-02-04 | 1 | -5/+5 |
| | |||||
* | s/instance_handle/profile_tag/ | David Baker | 2015-02-03 | 2 | -16/+16 |
| | |||||
* | Spit out server default rules too. | David Baker | 2015-01-30 | 1 | -4/+12 |
| | |||||
* | Add glob asterisks when running rules. | David Baker | 2015-01-30 | 1 | -4/+1 |
| | | | | | | Means that now you can't do exact matches even in override rules, but I think we can live with that. Advantage is that you'll now always get back what was put in to the API. | ||||
* | Renumber priority classes so we can use 0 for defaults. | David Baker | 2015-01-29 | 1 | -5/+5 |
| | |||||
* | Allow kind to be set to null to delete a pusher. | David Baker | 2015-01-29 | 1 | -1/+10 |
| | |||||
* | Code style fixes. | Mark Haines | 2015-01-29 | 1 | -7/+22 |
| | |||||
* | Change uses of get_user_by_req because it returns a tuple now. | David Baker | 2015-01-28 | 2 | -4/+4 |
| | |||||
* | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 8 | -39/+51 |
|\ | | | | | Extract the device id and token id from the access token when autheniticating users | ||||
| * | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 8 | -39/+51 |
| | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
| * | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 8 | -25/+25 |
| | | |||||
* | | spaces | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | |||||
* | | Unnecessary newlines. | David Baker | 2015-01-28 | 1 | -5/+0 |
| | | |||||
* | | Unnecessary newline. | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | |||||
* | | Better style | David Baker | 2015-01-28 | 1 | -2/+5 |
| | | |||||
* | | Another superfluous newline | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | |||||
* | | Ah, the comma of doom. | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | |||||
* | | Brackets are nicer | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | |||||
* | | Unnecessary new line | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | |||||
* | | Oops, bad merge: needed to change the base class of the rest servlets too. | David Baker | 2015-01-28 | 2 | -4/+4 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 12 | -104/+91 |
|\| | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| * | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 2 | -2/+15 |
| | | | | | | | | | | | | HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed. | ||||
| * | Extract the client v1 base RestServlet to a separate class | Mark Haines | 2015-01-23 | 11 | -72/+44 |
| | | |||||
| * | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 2 | -6/+7 |
| | | |||||
| * | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 1 | -2/+2 |
| | | |||||
| * | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 4 | -16/+21 |
| | | |||||
| * | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 1 | -11/+7 |
| | | |||||
* | | Add API to delete push rules. | David Baker | 2015-01-23 | 1 | -1/+40 |
| | | |||||
* | | Use push settings! | David Baker | 2015-01-23 | 1 | -14/+29 |
| | | |||||
* | | more pep8 | David Baker | 2015-01-23 | 1 | -2/+4 |
| | | |||||
* | | Make string format tuple an actual tuple | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | |||||
* | | redundant parens | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | |||||
* | | stray space | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | |||||
* | | make per-device rules work | David Baker | 2015-01-23 | 1 | -5/+15 |
| | | |||||
* | | Add slightly pedantic trailing slash error. | David Baker | 2015-01-23 | 1 | -2/+13 |
| | | |||||
* | | Fix adding rules without before/after & add the rule that we couldn't find ↵ | David Baker | 2015-01-23 | 1 | -2/+2 |
| | | | | | | | | to the error | ||||
* | | This really serves me right for ever making a map called 'map'. | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | |||||
* | | As yet fairly untested GET API for push rules | David Baker | 2015-01-22 | 1 | -10/+128 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 3 | -1/+278 |
|/ | | | | | Conflicts: synapse/rest/__init__.py | ||||
* | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 13 | -0/+1783 |