Mark Haines 2d4d2bbae4 Merge branch 'develop' into markjh/config_cleanup ...

Conflicts:
	synapse/config/captcha.py

2015-04-30 16:54:55 +01:00

..

__init__.py

Update copyright notices

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

_base.py

Write a default log_config when generating config

2015-04-30 16:52:57 +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

Merge branch 'develop' into markjh/config_cleanup

2015-04-30 16:54:55 +01:00

database.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

homeserver.py

Allow multiple config files, set up a default config before applying the config files

2015-04-30 13:48:15 +01:00

key.py

Write a default log_config when generating config

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

logger.py

Write a default log_config when generating config

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

metrics.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

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

Allow --enable-registration to be passed on the commandline

2015-04-30 15:04:06 +01:00

repository.py

remove duplicate parse_size method

2015-04-30 04:26:29 +01:00

server.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

tls.py

Write a default log_config when generating config

2015-04-30 16:52:57 +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