| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | | 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 CAS... | Steven Hammerton | 2015-10-12 | 1 | -0/+5 |
| * | | | 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 f... | Steven Hammerton | 2015-10-12 | 1 | -7/+6 |
| * | | | Allow optional config params for a required attribute and it's value, if spec... | Steven Hammerton | 2015-10-12 | 1 | -1/+15 |
| * | | | 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 requ... | Steven Hammerton | 2015-10-10 | 1 | -5/+8 |
| * | | | 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 matrix-org/markjh/history_for_rooms_that_have_be... | Mark Haines | 2015-09-21 | 2 | -9/+13 |
|\ |
|
| * | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se... | Mark Haines | 2015-09-09 | 2 | -4/+0 |
| * | Allow users that have left the room to view the member list from the point th... | Mark Haines | 2015-09-09 | 1 | -5/+13 |
* | | 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 | David Baker | 2015-09-10 | 1 | -0/+1 |
| * | When logging in fetch user by user_id case insensitively, *unless* there are ... | Erik Johnston | 2015-08-21 | 1 | -2/+3 |
* | | 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 | 14 | -43/+42 |
|\ \ |
|
| * | | 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 | 14 | -41/+41 |
* | | | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 2 | -2/+3 |
|/ / |
|
* | | 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 | 3 | -5/+40 |
|\| |
|
| * | Remove spurious extra arg to set_password | David Baker | 2015-08-20 | 1 | -1/+1 |
| * | 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 |
| | |\ |
|
| | | * | 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 ema... | David Baker | 2015-08-04 | 1 | -1/+26 |
* | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 3 | -2/+62 |
| |/
|/| |
|
* | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation | Mark Haines | 2015-08-18 | 1 | -30/+70 |
|\ \ |
|
| * | | Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-fede... | Mark Haines | 2015-08-13 | 1 | -54/+73 |
| |\| |
|
| * | | 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 |
| |/
|/| |
|
* | | Don't try & check the username if we don't have one (which we won't if it's b... | David Baker | 2015-08-03 | 1 | -1/+2 |
* | | Use the same reg paths as register v1 for ASes. | Kegan Dougal | 2015-07-29 | 1 | -4/+6 |
* | | Fix v2_alpha registration. Add unit tests. | Kegan Dougal | 2015-07-28 | 1 | -54/+70 |
|/ |
|
* | Query for all the ones we were asked about, not just the last... | David Baker | 2015-07-21 | 1 | -1/+1 |
* | s/take/claim/ for end to end key APIs | Mark Haines | 2015-07-20 | 1 | -5/+5 |
* | 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 |
* | Merge pull request #199 from matrix-org/erikj/receipts | Erik Johnston | 2015-07-16 | 2 | -0/+57 |
|\ |
|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 3 | -1/+352 |
| |\ |
|
| * | | Wire together receipts and the notifer/federation | Erik Johnston | 2015-07-07 | 1 | -2/+1 |
| * | | Add a ReceiptServlet | Erik Johnston | 2015-07-07 | 2 | -1/+59 |
* | | | pep8 + debug line | David Baker | 2015-07-15 | 1 | -6/+8 |
* | | | Add back in support for remembering parameters submitted to a user-interactiv... | David Baker | 2015-07-15 | 1 | -2/+9 |
| |/
|/| |
|
* | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management | Erik Johnston | 2015-07-10 | 2 | -1/+279 |
|\ \ |
|
| * | | Assume that each device for a user has only one of each type of key | Mark Haines | 2015-07-10 | 1 | -3/+3 |
| * | | Don't bother with a timeout for one time keys on the server. | Mark Haines | 2015-07-09 | 1 | -18/+7 |
| * | | Add client API for uploading and querying keys for end to end encryption | Mark Haines | 2015-07-06 | 2 | -1/+290 |
| |/ |
|
* | | Small tweaks to SAML2 configuration. | Erik Johnston | 2015-07-10 | 1 | -4/+4 |
* | | 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 {get,store}_resp... | Erik Johnston | 2015-06-16 | 1 | -3/+3 |
* | Add config option to turn off freezing events. Use new encode_json api and uj... | Erik Johnston | 2015-05-29 | 2 | -2/+2 |
* | Merge pull request #165 from matrix-org/bugs/SYN-390 | Erik Johnston | 2015-05-26 | 1 | -5/+8 |
|\ |
|
| * | SYN-390: Don't modify the dictionary returned from the data store | Mark Haines | 2015-05-26 | 1 | -5/+8 |
* | | Make shared secret registration work again | David Baker | 2015-05-14 | 1 | -1/+4 |
|/ |
|
* | user_id now in user_threepids | David Baker | 2015-05-01 | 1 | -3/+3 |
* | pep8 | David Baker | 2015-04-27 | 1 | -1/+2 |
* | logging args | David Baker | 2015-04-27 | 1 | -2/+2 |
* | More underscores | David Baker | 2015-04-24 | 2 | -4/+4 |
* | Use underscores instead of camelcase for id server stuff | David Baker | 2015-04-24 | 1 | -2/+2 |
* | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 1 | -9/+11 |
|\ |
|
| * | Combine the request wrappers in rest/media/v1 and http/server into a single w... | Mark Haines | 2015-04-21 | 1 | -9/+11 |
* | | Dedicated error code for failed 3pid auth verification | David Baker | 2015-04-23 | 1 | -1/+3 |
* | | Password reset, finally. | David Baker | 2015-04-17 | 1 | -5/+16 |
* | | Add endpoint to get threepids from server | David Baker | 2015-04-17 | 1 | -0/+12 |
* | | make add3pid servlet work | David Baker | 2015-04-17 | 2 | -12/+64 |
* | | just the once would probably be fine | David Baker | 2015-04-17 | 1 | -1/+0 |
* | | Register the 3pid servlet | David Baker | 2015-04-17 | 1 | -1/+3 |
* | | password -> account servlet and add start of an 'add 3pid' endpoint | David Baker | 2015-04-17 | 2 | -2/+17 |
* | | Return user ID in use error straight away | David Baker | 2015-04-16 | 1 | -2/+23 |
* | | Dummy login so we can do the first POST request to get login flows without it... | David Baker | 2015-04-15 | 1 | -4/+14 |
* | | Regstration with email in v2 | David Baker | 2015-04-15 | 2 | -7/+7 |
* | | Add app service auth back in to v2 register | David Baker | 2015-04-02 | 1 | -2/+7 |
* | | Throw sensible errors on not-json when allowing empty body | David Baker | 2015-04-02 | 1 | -1/+4 |
* | | pep8 | David Baker | 2015-04-02 | 1 | -0/+1 |
* | | Add shared secret auth into register v2 and switch the script over. | David Baker | 2015-04-02 | 1 | -11/+58 |
* | | Completely replace fallback auth for C/S V2: | David Baker | 2015-04-01 | 3 | -2/+193 |
* | | pep8 | David Baker | 2015-03-31 | 2 | -3/+4 |
* | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 3 | -1/+95 |
* | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ... | David Baker | 2015-03-25 | 1 | -1/+12 |
* | | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 2 | -2/+3 |
* | | Make deleting other access tokens when you change your password actually work | David Baker | 2015-03-24 | 1 | -1/+4 |
* | | pep8 / pyflakes | David Baker | 2015-03-23 | 1 | -2/+2 |
* | | Implement password changing (finally) along with a start on making client/ser... | David Baker | 2015-03-23 | 3 | -1/+91 |
|/ |
|
* | 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 r... | David Baker | 2015-03-10 | 1 | -1/+4 |
* | 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 |
|\ |
|
| * | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 4 | -9/+17 |
| |\ |
|
| * \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 2 | -2/+2 |
| |\ \ |
|
| * | | | 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 m.login.application_service registration procedure. | Kegan Dougal | 2015-02-05 | 1 | -1/+23 |
* | | | | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 9 | -9/+9 |
| |_|/
|/| | |
|
* | | | Fix code-style | Mark Haines | 2015-02-10 | 2 | -2/+2 |
* | | | 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 t... | Erik Johnston | 2015-02-09 | 2 | -2/+2 |
|/ |
|
* | 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 |
* | Merge pull request #41 from matrix-org/client_v2_sync | Mark Haines | 2015-01-30 | 2 | -2/+209 |
|\ |
|
| * | Pass client info to the sync_config | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| * | Filter the recent events before applying the limit when doing an incremental ... | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| * | Add basic filtering support | Mark Haines | 2015-01-29 | 1 | -5/+14 |
| * | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| |\ |
|
| * | | Move typing notifs to an "emphermal" event list on the room object | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| * | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -7/+22 |
| |\ \ |
|
| * \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 4 | -5/+110 |
| |\ \ \ \ |
|
| * | | | | | Add typing notifications to sync | Mark Haines | 2015-01-29 | 1 | -10/+8 |
| * | | | | | Include transaction ids in unsigned section of events in the sync results for... | Mark Haines | 2015-01-29 | 1 | -7/+16 |
| * | | | | | Add ports back to demo/start.sh | Mark Haines | 2015-01-28 | 1 | -1/+1 |
| * | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-28 | 11 | -41/+520 |
| |\ \ \ \ \ |
|
| * | | | | | | Fix Formatting | Mark Haines | 2015-01-27 | 1 | -3/+2 |
| * | | | | | | Start implementing the non-incremental sync portion of the v2 /sync API | Mark Haines | 2015-01-26 | 1 | -28/+77 |
| * | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 2 | -2/+15 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Start implementing the v2_alpha sync API | Mark Haines | 2015-01-23 | 3 | -0/+214 |
* | | | | | | | | Add glob asterisks when running rules. | David Baker | 2015-01-30 | 1 | -4/+1 |
* | | | | | | | | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 2 | -1/+110 |
|\ \ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| * | | | | | | | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | Merge branch 'develop' into client_v2_filter | Mark Haines | 2015-01-29 | 1 | -7/+22 |
| |\ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Merge changes from develop | Mark Haines | 2015-01-29 | 11 | -41/+520 |
| |\ \ \ \ \ |
|
| * | | | | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement... | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -3/+5 |
| * | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ... | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -13/+12 |
| * | | | | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -2/+15 |
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | | |
|
| * | | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ... | Paul "LeoNerd" Evans | 2015-01-26 | 2 | -1/+109 |
* | | | | | | | 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 id token of the token when authing users, include the token and d... | Mark Haines | 2015-01-28 | 8 | -39/+51 |
| * | | | | 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 | 14 | -104/+158 |
|\| | | |
|
| * | | | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 2 | -2/+15 |
| |/ / |
|
| * / | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 2 | -0/+67 |
| |/ |
|
| * | 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 to... | David Baker | 2015-01-23 | 1 | -2/+2 |
* | | 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 |
|/ |
|
* | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 14 | -0/+1797 |