Mark Haines d547afeae0 Merge remote-tracking branch 'origin/master' into develop		2015-12-07 13:13:43 +00:00
..
api	Add API for setting account_data globaly or on a per room basis	2015-12-01 18:41:32 +00:00
app	Fix warnings	2015-12-04 11:34:23 +00:00
appservice	Cap the time to retry txns to appservices to 8.5 minutes	2015-10-21 10:10:55 +01:00
config	Added a single line to explain what the server_name is used for	2015-12-02 00:37:55 +01:00
crypto	Fix typo	2015-11-20 17:17:58 +00:00
events	Only add the user_id if the sender is present	2015-12-01 11:14:48 +00:00
federation	Host /unstable and /r0 versions of r0 APIs	2015-12-01 17:34:32 +00:00
handlers	Merge pull request #419 from matrix-org/markjh/reuse_captcha_client	2015-12-03 17:00:59 +00:00
http	Add metrics to track the cpu on the main thread consumed by each type of request	2015-12-04 14:42:24 +00:00
metrics	Check that /proc/self/fd exists before listing it	2015-09-07 16:45:55 +01:00
push	Merge pull request #413 from matrix-org/markjh/reuse_http_client	2015-12-02 12:56:23 +00:00
rest	also do more structured logging	2015-12-07 12:01:00 +00:00
static/client	Updates to fallback CAS login to do new token login	2015-11-06 09:57:17 +00:00
storage	Bump schema version.	2015-12-04 15:28:39 +00:00
streams	s/private_user_data/account_data/	2015-11-18 15:31:04 +00:00
util	Add a setter for the current log context.	2015-12-07 10:51:18 +00:00
__init__.py	Bump changes and version	2015-11-20 16:35:01 +00:00
notifier.py	Return non-room events from guest /events calls	2015-11-12 16:45:28 +00:00
python_dependencies.py	Add nacl.bindings to the list of modules checked. Re-arrange import order to check packages after the packages they depend on	2015-09-01 16:51:10 +01:00
server.py	Remove the LockManager class because it wasn't being used	2015-11-04 14:08:15 +00:00
state.py	Update some comments	2015-11-13 10:31:15 +00:00
types.py	s/private_user_data/account_data/	2015-11-18 15:31:04 +00:00