anonymousland-synapse/synapse
Mark Haines 33b3e04049 Merge branch 'develop' into daniel/removesomelies
Conflicts:
	synapse/notifier.py
2015-11-04 16:01:00 +00:00
..
api Include room tags in v2 /sync 2015-11-02 16:23:15 +00: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 Cap the time to retry txns to appservices to 8.5 minutes 2015-10-21 10:10:55 +01:00
config Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop 2015-10-23 11:11:56 +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 Update the other place check_joined_room is called 2015-10-30 11:15:37 +00:00
federation Don't rearrange transaction_queue 2015-11-03 16:31:08 +00:00
handlers Merge branch 'develop' into daniel/removesomelies 2015-11-04 16:01:00 +00: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 That TODO was done 2015-11-03 14:28:51 +00:00
storage Merge branch 'develop' into daniel/removesomelies 2015-11-04 16:01:00 +00:00
streams Inform the client of new room tags using v1 /events 2015-10-29 15:21:09 +00:00
util Remove the LockManager class because it wasn't being used 2015-11-04 14:08:15 +00:00
__init__.py Bump version 2015-10-15 15:29:00 +01:00
notifier.py Merge branch 'develop' into daniel/removesomelies 2015-11-04 16:01:00 +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 synapse/state.py:_get_state_key_from_event was unused 2015-09-23 10:27:47 +01:00
types.py Merge branch 'develop' into markjh/room_tags 2015-11-02 10:57:00 +00:00