summary refs log tree commit diff
path: root/synapse/rest/room.py (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-181-4/+8
|\
| * Precent lack of presence visiblity from causing room /members/list to failPaul "LeoNerd" Evans2014-08-181-4/+8
* | We don't need to do a json.loads hereErik Johnston2014-08-181-2/+2
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-151-0/+7
|\|
| * Also include users' presence when responding to /rooms/:room_id/members/listPaul "LeoNerd" Evans2014-08-151-0/+7
* | Start fixing places that use the data store.Erik Johnston2014-08-141-18/+21
|/
* Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(.....Paul "LeoNerd" Evans2014-08-131-5/+1
* add in whitespace after copyright statements to improve legibilityMatthew Hodgson2014-08-131-0/+1
* Reference Matrix Home Servermatrix.org2014-08-121-0/+394