Erik Johnston 9d95351cad Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_list

2016-12-13 17:57:08 +00:00

..

api

Prevent user tokens being used as guest tokens (#1675)

2016-12-06 15:31:37 +00:00

app

Comment

2016-11-23 11:11:41 +00:00

appservice

Rename network_id to instance_id on client side

2016-12-12 16:05:45 +00:00

config

Bugfix: Console logging handler missing default filter

2016-12-03 20:14:58 -03:00

crypto

Preserve some logcontexts

2016-08-24 11:58:40 +01:00

events

Review comments

2016-11-22 13:42:11 +00:00

federation

Add new API appservice specific public room list

2016-12-06 16:12:27 +00:00

handlers

Fix caching on public room list

2016-12-13 17:33:24 +00:00

http

Add new API appservice specific public room list

2016-12-06 16:12:27 +00:00

metrics

Rename the python-specific metrics now the docs claim that we have done

2016-11-03 17:03:52 +00:00

push

Add /room/<room_id>/joined_members API

2016-12-08 13:32:07 +00:00

replication

Add cache to get_public_room_ids_at_stream_id

2016-12-12 14:41:51 +00:00

rest

Merge pull request #1676 from matrix-org/erikj/room_list

2016-12-12 17:00:10 +00:00

static/client

…

storage

Merge pull request #1697 from matrix-org/erikj/fix_bg_member

2016-12-12 17:20:17 +00:00

streams

Actually use the new function

2016-10-24 13:39:49 +01:00

util

Merge pull request #1620 from matrix-org/erikj/concurrent_room_access

2016-12-12 10:30:23 +00:00

__init__.py

Bump changelog and version

2016-12-13 11:07:27 +00:00

notifier.py

Correctly handle timeout errors

2016-12-09 16:30:29 +00:00

python_dependencies.py

Use external ldap auth pacakge

2016-11-15 13:03:19 +00:00

server.py

Shuffle receipt handler around so that worker apps don't need to load it

2016-11-23 15:14:24 +00:00

server.pyi

Fix login with m.login.token

2016-08-08 16:40:39 +01:00

state.py

Merge pull request #1121 from matrix-org/erikj/public_room_paginate

2016-09-15 13:27:09 +01:00

types.py

Add new API appservice specific public room list

2016-12-06 16:12:27 +00:00

visibility.py

Replace context.current_state with context.current_state_ids

2016-08-25 17:32:22 +01:00