diff options
| author |  Leon Sandøy <[email protected]> | 2019-09-30 12:24:16 +0200 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2019-09-30 12:24:16 +0200 |
| commit | 413d7ba14dc9ea189a57ac38cc2c3dd2fdea1030 (patch) | |
| tree | 99a76d6169c04468a5dd3194979bd2b64daf1a7f /pydis_site | |
| parent | Reject unhidden note or hidden warning infraction (diff) | |
| parent | Correct the Dockerfile path for azure. (diff) | |
Merge branch 'master' into decoupling-warnings-and-notes
Diffstat (limited to 'pydis_site')
16 files changed, 13 insertions, 6 deletions
diff --git a/pydis_site/settings.py b/pydis_site/settings.py index 3f6cd94a..4534f54b 100644 --- a/pydis_site/settings.py +++ b/pydis_site/settings.py @@ -30,12 +30,19 @@ DEBUG = env('DEBUG') # SECURITY WARNING: keep the secret key used in production secret! if DEBUG: - ALLOWED_HOSTS = [ - 'pythondiscord.local', - 'admin.pythondiscord.local', - 'api.pythondiscord.local', - 'staff.pythondiscord.local', - ] + ALLOWED_HOSTS = env.list( + 'ALLOWED_HOSTS', + default=[ + 'pythondiscord.local', + 'api.pythondiscord.local', + 'admin.pythondiscord.local', + 'staff.pythondiscord.local', + 'web', + 'api.web', + 'admin.web', + 'staff.web' + ] + ) SECRET_KEY = secrets.token_urlsafe(32) elif 'CI' in os.environ: diff --git a/pydis_site/static/images/wiki/contributing/fork_button.png b/pydis_site/static/images/wiki/contributing/fork_button.png Binary files differnew file mode 100644 index 00000000..955c93dd --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/fork_button.png diff --git a/pydis_site/static/images/wiki/contributing/fork_url.png b/pydis_site/static/images/wiki/contributing/fork_url.png Binary files differnew file mode 100644 index 00000000..57a8e421 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/fork_url.png diff --git a/pydis_site/static/images/wiki/contributing/fork_user.png b/pydis_site/static/images/wiki/contributing/fork_user.png Binary files differnew file mode 100644 index 00000000..b8317cab --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/fork_user.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_branch.png b/pydis_site/static/images/wiki/contributing/pycharm_branch.png Binary files differnew file mode 100644 index 00000000..d9cde97a --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_branch.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_checkout.png b/pydis_site/static/images/wiki/contributing/pycharm_checkout.png Binary files differnew file mode 100644 index 00000000..d679a467 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_checkout.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_commit.png b/pydis_site/static/images/wiki/contributing/pycharm_commit.png Binary files differnew file mode 100644 index 00000000..03223688 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_commit.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_commit_button.png b/pydis_site/static/images/wiki/contributing/pycharm_commit_button.png Binary files differnew file mode 100644 index 00000000..ae2745b0 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_commit_button.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_interpreter.png b/pydis_site/static/images/wiki/contributing/pycharm_interpreter.png Binary files differnew file mode 100644 index 00000000..cb757f84 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_interpreter.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_pipenv.png b/pydis_site/static/images/wiki/contributing/pycharm_pipenv.png Binary files differnew file mode 100644 index 00000000..feb9b1d7 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_pipenv.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_pipenv_success.png b/pydis_site/static/images/wiki/contributing/pycharm_pipenv_success.png Binary files differnew file mode 100644 index 00000000..03fa3244 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_pipenv_success.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_pull.png b/pydis_site/static/images/wiki/contributing/pycharm_pull.png Binary files differnew file mode 100644 index 00000000..f82725fa --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_pull.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_push.png b/pydis_site/static/images/wiki/contributing/pycharm_push.png Binary files differnew file mode 100644 index 00000000..a21a18b1 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_push.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_remotes.png b/pydis_site/static/images/wiki/contributing/pycharm_remotes.png Binary files differnew file mode 100644 index 00000000..b2e4239c --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_remotes.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_test_clone.png b/pydis_site/static/images/wiki/contributing/pycharm_test_clone.png Binary files differnew file mode 100644 index 00000000..6410b847 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_test_clone.png diff --git a/pydis_site/static/images/wiki/contributing/pycharm_upstream.png b/pydis_site/static/images/wiki/contributing/pycharm_upstream.png Binary files differnew file mode 100644 index 00000000..70c60ea2 --- /dev/null +++ b/pydis_site/static/images/wiki/contributing/pycharm_upstream.png |
