Mark Haines bbe10e8be7 Merge branch 'develop' into markjh/SYN-513 ...

Conflicts:
	synapse/storage/tags.py

2015-11-09 15:01:59 +00:00

..

api

Exchange 3pid invites for m.room.member invites

2015-11-05 16:43:19 +00:00

app

Move static folder into synapse

2015-10-26 15:37:44 +00:00

appservice

Cap the time to retry txns to appservices to 8.5 minutes

2015-10-21 10:10:55 +01:00

config

Allow guests to register and call /events?room_id=

2015-11-04 17:29:07 +00: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

Exchange 3pid invites for m.room.member invites

2015-11-05 16:43:19 +00:00

handlers

SYN-513: Include updates for rooms that have had all their tags deleted

2015-11-09 14:53:08 +00:00

http

Retry dead servers a lot less often

2015-11-02 16:56:30 +00: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 #350 from matrix-org/erikj/search

2015-11-05 17:52:32 +00:00

static/client

Use correct service url

2015-10-26 18:12:09 +00:00

storage

Merge branch 'develop' into markjh/SYN-513

2015-11-09 15:01:59 +00:00

streams

Inform the client of new room tags using v1 /events

2015-10-29 15:21:09 +00:00

util

Exchange 3pid invites for m.room.member invites

2015-11-05 16:43:19 +00:00

__init__.py

Bump version

2015-10-15 15:29:00 +01:00

notifier.py

Open up /events to anonymous users for room events only

2015-11-05 14:32:26 +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