Commit Graph

939 Commits

Author SHA1 Message Date
Erik Johnston b50ea730b1 Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts:
	synapse/http/server.py
        synapse/http/content_repository.py
2014-09-03 12:01:14 +01:00
Erik Johnston bc21350298 Add option to change content repo location 2014-09-03 11:57:23 +01:00
Kegan Dougal 10afd895c4 Edited /presence REST servlet to raise SynapseErrors to return a standard error response, rather than a string. 2014-09-03 11:56:47 +01:00
Kegan Dougal c54d8df504 Update API docs to use 'presence' key not 'state'. Fixed error messages when setting presence. 2014-09-03 11:45:30 +01:00
Kegan Dougal acfabfff9c Fixed /presence APIs to urldecode user IDs. 2014-09-03 11:31:48 +01:00
Kegan Dougal 65693e9e15 Fixed GET /events/$id to be not broken. 2014-09-03 11:24:45 +01:00
Mark Haines bf10cf5f1a move contentrepo class to it's own file 2014-09-03 11:10:44 +01:00
Kegan Dougal 2385d396c3 URL decode user IDs for /profile REST path segments. 2014-09-03 11:05:29 +01:00
Kegan Dougal 3a3fadcece Make API docs not lie on registration/login. 2014-09-03 10:58:53 +01:00
Kegan Dougal ce5c88006e Update port numbers. 2014-09-03 10:47:07 +01:00
Emmanuel ROHEE d29d41322a Better indicate in the page feedback section that a user can't join a room (because he has been banned for ex). May be worth to be put in the middle of screen 2014-09-03 11:45:40 +02:00
Erik Johnston 46ac4a2f85 Fill out power level bits in the spec 2014-09-03 10:44:46 +01:00
Paul "LeoNerd" Evans da3e04df8b Rename the 'do_users_share_a_room' to something slightly less verb-sounding 2014-09-03 10:40:48 +01:00
Paul "LeoNerd" Evans 967b45bc1a Allow optional non-suppression of exceptions through the Distributor 2014-09-03 10:40:21 +01:00
Paul "LeoNerd" Evans ddf3ca7ab3 Neater is_presence_visible() code 2014-09-03 10:40:21 +01:00
Emmanuel ROHEE 4ba5b4b55d Do not show banned people in member list. Format ban events strings in room and recent flows 2014-09-03 11:38:24 +02:00
Kegan Dougal 8ad056b207 Prefix API links with /docs/api/client-server so they should link through correctly on matrix.org 2014-09-03 10:32:51 +01:00
Kegan Dougal e4eb5cb443 cmdclient: Fixed /join to work with the updated c-s API. 2014-09-03 10:27:11 +01:00
Emmanuel ROHEE 56427b8057 Added /ban command 2014-09-03 11:17:58 +02:00
Emmanuel ROHEE 65c7f78e9f Made IRC style command easier to handle specifically for possible arguments 2014-09-03 11:07:53 +02:00
Kegan Dougal 8166ebd91a cmdclient: Now works correctly with user localpart login. Default to 8008 not 8080. 2014-09-03 09:53:17 +01:00
Erik Johnston ddc16d8642 Merge branch 'master' into develop 2014-09-03 09:46:39 +01:00
Kegan Dougal c77add6d21 Add ban support: /rooms/$roomid/ban with { user_id : foo } 2014-09-03 09:43:32 +01:00
Mark Haines c6eafdfbaf Add copyright notices and fix pyflakes errors 2014-09-03 09:43:11 +01:00
Mark Haines 112c7ea315 Set status message for ratelimit error responses 2014-09-03 09:37:44 +01:00
Mark Haines 30ad0c5674 Merge branch 'ratelimiting' into develop 2014-09-03 09:15:52 +01:00
Mark Haines cdd8602e74 Fix tests to support ratelimiting 2014-09-03 09:15:22 +01:00
Kegan Dougal 8c793e0704 howto: Link jsfiddles correctly. Hide ugly TODOs. 2014-09-03 09:14:16 +01:00
Mark Haines 683596f91e Raise LimitExceedError when the ratelimiting is throttling requests 2014-09-03 08:58:48 +01:00
Matthew Hodgson 84430a4a8a doc generator 2014-09-03 04:58:01 +01:00
Matthew Hodgson 9fae76107f fix rst 2014-09-03 04:30:51 +01:00
Matthew Hodgson bd7d47fcea don't echo password to stdout... 2014-09-03 00:02:29 +01:00
Matthew Hodgson 2b9afa775e more critique 2014-09-02 23:50:40 +01:00
Kegan Dougal 70aa4b9231 Edited room creation section to mention all the events created when the room is. 2014-09-02 21:45:36 +01:00
Kegan Dougal 0aacab43ca Added Qs which should be answered in the marked TODOs 2014-09-02 21:17:47 +01:00
Matthew Hodgson dcbdfcc9d2 only need one voip section :) 2014-09-02 21:16:59 +01:00
Matthew Hodgson 7819a1010c general documentation review and editing 2014-09-02 21:15:03 +01:00
Matthew Hodgson 3bffd14b02 fix quickstart slightly 2014-09-02 21:15:03 +01:00
Kegan Dougal ab6e1abe9c Added the new power level related events which were recently introduced. 2014-09-02 21:12:46 +01:00
Kegan Dougal 707cd32b13 Added more room alias bullet points. 2014-09-02 20:38:25 +01:00
Kegan Dougal 2f5182b2d2 Finished up Identity section in the architecture section. 2014-09-02 20:32:09 +01:00
Mark Haines 780548b577 rate limiting for message sending 2014-09-02 18:22:15 +01:00
Mark Haines 0a1260b03a Add ratelimiting config 2014-09-02 18:00:15 +01:00
Kegan Dougal 3167d47882 Minor formatting tweaks. 2014-09-02 17:58:16 +01:00
Mark Haines c7a7cdf734 Add ratelimiting function to basehandler 2014-09-02 17:57:04 +01:00
Kegan Dougal 9f94b11d4c Added section on rate limiting. 2014-09-02 17:51:45 +01:00
Kegan Dougal b175179e47 ALL THE LINKS! Most APIs now link to relative paths off the doc, outlined at the bottom of the .rst. 2014-09-02 17:34:24 +01:00
Erik Johnston d8a921f6a6 Add database upgrade script 2014-09-02 17:31:40 +01:00
Emmanuel ROHEE 6e2ce83d57 roomName directive: Take into account invited users.
Use the last user display name
2014-09-02 18:26:20 +02:00
Erik Johnston 47c7dd590d Un block quote list 2014-09-02 17:12:07 +01:00