MatrixSynapse/synapse
Mark Haines 5201c66108 Merge branch 'develop' into markjh/v2_sync_typing
Conflicts:
	synapse/handlers/sync.py
2015-10-21 15:48:34 +01:00
..
api Allow rejecting invites 2015-10-20 11:58:58 +01:00
app Only turn on the twisted deferred debugging if full_twisted_stacktraces is set in the config 2015-10-13 17:50:44 +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 Add config for how many bcrypt rounds to use for password hashes 2015-10-16 14:52:08 +01:00
crypto Fix bug where we sometimes didn't fetch all the keys requested for a 2015-09-17 10:21:32 +01:00
events Surely we don't need to preserve 'events_default' twice 2015-10-16 18:25:19 +01:00
federation Allow rejecting invites 2015-10-20 11:58:58 +01:00
handlers Merge branch 'develop' into markjh/v2_sync_typing 2015-10-21 15:48:34 +01:00
http Verify third party ID server certificates 2015-10-16 14:54:54 +01:00
metrics Check that /proc/self/fd exists before listing it 2015-09-07 16:45:55 +01:00
push Use raw string for regex here, otherwise \b is the backspace character. Fixes displayname matching. 2015-10-08 11:22:15 +01:00
rest Merge pull request #316 from matrix-org/markjh/v2_sync_archived 2015-10-21 15:46:41 +01:00
storage Merge pull request #316 from matrix-org/markjh/v2_sync_archived 2015-10-21 15:46:41 +01:00
streams Move NullSource out of synapse and into tests since it is only used by the tests 2015-09-22 18:33:34 +01:00
util Merge pull request #312 from matrix-org/daniel/3pidinvites 2015-10-19 15:52:34 +01:00
__init__.py Bump version and change log 2015-09-10 09:58:32 +01:00
notifier.py Don't make pushers handle presence/typing events 2015-08-24 16:19:43 +01: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 Use shorter config key name 2015-09-15 15:50:13 +01:00
state.py synapse/state.py:_get_state_key_from_event was unused 2015-09-23 10:27:47 +01:00
types.py Remove completely unused concepts from codebase 2015-08-25 16:23:06 +01:00