Merge branch 'master' into develop

readthedocs · Apr 18, 2018 · a4f9d63 · a4f9d63
2 parents c77078b + 70ffa2f
commit a4f9d63
Show file tree

Hide file tree

Showing 200 changed files with 3,850 additions and 2,760 deletions.
diff --git a/.eslintrc b/.eslintrc
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1 @@
+common/eslintrc
diff --git a/.flake8 b/.flake8
diff --git a/.flake8 b/.flake8
@@ -0,0 +1 @@
+common/flake8
diff --git a/.gitattributes b/.gitattributes
@@ -8,6 +8,7 @@
 *.jpg   binary
 *.otf   binary
 *.png   binary
+*.eot   binary
 *.ttf   binary
 *.whl   binary
 *.woff  binary
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,8 @@
 ## Details
 
-* Project URL: 
+* Read the Docs project URL:
 * Build URL (if applicable):
-* Read the Docs username (if applicable): 
+* Read the Docs username (if applicable):
 
 ## Expected Result
 

diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,8 @@
 _build
 bower_components/
 contrib/supervisord.log
+contrib/supervisord.pid
+celerybeat-schedule.*
 deploy/.vagrant
 dist/*
 local_settings.py
@@ -30,6 +32,7 @@ media/man
 media/pdf
 media/static
 node_modules
+package-lock.json
 readthedocs/rtd_tests/builds
 readthedocs/rtd_tests/tests/builds
 user_builds
@@ -45,6 +48,7 @@ readthedocs/htmlcov
 tags
 .python-version
 *.pyo
+.pytest_cache/
 
 # Environments
 .env

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "common"]
+	path = common
+	url = https://github.com/rtfd/common.git
diff --git a/.isort.cfg b/.isort.cfg
diff --git a/.isort.cfg b/.isort.cfg
@@ -0,0 +1 @@
+common/isort.cfg
diff --git a/.pep8 b/.pep8
diff --git a/.pep8 b/.pep8
@@ -0,0 +1 @@
+common/pep8
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1 @@
+common/pre-commit-config.yaml
diff --git a/.style.yapf b/.style.yapf
diff --git a/.style.yapf b/.style.yapf
@@ -0,0 +1 @@
+common/style.yapf