summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Expand)AuthorAgeFilesLines
* Remove not required parenthesisSteven Hammerton2015-10-121-1/+1
* Support multiple required attributes in CAS response, and in a nicer config f...Steven Hammerton2015-10-121-7/+6
* Allow optional config params for a required attribute and it's value, if spec...Steven Hammerton2015-10-121-1/+15
* Parse both user and attributes from CAS responseSteven Hammerton2015-10-121-26/+38
* Raise LoginError if CasResponse doensn't contain userSteven Hammerton2015-10-101-1/+1
* Fix my broken line splittingSteven Hammerton2015-10-101-4/+6
* Use UserId to create FQ user idSteven Hammerton2015-10-101-1/+1
* Add get_raw method to SimpleHttpClient, use this in CAS auth rather than requ...Steven Hammerton2015-10-101-5/+8
* Formatting changesSteven Hammerton2015-10-101-5/+12
* Provide ability to login using CASSteven Hammerton2015-10-101-1/+63
* Use 'true' rather than '1' for archived flagMark Haines2015-10-081-1/+1
* Add a flag to initial sync to indicate we want rooms that the user has leftMark Haines2015-10-081-1/+3
* Validate the receipt type before passing it on to the receipt handlerKegan Dougal2015-10-011-0/+4
* Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-212-9/+13
|\
| * Remove undocumented and unimplemented 'feedback' parameter from the Client-Se...Mark Haines2015-09-092-4/+0
| * Allow users that have left the room to view the member list from the point th...Mark Haines2015-09-091-5/+13
* | Merge pull request #274 from matrix-org/add_threepid_fixDavid Baker2015-09-101-0/+1
|\ \ | |/ |/|
| * Fix adding threepids to an existing accountDavid Baker2015-09-101-0/+1
* | Merge branch 'release-v0.10.0' into developMark Haines2015-08-282-15/+51
|\|
| * ConsistencyErik Johnston2015-08-271-3/+3
| * Check for an internationalised filename firstErik Johnston2015-08-271-8/+14
| * None check the correct variableErik Johnston2015-08-271-2/+3
| * Check for NoneErik Johnston2015-08-271-1/+1
| * Give a sensible error message if the filename is invalid UTF-8Mark Haines2015-08-262-2/+8
| * Handle unicode filenames given when downloading or received over federationMark Haines2015-08-261-5/+21
| * Allow non-ascii filenames for attachmentsMark Haines2015-08-262-8/+15
| * When logging in fetch user by user_id case insensitively, *unless* there are ...Erik Johnston2015-08-211-2/+3
* | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-261-2/+3
* | Merge pull request #248 from matrix-org/deviceidDaniel Wagner-Hall2015-08-2516-45/+44
|\ \
| * | Fix up one more referenceDaniel Wagner-Hall2015-08-251-3/+2
| * | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-2516-43/+43
* | | Remove syutil dependency in favour of smaller single-purpose librariesMark Haines2015-08-244-8/+9
|/ /
* | Return fully qualified user_id as per specDavid Baker2015-08-201-1/+1
* | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-205-26/+207
|\|
| * Remove spurious extra arg to set_passwordDavid Baker2015-08-201-1/+1
| * Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnailsMark Haines2015-08-202-21/+167
| |\
| | * Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thu...Mark Haines2015-08-132-88/+116
| | |\
| | * | Add config option for setting the list of thumbnail sizes to precalculateMark Haines2015-08-121-16/+2
| | * | Make a config option for whether to generate new thumbnail sizes dynamicallyMark Haines2015-08-122-7/+19
| | * | Factor out thumbnail()Erik Johnston2015-07-231-56/+40
| | * | Fix remote thumbnailingErik Johnston2015-07-232-7/+11
| | * | Always return a thumbnail of the requested size.Erik Johnston2015-07-232-2/+162
| * | | Comma comma comma comma comma chameleonDavid Baker2015-08-201-1/+1
| * | | Merge branch 'develop' into email_loginDavid Baker2015-08-204-44/+80
| |\ \ \
| | * \ \ Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-0/+28
| | |\ \ \
| | | * | | Check absent before trying to access keysDavid Baker2015-08-121-3/+3
| | | * | | Just leaving off the $ is fine. r* == registerrrrrrrrrDavid Baker2015-08-121-1/+1
| * | | | | Allow sign in using email addressDavid Baker2015-08-041-5/+12
| | |/ / / | |/| | |
| * | | | Remember to yield: not much point testing is a deferred is not NoneDavid Baker2015-08-041-1/+2
| * | | | splt long lineDavid Baker2015-08-041-1/+3
| * | | | Add endpoint that proxies ID server request token and errors if the given ema...David Baker2015-08-041-1/+26
| | |_|/ | |/| |
* | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-203-2/+62
| |/ / |/| |
* | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federationMark Haines2015-08-181-30/+70
|\ \ \
| * | | Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-fede...Mark Haines2015-08-133-89/+118
| |\| |
| * | | Get the end-to-end key federation workingMark Haines2015-07-241-5/+5
| * | | Add federation support for end-to-end key requestsMark Haines2015-07-231-30/+70
* | | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-123-10/+6
| |/ / |/| |
* | | Don't try & check the username if we don't have one (which we won't if it's b...David Baker2015-08-031-1/+2
* | | Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-291-4/+6
* | | Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-54/+70
* | | Generate local thumbnails on a threadErik Johnston2015-07-231-34/+43
| |/ |/|
* | Pick larger than desired thumbnail for 'crop'Erik Johnston2015-07-231-1/+2
|/
* Query for all the ones we were asked about, not just the last...David Baker2015-07-211-1/+1
* s/take/claim/ for end to end key APIsMark Haines2015-07-201-5/+5
* Remove semicolon.Kegan Dougal2015-07-201-1/+1
* Parse the ID given to /invite|ban|kick to make sure it looks like a user ID.Kegan Dougal2015-07-201-0/+2
* Merge pull request #199 from matrix-org/erikj/receiptsErik Johnston2015-07-162-0/+57
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-133-1/+352
| |\
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-084-15/+48
| |\ \
| * | | Wire together receipts and the notifer/federationErik Johnston2015-07-071-2/+1
| * | | Add a ReceiptServletErik Johnston2015-07-072-1/+59
* | | | pep8 + debug lineDavid Baker2015-07-151-6/+8
* | | | Add back in support for remembering parameters submitted to a user-interactiv...David Baker2015-07-151-2/+9
* | | | bump up image quality a bit more as it looks crapMatthew Hodgson2015-07-141-1/+1
| |_|/ |/| |
* | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-managementErik Johnston2015-07-102-1/+279
|\ \ \
| * | | Assume that each device for a user has only one of each type of keyMark Haines2015-07-101-3/+3
| * | | Don't bother with a timeout for one time keys on the server.Mark Haines2015-07-091-18/+7
| * | | Add client API for uploading and querying keys for end to end encryptionMark Haines2015-07-062-1/+290
| | |/ | |/|
* | | Small tweaks to SAML2 configuration.Erik Johnston2015-07-101-4/+4
* | | Merge pull request #201 from EricssonResearch/msba/saml2-developErik Johnston2015-07-101-1/+74
|\ \ \ | |/ / |/| |
| * | Make SAML2 optional and add some references/commentsMuthu Subramanian2015-07-091-4/+9
| * | code beautifyMuthu Subramanian2015-07-091-9/+4
| * | code beautifyMuthu Subramanian2015-07-081-10/+23
| * | Integrate SAML2 basic authentication - uses pysaml2Muthu Subramanian2015-07-081-1/+61
| |/
* | If user supplies filename in URL when downloading from media repo, use that n...Erik Johnston2015-07-033-9/+14
* | Enforce ascii filenames for uploadsErik Johnston2015-06-302-1/+6
* | Add Content-Disposition headers to media repo v1 downloadsErik Johnston2015-06-303-7/+30
|/
* Remove access_token from synapse.rest.client.v1.transactions {get,store}_resp...Erik Johnston2015-06-161-3/+3
* Merge pull request #175 from matrix-org/erikj/thumbnail_threadErik Johnston2015-06-031-45/+53
|\
| * Thumbnail images on a seperate threadErik Johnston2015-06-021-45/+53
* | SYN-403: Make content repository use its own http client.Erik Johnston2015-06-031-1/+2
|/
* Add config option to turn off freezing events. Use new encode_json api and uj...Erik Johnston2015-05-292-2/+2
* Merge pull request #165 from matrix-org/bugs/SYN-390Erik Johnston2015-05-261-5/+8
|\
| * SYN-390: Don't modify the dictionary returned from the data storeMark Haines2015-05-261-5/+8
* | Make shared secret registration work againDavid Baker2015-05-141-1/+4
* | Change the way we create observers to deferreds so that we don't get spammed ...Erik Johnston2015-05-081-2/+6
|/
* user_id now in user_threepidsDavid Baker2015-05-011-3/+3
* Merge branch 'develop' into key_distributionMark Haines2015-04-297-4/+576
|\
| * Merge pull request #126 from matrix-org/csauthMark Haines2015-04-287-4/+576
| |\
| | * pep8David Baker2015-04-271-1/+2
| | * logging argsDavid Baker2015-04-271-2/+2
| | * More underscoresDavid Baker2015-04-242-4/+4
| | * Use underscores instead of camelcase for id server stuffDavid Baker2015-04-241-2/+2
| | * Merge branch 'develop' into csauthDavid Baker2015-04-245-140/+74
| | |\
| | * | Dedicated error code for failed 3pid auth verificationDavid Baker2015-04-231-1/+3
| | * | Password reset, finally.David Baker2015-04-171-5/+16
| | * | Add endpoint to get threepids from serverDavid Baker2015-04-171-0/+12
| | * | make add3pid servlet workDavid Baker2015-04-172-12/+64
| | * | just the once would probably be fineDavid Baker2015-04-171-1/+0
| | * | Merge branch 'develop' into csauthDavid Baker2015-04-175-162/+93
| | |\ \
| | * | | Register the 3pid servletDavid Baker2015-04-171-1/+3
| | * | | password -> account servlet and add start of an 'add 3pid' endpointDavid Baker2015-04-172-2/+17
| | * | | Return user ID in use error straight awayDavid Baker2015-04-161-2/+23
| | * | | Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-151-4/+14
| | * | | Regstration with email in v2David Baker2015-04-152-7/+7
| | * | | Add app service auth back in to v2 registerDavid Baker2015-04-021-2/+7
| | * | | Throw sensible errors on not-json when allowing empty bodyDavid Baker2015-04-021-1/+4
| | * | | pep8David Baker2015-04-021-0/+1
| | * | | Add shared secret auth into register v2 and switch the script over.David Baker2015-04-021-11/+58
| | * | | Completely replace fallback auth for C/S V2:David Baker2015-04-013-2/+193
| | * | | pep8David Baker2015-03-312-3/+4
| | * | | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-303-1/+95
| | * | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ...David Baker2015-03-251-1/+12
| | * | | 1) Pushers are now associated with an access tokenDavid Baker2015-03-242-2/+3
| | * | | Make deleting other access tokens when you change your password actually workDavid Baker2015-03-241-1/+4
| | * | | pep8 / pyflakesDavid Baker2015-03-231-2/+2
| | * | | Implement password changing (finally) along with a start on making client/ser...David Baker2015-03-233-1/+91
* | | | | Implement minimum_valid_until_ts in the remote key resourceMark Haines2015-04-291-4/+55
* | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-271-1/+3
|\| | | |
| * | | | Implement locks using create_observer for fetching media and server keysErik Johnston2015-04-271-1/+3
* | | | | Copyright noticeMark Haines2015-04-241-0/+14
* | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-241-0/+14
|\| | | |
| * | | | Copyright noticesMark Haines2015-04-241-0/+14
| | |_|/ | |/| |
* | | | Update to match the specification for key/v2Mark Haines2015-04-232-19/+24
* | | | Implement remote key lookup apiMark Haines2015-04-223-8/+185
* | | | Merge branch 'develop' into key_distributionMark Haines2015-04-215-140/+74
|\| | |
| * | | Set a version_string in BaseMediaResource so that the request_handler wrapper...Mark Haines2015-04-211-0/+1
| * | | Combine the request wrappers in rest/media/v1 and http/server into a single w...Mark Haines2015-04-215-140/+73
| | |/ | |/|
* | | Implement v2 key lookupMark Haines2015-04-201-1/+3
* | | Return a sha256 fingerprint rather than the entire tls certificateMark Haines2015-04-141-2/+8
* | | Add a version 2 of the key server apiMark Haines2015-04-142-0/+137
|/ /
* | Move server key api into rest/key/v1Mark Haines2015-04-143-0/+121
* | Remove appservice REST servletsKegan Dougal2015-03-314-190/+0
|/
* Factor out user id validation checksErik Johnston2015-03-181-9/+5
* Do more validation of incoming requestErik Johnston2015-03-181-3/+3
* Use 403 instead of 400Erik Johnston2015-03-161-1/+1
* Implement registering with shared secret.Erik Johnston2015-03-131-2/+55
* bump dep on syweb 0.6.5Matthew Hodgson2015-03-121-2/+3
* Add the master push rule for the break-my-push button. Allow server default r...David Baker2015-03-101-1/+4
* Merge branch 'develop' into pushrules2David Baker2015-03-041-29/+6
|\
| * Convert expected format for AS regex to include exclusivity.Kegan Dougal2015-02-271-29/+6
* | s/user_name/user/ as per mjark's commentDavid Baker2015-03-021-3/+3
* | Oops, missed a replacement.David Baker2015-03-021-1/+1
* | Blank linesDavid Baker2015-03-021-0/+1
* | It's set_tweak now, not set_soundDavid Baker2015-02-271-1/+1
* | Add API for getting/setting enabled-ness of push rules.David Baker2015-02-261-5/+49
|/
* SYWEB-278 Don't allow rules with no rule_id.David Baker2015-02-251-1/+1
* Always allow AS to registerErik Johnston2015-02-201-3/+5
* Disable registration if config option was set.Erik Johnston2015-02-191-0/+4
* SYN-282: Don't log tracebacks for client errorsMark Haines2015-02-181-1/+1
* Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-136-14/+282
|\
| * Fix newline on __init__Kegan Dougal2015-02-111-1/+0
| * PEP8-ifyKegan Dougal2015-02-111-1/+1
| * Add newline to EOFKegan Dougal2015-02-111-0/+1
| * Notify ASes for events sent by other users in a room which an AS user is a pa...Kegan Dougal2015-02-111-2/+2
| * Merge branch 'develop' into application-servicesKegan Dougal2015-02-115-14/+23
| |\
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-095-28/+36
| |\ \
| * | | Grant ASes the ability to delete aliases in their own namespace.Kegan Dougal2015-02-061-2/+29
| * | | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-061-11/+18
| * | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-051-1/+23
| * | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-4/+0
| |\ \ \
| * \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-149/+150
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-052-20/+20
| |\ \ \ \ \
| * | | | | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-051-2/+2
| * | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-042-0/+53
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-0216-44/+868
| |\ \ \ \ \ \ \
| * | | | | | | | Add basic application_services SQL, and hook up parts of the appservice store...Kegan Dougal2015-01-281-2/+2
| * | | | | | | | Use ApplicationService when registering.Kegan Dougal2015-01-271-2/+6
| * | | | | | | | Add appservice handler and store. Glue together rest > handler > store.Kegan Dougal2015-01-272-3/+8
| * | | | | | | | Parse /register and /unregister request JSON.Kegan Dougal2015-01-271-2/+78
| * | | | | | | | Add stub application services REST API.Kegan Dougal2015-01-274-0/+127
* | | | | | | | | Blunty replace json with simplejsonErik Johnston2015-02-1110-10/+10
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Fix code-styleMark Haines2015-02-103-4/+4
* | | | | | | | Code-style fixesMark Haines2015-02-103-10/+19
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Log when we receive a request, when we send a response and how long it took t...Erik Johnston2015-02-092-2/+2
* | | | | | | ...and here's the actual impl. git fail.Matthew Hodgson2015-02-071-25/+32
* | | | | | | thou shalt specify a content-lengthMatthew Hodgson2015-02-071-0/+1
* | | | | | | i hate weakly typed languagesMatthew Hodgson2015-02-071-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | priority class now dealt with in namespaced rule_idDavid Baker2015-02-051-4/+0
| |_|_|_|/ |/| | | |
* | | | | Give server default rules the 'default' attribute and fix various brokenness.David Baker2015-02-051-1/+3
* | | | | Server default rules now of all kinds rather than all being at lowest prio.David Baker2015-02-051-39/+32
* | | | | namespace rule IDs to be unique within their scope and rule type.David Baker2015-02-051-123/+129
| |_|_|/ |/| | |
* | | | More s/instance_handle/profile_tag/David Baker2015-02-041-5/+5
* | | | s/instance_handle/profile_tag/David Baker2015-02-032-16/+16
| |_|/ |/| |
* | | Add Cache-Control header to identiconMark Haines2015-02-021-0/+3
* | | Fix setting identicon width and heightMark Haines2015-02-021-2/+2
* | | Spell height more correctlyMark Haines2015-02-021-1/+1
* | | Add a media/v1/identicon resource for generating identicons using pydenticonMark Haines2015-02-022-0/+50
| |/ |/|
* | Spit out server default rules too.David Baker2015-01-301-4/+12
* | Merge pull request #41 from matrix-org/client_v2_syncMark Haines2015-01-302-2/+209
|\ \
| * | Pass client info to the sync_configMark Haines2015-01-301-1/+1
| * | Filter the recent events before applying the limit when doing an incremental ...Mark Haines2015-01-301-1/+1
| * | Add basic filtering supportMark Haines2015-01-291-5/+14
| * | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-1/+1
| |\ \
| * | | Move typing notifs to an "emphermal" event list on the room objectMark Haines2015-01-291-2/+2
| * | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-292-8/+23
| |\ \ \
| * \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-294-5/+110
| |\ \ \ \ \
| * | | | | | Add typing notifications to syncMark Haines2015-01-291-10/+8
| * | | | | | Include transaction ids in unsigned section of events in the sync results for...Mark Haines2015-01-291-7/+16
| * | | | | | Add ports back to demo/start.shMark Haines2015-01-281-1/+1
| * | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-2814-44/+523
| |\ \ \ \ \ \
| * | | | | | | Fix FormattingMark Haines2015-01-271-3/+2
| * | | | | | | Start implementing the non-incremental sync portion of the v2 /sync APIMark Haines2015-01-261-28/+77
| * | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-262-2/+15
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Start implementing the v2_alpha sync APIMark Haines2015-01-233-0/+214
* | | | | | | | Add glob asterisks when running rules.David Baker2015-01-301-4/+1
* | | | | | | | Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-302-1/+110
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-291-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'develop' into client_v2_filterMark Haines2015-01-292-8/+23
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge in auth changes from developMark Haines2015-01-291-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Merge changes from developMark Haines2015-01-2914-44/+523
| |\ \ \ \ \
| * | | | | | Add filter JSON sanity checks.Kegan Dougal2015-01-281-1/+1
| * | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement...Paul "LeoNerd" Evans2015-01-271-3/+5
| * | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ...Paul "LeoNerd" Evans2015-01-271-13/+12
| * | | | | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-272-2/+15
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ...Paul "LeoNerd" Evans2015-01-262-1/+109
* | | | | | | Renumber priority classes so we can use 0 for defaults.David Baker2015-01-291-5/+5
* | | | | | | Allow kind to be set to null to delete a pusher.David Baker2015-01-291-1/+10
| |_|_|/ / / |/| | | | |
* | | | | | Code style fixes.Mark Haines2015-01-292-8/+23
| |_|/ / / |/| | | |
* | | | | Change uses of get_user_by_req because it returns a tuple now.David Baker2015-01-282-4/+4
| |_|_|/ |/| | |
* | | | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-2810-41/+53
|\ \ \ \
| * | | | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-2810-41/+53
| * | | | Return the device_id from get_auth_by_reqMark Haines2015-01-2810-27/+27
| | |/ / | |/| |
* | | | spacesDavid Baker2015-01-281-2/+2
* | | | Unnecessary newlines.David Baker2015-01-281-5/+0
* | | | Unnecessary newline.David Baker2015-01-281-1/+0
* | | | Better styleDavid Baker2015-01-281-2/+5
* | | | Another superfluous newlineDavid Baker2015-01-281-1/+0
* | | | Ah, the comma of doom.David Baker2015-01-281-1/+1
* | | | Brackets are nicerDavid Baker2015-01-281-2/+2
* | | | Unnecessary new lineDavid Baker2015-01-281-1/+0
* | | | Oops, bad merge: needed to change the base class of the rest servlets too.David Baker2015-01-282-4/+4
* | | | Merge branch 'develop' into pushersDavid Baker2015-01-2814-104/+158
|\| | |
| * | | Pass the current time to serialize event, rather than passing anMark Haines2015-01-262-2/+15
| |/ /
| * / Add client v2_alpha resource to synapse server resource treeMark Haines2015-01-232-0/+67
| |/
| * Extract the client v1 base RestServlet to a separate classMark Haines2015-01-2311-72/+44
| * Replace hs.parse_roomalias with RoomAlias.from_stringMark Haines2015-01-232-6/+7
| * Replace hs.parse_roomid with RoomID.from_stringMark Haines2015-01-231-2/+2
| * Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-234-16/+21
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 20:24:58 +0000