Mark Haines 05f1a4596a Merge branch 'master' into develop

2016-06-23 11:17:48 +01:00

..

__init__.py

copyrights

2016-01-07 04:26:29 +00:00

__main__.py

Use syntax that works on both py2.7 and py3

2016-03-07 20:13:10 +00:00

_base.py

Add function to load config without generating it

2016-06-09 18:50:38 +01:00

api.py

config,handlers/_base: added homeserver config for what state is included in a room invite

2016-03-04 10:43:17 +01:00

appservice.py

Move the functions for parsing app service config

2016-05-17 11:28:58 +01:00

captcha.py

point to the CAPTCHA docs

2016-06-12 23:11:29 +01:00

cas.py

copyrights

2016-01-07 04:26:29 +00:00

database.py

copyrights

2016-01-07 04:26:29 +00:00

emailconfig.py

brand the email from header

2016-06-02 21:34:40 +01:00

homeserver.py

Inline the synchrotron and pusher configs into the main config

2016-06-16 11:06:12 +01:00

jwt.py

Make pyjwt dependency optional

2016-04-25 14:30:15 +01:00

key.py

Create user with expiry

2016-05-13 15:34:15 +02:00

ldap.py

Rework ldap integration with ldap3

2016-06-22 17:51:59 +02:00

logger.py

Inline the synchrotron and pusher configs into the main config

2016-06-16 11:06:12 +01:00

metrics.py

copyrights

2016-01-07 04:26:29 +00:00

password.py

copyrights

2016-01-07 04:26:29 +00:00

ratelimiting.py

copyrights

2016-01-07 04:26:29 +00:00

registration.py

Create user with expiry

2016-05-13 15:34:15 +02:00

repository.py

Clean up the blacklist/whitelist handling.

2016-05-16 13:03:59 +01:00

saml2.py

Add config option to disable password login

2015-10-22 10:37:04 +01:00

server.py

Remove the legacy v0 content upload API.

2016-06-21 11:47:39 +01:00

tls.py

copyrights

2016-01-07 04:26:29 +00:00

voip.py

copyrights

2016-01-07 04:26:29 +00:00

workers.py

Use worker_ prefixes for worker config, use existing support for multiple config files

2016-06-16 17:29:50 +01:00