Mark Haines b8d49be5a1 Merge branch 'develop' into markjh/twisted-15 ... Conflicts: synapse/python_dependencies.py		2015-06-01 10:56:05 +01:00
..
api	Typo	2015-05-01 14:41:25 +01:00
app	Add config option to turn off freezing events. Use new encode_json api and ujson.loads	2015-05-29 12:17:33 +01:00
appservice	Make the appservice use 'users_in_room' rather than get_room_members since it is cached	2015-05-22 11:01:28 +01:00
config	Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha	2015-05-29 15:32:54 +01:00
crypto	Handle the case when things return empty but non none things	2015-05-19 14:42:46 +01:00
events	Don't copy twice	2015-05-29 15:02:55 +01:00
federation	Remove redundant for loop	2015-05-22 16:12:20 +01:00
handlers	Merge branch 'develop' into markjh/SYT-8-recaptcha	2015-05-29 13:49:44 +01:00
http	Merge branch 'develop' into markjh/twisted-15	2015-06-01 10:56:05 +01:00
metrics	Appease pep8	2015-04-01 19:17:38 +01:00
push	Take a dict of the rule, not the rule list	2015-05-26 14:57:48 +01:00
rest	Add config option to turn off freezing events. Use new encode_json api and ujson.loads	2015-05-29 12:17:33 +01:00
storage	Add config option to turn off freezing events. Use new encode_json api and ujson.loads	2015-05-29 12:17:33 +01:00
streams	Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'	2015-05-12 10:28:10 +01:00
util	Unused import	2015-05-28 15:47:20 +01:00
__init__.py	Bump version	2015-05-22 17:03:37 +01:00
notifier.py	Iterate over the user_streams not the user_ids	2015-05-26 15:03:49 +01:00
python_dependencies.py	Merge branch 'develop' into markjh/twisted-15	2015-06-01 10:56:05 +01:00
server.py	Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class	2015-04-30 04:24:44 +01:00
state.py	Split a storage function in two so that we don't have to do extra work.	2015-05-01 10:17:19 +01:00
types.py	Make sure the notifier stream token goes forward when it is updated. Sort the pending events by the correct room_stream_id	2015-05-18 13:17:36 +01:00