summary refs log tree commit diff
path: root/synapse/rest/client (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into application-servicesKegan Dougal2015-02-114-9/+17
|\
| * Fix code-styleMark Haines2015-02-102-2/+2
| * Code-style fixesMark Haines2015-02-102-7/+15
* | Merge branch 'develop' into application-servicesKegan Dougal2015-02-092-2/+2
|\|
| * Log when we receive a request, when we send a response and how long it took t...Erik Johnston2015-02-092-2/+2
* | 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
|/
* 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
* 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-291-7/+22
| |\ \
| * \ \ 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-2811-41/+520
| |\ \ \ \ \
| * | | | | | 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-291-7/+22
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge in auth changes from developMark Haines2015-01-291-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Merge changes from developMark Haines2015-01-2911-41/+520
| |\ \ \ \ \
| * | | | | | 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-291-7/+22
| |_|/ / / |/| | | |
* | | | | 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-288-39/+51
|\ \ \ \
| * | | | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-288-39/+51
| * | | | Return the device_id from get_auth_by_reqMark Haines2015-01-288-25/+25
| | |/ / | |/| |
* | | | 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
| * Merge rest servlets into the client json resource objectMark Haines2015-01-231-11/+7
* | Add API to delete push rules.David Baker2015-01-231-1/+40
* | Use push settings!David Baker2015-01-231-14/+29
* | more pep8David Baker2015-01-231-2/+4
* | Make string format tuple an actual tupleDavid Baker2015-01-231-1/+1
* | redundant parensDavid Baker2015-01-231-1/+1
* | stray spaceDavid Baker2015-01-231-1/+1
* | make per-device rules workDavid Baker2015-01-231-5/+15
* | Add slightly pedantic trailing slash error.David Baker2015-01-231-2/+13
* | Fix adding rules without before/after & add the rule that we couldn't find to...David Baker2015-01-231-2/+2
* | This really serves me right for ever making a map called 'map'.David Baker2015-01-231-1/+1
* | As yet fairly untested GET API for push rulesDavid Baker2015-01-221-10/+128
* | Merge branch 'develop' into pushersDavid Baker2015-01-223-1/+278
|/
* Move rest APIs back under the rest directoryMark Haines2015-01-2214-0/+1797