Travis Ralston 6e87b34f7b

Merge branch 'develop' into travis/admin-list-media

2018-02-01 18:05:47 -07:00

..

api

Add federation_domain_whitelist option (#2820)

2018-01-22 19:11:18 +01:00

app

Factor out get_db_conn to HomeServer base class

2018-01-26 00:56:49 +00:00

appservice

Extract group_id from the dict for multiple use

2017-11-16 18:18:30 +00:00

config

Add federation_domain_whitelist option (#2820)

2018-01-22 19:11:18 +01:00

crypto

Fix 500 when joining matrix-dev

2017-11-29 16:00:46 +00:00

events

replace 'except:' with 'except Exception:'

2017-10-23 15:52:32 +01:00

federation

Add federation_domain_whitelist option (#2820)

2018-01-22 19:11:18 +01:00

groups

Namespace visibility options for groups

2017-11-09 15:27:18 +00:00

handlers

add white space line

2018-01-26 00:15:10 +00:00

http

Merge pull request #2838 from matrix-org/rav/fix_logging_on_dns_fail

2018-01-31 22:18:46 +01:00

metrics

Add some comments about the reactor tick time metric

2018-01-19 23:51:04 +00:00

module_api

Delete devices in various logout situations

2017-11-29 16:44:35 +00:00

push

Better logging when pushes fail

2018-01-29 15:49:06 +00:00

replication

Metrics for number of RDATA commands received

2018-01-15 17:45:55 +00:00

rest

Merge branch 'develop' into travis/admin-list-media

2018-02-01 18:05:47 -07:00

static/client

Updates to fallback CAS login to do new token login

2015-11-06 09:57:17 +00:00

storage

Merge branch 'develop' into travis/admin-list-media

2018-02-01 18:05:47 -07:00

streams

replace 'except:' with 'except Exception:'

2017-10-23 15:52:32 +01:00

util

Add federation_domain_whitelist option (#2820)

2018-01-22 19:11:18 +01:00

__init__.py

Bump version and changelog

2018-01-05 10:54:01 +00:00

event_auth.py

Fix templating error with unban permission message

2018-01-07 19:52:58 -07:00

notifier.py

Clear logcontext before starting fed txn queue runner

2017-11-28 15:26:14 +00:00

python_dependencies.py

Make 'affinity' package optional

2017-10-02 18:03:59 +01:00

server.py

Factor out get_db_conn to HomeServer base class

2018-01-26 00:56:49 +00:00

server.pyi

Move set_password into its own handler

2017-11-29 16:44:35 +00:00

state.py

docstring for get_current_state_ids

2018-01-29 17:39:55 +00:00

types.py

replace 'except:' with 'except Exception:'

2017-10-23 15:52:32 +01:00

visibility.py

Remove preserve_context_over_{fn, deferred}

2017-11-14 11:22:42 +00:00