forked-synapse/synapse
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
..
api Add copyright notices and fix pyflakes errors 2014-09-03 09:43:11 +01:00
app Merge branch 'develop' of github.com:matrix-org/synapse into develop 2014-09-03 12:01:14 +01:00
config Add option to change content repo location 2014-09-03 11:57:23 +01:00
crypto Add copyright notices and fix pyflakes errors 2014-09-03 09:43:11 +01:00
federation Add all the necessary checks to make banning work. 2014-09-01 18:24:56 +01:00
handlers Update API docs to use 'presence' key not 'state'. Fixed error messages when setting presence. 2014-09-03 11:45:30 +01:00
http Merge branch 'develop' of github.com:matrix-org/synapse into develop 2014-09-03 12:01:14 +01:00
rest 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
storage Rename the 'do_users_share_a_room' to something slightly less verb-sounding 2014-09-03 10:40:48 +01:00
streams Renamed get_current_token_part to get_current_key 2014-08-29 19:15:23 +01:00
util Allow optional non-suppression of exceptions through the Distributor 2014-09-03 10:40:21 +01:00
__init__.py Bump version and changelog 2014-09-02 16:57:10 +01:00
notifier.py Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0 2014-09-02 15:26:11 +01:00
server.py Add ratelimiting function to basehandler 2014-09-02 17:57:04 +01:00
state.py Start updating state handling to use snapshots 2014-08-27 15:11:51 +01:00
types.py Rename 'events_key' to 'room_key' so it matches the name of the event source 2014-08-29 19:00:55 +01:00