summary refs log tree commit diff
path: root/synapse/rest/client (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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