Mark Haines 47374a33fc Merge remote-tracking branch 'origin/develop' into markjh/3pid		2016-01-29 14:15:12 +00:00
..
api	Fix test	2016-01-28 17:20:05 +00:00
app	Merge pull request #534 from matrix-org/erikj/setup	2016-01-28 14:45:36 +00:00
appservice	copyrights	2016-01-07 04:26:29 +00:00
config	Add config option for setting the trusted id servers, disabling checking the ID server in integration tests	2016-01-29 14:12:26 +00:00
crypto	copyrights	2016-01-07 04:26:29 +00:00
events	Make Event objects behave more like dicts	2016-01-18 14:43:50 +00:00
federation	Remove redundated BaseHomeServer	2016-01-26 13:52:29 +00:00
handlers	Merge remote-tracking branch 'origin/develop' into markjh/3pid	2016-01-29 14:15:12 +00:00
http	Fix AttributeError	2016-01-21 14:02:14 +00:00
metrics	copyrights	2016-01-07 04:26:29 +00:00
push	Only notify for messages in one to one rooms, not every event	2016-01-26 10:21:41 +00:00
rest	Allow three_pid_creds as well as threePidCreds in /account/3pid	2016-01-29 13:26:15 +00:00
static/client	Updates to fallback CAS login to do new token login	2015-11-06 09:57:17 +00:00
storage	Bump AccountDataAndTagsChangeCache size	2016-01-29 13:37:40 +00:00
streams	Clamp pagination limits to at most 1000	2016-01-14 10:22:02 +00:00
util	Merge pull request #536 from matrix-org/erikj/sync	2016-01-29 13:04:51 +00:00
__init__.py	copyrights	2016-01-07 04:26:29 +00:00
notifier.py	Only fetch events for rooms and receipts	2016-01-21 16:10:37 +00:00
python_dependencies.py	Pin pynacl to 0.3.0	2016-01-28 14:47:03 +00:00
server.py	Clean up a bit. Add comment	2016-01-28 14:32:05 +00:00
state.py	copyrights	2016-01-07 04:26:29 +00:00
types.py	Introduce a Requester object	2016-01-11 17:48:45 +00:00