summary refs log tree commit diff
path: root/synapse/rest/client (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into client_v2_filterMark Haines2015-01-291-7/+22
|\
| * Code style fixes.Mark 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
|\|
| * 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
| |\|
| * | 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
* | | 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
|\ \ \ | | |/ | |/|
| * | Pass the current time to serialize event, rather than passing anMark Haines2015-01-262-2/+15
* | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ...Paul "LeoNerd" Evans2015-01-262-1/+109
|/ /
* | 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
|/
* Move rest APIs back under the rest directoryMark Haines2015-01-2214-0/+1797