forked-synapse/synapse
David Baker c291a4d522 Merge branch 'develop' into pushers
Conflicts:
	synapse/handlers/events.py
	synapse/server.py
2015-01-28 12:51:05 +00:00
..
api Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
app Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
config Allow ':memory:' as the database path for sqlite3 2015-01-19 15:26:19 +00:00
crypto Update copyright notices 2015-01-06 13:21:39 +00:00
events Pass the current time to serialize event, rather than passing an 2015-01-26 16:11:28 +00:00
federation Finish renaming "context" to "room_id" in federation codebase 2015-01-16 19:01:03 +00:00
handlers Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
http Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
push Reset badge count to zero when last active time is bumped 2015-01-28 11:55:49 +00:00
rest Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
storage Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
streams Update copyright notices 2015-01-06 13:21:39 +00:00
util Optimize FrozenEvent creation 2015-01-06 18:51:03 +00:00
__init__.py Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop 2015-01-13 10:01:22 +00:00
notifier.py Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have 2015-01-19 16:24:54 +00:00
python_dependencies.py Stop complaining about Synapse Angular SDK 0.6.1 2015-01-23 18:37:37 +00:00
server.py Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
state.py Update copyright notices 2015-01-06 13:21:39 +00:00
types.py Update copyright notices 2015-01-06 13:21:39 +00:00