Mark Haines 73e4ad4b8b Merge branch 'master' into develop ...

Conflicts:
	setup.py

2015-09-07 15:06:46 +01:00

..

__init__.py

Update copyright notices

2015-01-06 13:21:39 +00:00

__main__.py

Fix typo when using sys.stderr.write

2015-08-25 15:39:16 +01:00

_base.py

Lists use 'append'

2015-09-02 17:27:59 +01:00

appservice.py

Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class

2015-04-30 04:24:44 +01:00

captcha.py

Close, but no cigar.

2015-07-14 10:33:25 +01:00

database.py

Allow generate-config to run against an existing config file to generate default keys

2015-05-01 13:54:38 +01:00

homeserver.py

code beautify

2015-07-08 16:05:46 +05:30

key.py

Fix typo in module imports and package dependencies

2015-08-25 10:42:59 +01:00

logger.py

Write a default log_config when generating config

2015-04-30 16:52:57 +01:00

metrics.py

Add backwards compat support for metrics, manhole and webclient config options

2015-06-12 17:44:23 +01:00

ratelimiting.py

Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class

2015-04-30 04:24:44 +01:00

registration.py

Issue macaroons as opaque auth tokens

2015-08-18 14:22:02 +01:00

repository.py

Fix flake8 warning

2015-08-13 17:34:22 +01:00

saml2.py

Small tweaks to SAML2 configuration.

2015-07-10 10:50:14 +01:00

server.py

Allow specifying a directory to host a web client from

2015-08-25 12:01:23 +01:00

tls.py

Merge branch 'master' of github.com:matrix-org/synapse into develop

2015-07-21 09:25:30 +01:00

voip.py

Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class

2015-04-30 04:24:44 +01:00