cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-11 04:07:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,372 Commits 15 Branches 575 Tags 23 MiB
418b53bf77
Commit Graph

652 Commits

Author SHA1 Message Date
Shupeyko Nikita
259534cd2b Update .gitignore's (#1294) 
* Update Cookiecutter Django .gitignore

* Update generated project .gitignore
 2017-08-24 16:59:08 +03:00
pyup-bot
a226184bf1 Update boto3 from 1.4.5 to 1.4.6 2017-08-23 10:17:14 -07:00
Fábio C. Barrionuevo da Luz
09ecda33b3 Merge pull request #1269 from browniebroke/patch-1 
Update django-storages and Boto3 fixes #998 & #1192
 2017-08-23 14:17:02 -03:00
Nikita P. Shupeyko
22709576a8 Add missing = to DJANGO_OPBEAT_* variable definitions 2017-08-23 13:12:50 +03:00
Shupeyko Nikita
dec3305cd5 Configure pytest to exit after first num failures or errors (#1292) 2017-08-23 13:58:10 +04:00
pyup.io bot
b40d63fffc Update django-extensions from 1.8.1 to 1.9.0 (#1291) 2017-08-23 13:48:26 +04:00
pyup.io bot
26f5659e56 Update django-environ from 0.4.3 to 0.4.4 (#1289) 2017-08-21 14:59:34 +03:00
pyup.io bot
796247a284 Update django-compressor from 2.1.1 to 2.2 (#1287) 2017-08-20 18:31:41 +03:00
pyup.io bot
c216de7387 Update django-allauth from 0.32.0 to 0.33.0 (#1288) 2017-08-20 11:47:40 +03:00
pyup-bot
19d9cb8afb Update pytest-sugar from 0.8.0 to 0.9.0 2017-08-15 02:07:38 -07:00
pyup-bot
dc4051eded Update pytest-sugar from 0.8.0 to 0.9.0 2017-08-15 02:07:36 -07:00
Jannis Gebauer
8801c50867 switch to caddy (#1282) 2017-08-11 11:16:15 +02:00
Shupeyko Nikita
035dc4d7ab Introduce development-time Celery services (#1257) 
* Introduce development-time Celery services

Closes #1225.

* Re-order django and postgres services in production.yml

* Switch local service extension tactics

* Fix celery services inheriting ports from the django's
 2017-08-11 09:13:30 +02:00
pyup.io bot
9754f0341f Update factory-boy to 2.9.2 (#1276) 
* Update factory-boy from 2.9.1 to 2.9.2

* Update factory-boy from 2.9.1 to 2.9.2
 2017-08-04 10:56:11 +03:00
Bruno Alla
4be48b7999 Use django-storages for media files if using WhiteNoise - fixes #1192 
As per the discussion in #869, WhiteNoise is for serving static files
not for media files (files uploaded from the app by users).
For such thing, we still need `DEFAULT_FILE_STORAGE` to be set and
we use django-storages for that.
 2017-08-02 20:10:49 +01:00
Bruno Alla
12db5176d6 Upgrade to boto3 fixes #998 
- Boto3 is the replacement of boto, switch to the latest version
- Switch django-storages class to the one based on Boto3
- AWS_S3_CALLING_FORMAT isn't relevant anymore
 2017-08-02 20:00:03 +01:00
pyup.io bot
83081a20b5 Update factory-boy to 2.9.1 (#1272) 
* Update factory-boy from 2.9.0 to 2.9.1

* Update factory-boy from 2.9.0 to 2.9.1
 2017-08-02 16:07:25 +03:00
Bruno Alla
9017432421 Update django-storages fixes #998 
The -redux project is now the official project, update to the latest version
 2017-08-01 22:34:09 +01:00
orzarchi
d36ff72c0f Fix gulpfile default task stuck on runServer (#1260) 2017-07-31 16:04:36 +03:00
pyup.io bot
041616db2c Update factory-boy to 2.9.0 (#1259) 
* Update factory-boy from 2.8.1 to 2.9.0

* Update factory-boy from 2.8.1 to 2.9.0
 2017-07-31 09:45:09 +03:00
pyup.io bot
993aac6b95 Update flake8 to 3.4.1 (#1254) 
* Update flake8 from 3.4.0 to 3.4.1

* Update flake8 from 3.4.0 to 3.4.1
 2017-07-29 05:57:27 +03:00
pyup.io bot
e7ae16eeb6 Update flake8 to 3.4.0 (#1253) 
* Update flake8 from 3.3.0 to 3.4.0

* Update flake8 from 3.3.0 to 3.4.0
 2017-07-28 11:16:01 +03:00
pyup.io bot
60e57117d6 Update psycopg2 to 2.7.3 (#1247) 
* Update psycopg2 from 2.7.2 to 2.7.3

* Update psycopg2 from 2.7.2 to 2.7.3

* Update psycopg2 from 2.7.2 to 2.7.3
 2017-07-26 09:20:21 +02:00
pyup.io bot
30a6151647 Update django-anymail from 0.11 to 0.11.1 (#1248) 2017-07-24 21:59:20 +03:00
pyup.io bot
34c969423f Update psycopg2 to 2.7.2 (#1246) 
* Update psycopg2 from 2.7.1 to 2.7.2

* Update psycopg2 from 2.7.1 to 2.7.2

* Update psycopg2 from 2.7.1 to 2.7.2
 2017-07-22 21:41:28 +03:00
Fábio C. Barrionuevo da Luz
488855d472 update heroku python runtime to 3.6.2 2017-07-20 09:30:25 -03:00
Shupeyko Nikita
e889316b11 Rename dev.yml to local.yml (#1227) 
* Rename dev.yml to local.yml

Closes #1226.

* Rename docker-compose.yml to production.yml
 2017-07-14 17:09:41 +03:00
pyup.io bot
38f53b5886 Update django-anymail from 0.10 to 0.11 (#1232) 2017-07-14 10:50:26 +03:00
Hamish Durkin
afb6b79fc3 Updated idea run configurations to work as explained in the docs (#1223) 2017-07-09 16:04:27 +03:00
pyup.io bot
db45132724 Update django-extensions from 1.8.0 to 1.8.1 (#1219) 2017-07-09 15:36:38 +03:00
pyup.io bot
57410882ae Update boto from 2.47.0 to 2.48.0 (#1220) 2017-07-09 15:36:22 +03:00
pyup.io bot
03648d3d01 Update pillow from 4.1.1 to 4.2.1 (#1221) 2017-07-09 15:36:07 +03:00
pyup.io bot
b3bf6f4f67 Update django-extensions from 1.7.9 to 1.8.0 (#1217) 2017-07-03 23:01:17 +03:00
pyup.io bot
ba4869feea Update sphinx from 1.6.2 to 1.6.3 (#1215) 2017-07-03 20:37:08 +03:00
pyup.io bot
44aff93933 Update django-storages-redux from 1.3.2 to 1.3.3 (#1210) 2017-06-27 23:44:33 +03:00
Charles Han
c63ba28e36 Change to process *.scss instead of only project.scss. (#1209) 2017-06-26 22:52:40 +03:00
shireenrao
1871abd7e9 Setting up new project with mailhog without docker breaks use of mailhog (#553) 
* add mailhog container for local development

* update local settings to use mailhog container for docker

* remove whitespace

* remove whitespace

* fix whitespace formatting

* another try to fix whitespace

* fix block error due to whitespace

* only use mailhog in docker if docker and mailhog is chosen in setup wizard

* Remove warning at end if using docker and mailhog

* mailhog should work locally without docker

* remove unnecessary check for docker in dev docker-compose file

* Remove section within local development docs referencing docker

As this document is meant as a how to for developing locally, I removed the section which was added for using mailhog in docker. I will add that section to the developing-locally-docker.rst file. Also removed jinja template as it does not work in docs.

* Added a comment on mailhog for local docker development

* fix hyperlink to #smtp-backend

* Added a comment on mailhog for local docker development

* pull docs/developing-locally-docker.rst from upstream

* remove changes from dev.yml and add comment for local.py

* Sync with pydanny:master
 2017-06-26 22:21:32 +03:00
pyup-bot
50a4beed7e Update django-test-plus from 1.0.17 to 1.0.18 2017-06-26 10:15:47 -07:00
pyup-bot
854683de3e Update django-test-plus from 1.0.17 to 1.0.18 2017-06-26 10:15:46 -07:00
Shupeyko Nikita
1f7be4eb57 Revert "Node.JS + docker-compose = ♥" (#1206) 
* Revert "[Fix] #1173 Nginx SSL redirect loop (#1174)"

This reverts commit cabcc7b106.

* Revert "Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165)"

This reverts commit 83c8594203.

* Revert "Fix index.rst sphinx warnings (#1166)"

This reverts commit 51dd0b5e73.

* Revert "Pin mailhog Docker image to v1.0.0 (#1201)"

This reverts commit d9f870461b.

* Revert "Node.JS + docker-compose = ♥ (#1128)"

This reverts commit 4b06fe3958.
 2017-06-21 23:12:22 +03:00
Ashish Patil
cabcc7b106 [Fix] #1173 Nginx SSL redirect loop (#1174) 
Headers not being passed was causing nginx to redirect to SSL again & again.
 2017-06-20 23:33:39 +03:00
Shupeyko Nikita
d9f870461b Pin mailhog Docker image to v1.0.0 (#1201) 2017-06-20 23:27:41 +03:00
Shupeyko Nikita
4b06fe3958 Node.JS + docker-compose = ♥ (#1128) 
* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Fix typo

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Revert "Fix typo"

This reverts commit 02033729b5.

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Fix typo

* Revert "Fix typo"

This reverts commit 02033729b5.

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Remove Gulp-Docker integraton not supported initialization message
 2017-06-20 22:48:17 +03:00
Ben Warren
4aff5971d1 Automatic recompilation of Bootstrap with user-defined variables (#1181) 
Allow for dynamic bootstrap compilation

Exclude sublime artifacts

Make custom bootstrap vars file

Add custom bootstrap compilation

Add cookiecutter option

Use the right name for the file

Add explanation to generated README

Add self to contributors

Remove sublime exclusion
 2017-06-12 19:38:00 +03:00
John Franey
a286e32e2b Gulpfile child process spawn (#1074) 
* Update gulpfile to use child_process.spawn

Use child_process.spawn in place of child_process exec to ensure that
console output is captured by Gulp.

Fixes #939

* Remove extra line
 2017-06-07 18:46:20 +03:00
pyup.io bot
46af6b4760 Update gevent from 1.2.1 to 1.2.2 (#1186) 2017-06-07 18:26:25 +03:00
Cristian Samaniego
1ddc3fcef8 Fix typo and deprecated option in certbot command (#1185) 
The --standalone-supported-challenges option has been deprecated since certbot version 0.9.0.
 2017-06-02 22:47:53 +03:00
Fábio C. Barrionuevo da Luz
7762177283 Merge pull request #1182 from pydanny/pyup-update-sphinx-1.6.1-to-1.6.2 
Update sphinx to 1.6.2
 2017-06-02 09:00:12 -03:00
Fábio C. Barrionuevo da Luz
6ed9ceb232 Merge pull request #1180 from pydanny/pyup-update-raven-6.0.0-to-6.1.0 
Update raven to 6.1.0
 2017-06-02 08:59:45 -03:00
pyup-bot
798bf0639e Update sphinx from 1.6.1 to 1.6.2 2017-05-28 13:43:56 -07:00
pyup.io bot
890c7cbf4b Update boto from 2.46.1 to 2.47.0 (#1179) 2017-05-26 23:22:55 +03:00
pyup-bot
765764a4a2 Update raven from 6.0.0 to 6.1.0 2017-05-25 15:02:53 -07:00
pyup.io bot
c86989eb96 Update django-anymail from 0.9 to 0.10 (#1177) 2017-05-22 23:51:29 +03:00
pyup.io bot
215879aa30 Update sphinx from 1.5.6 to 1.6.1 (#1171) 2017-05-17 00:08:39 +03:00
pyup.io bot
fa03a69b07 Update werkzeug from 0.12.1 to 0.12.2 (#1170) 2017-05-16 11:08:10 +03:00
Fábio C. Barrionuevo da Luz
96028e3bbe Merge pull request #1168 from pydanny/pyup-update-sphinx-1.5.5-to-1.5.6 
Update sphinx to 1.5.6
 2017-05-15 08:51:36 -03:00
pyup-bot
eed7233c1b Update coverage from 4.4 to 4.4.1 2017-05-14 23:39:38 -07:00
pyup-bot
3ae3e74aae Update coverage from 4.4 to 4.4.1 2017-05-14 23:39:37 -07:00
pyup-bot
7e084c2a76 Update sphinx from 1.5.5 to 1.5.6 2017-05-14 13:10:35 -07:00
Delio Castillo
89bc1212b3 Fixes docker file when using letsencrypt. Adds ps command to nginx image for start.sh to be able to run without errors (#1154) 2017-05-12 18:23:22 +02:00
Fábio C. Barrionuevo da Luz
cdebc13edc update celery to 3.1.25 2017-05-10 10:51:49 -03:00
Fábio C. Barrionuevo da Luz
b42357966a Merge pull request #1162 from pydanny/pyup-update-coverage-4.3.4-to-4.4 
Update coverage to 4.4
 2017-05-08 09:13:41 -03:00
pyup-bot
451bee63ac Update coverage from 4.3.4 to 4.4 2017-05-07 22:17:23 -07:00
pyup-bot
64dce4b7d1 Update coverage from 4.3.4 to 4.4 2017-05-07 22:17:21 -07:00
pyup-bot
7125d5c447 Update django-extensions from 1.7.8 to 1.7.9 2017-05-06 05:49:21 -07:00
pyup.io bot
8d7fd5ea06 Update django-debug-toolbar from 1.7 to 1.8 (#1156) 2017-05-06 14:48:47 +02:00
Raphaël Cohen
eb71aecc32 Optimize Django Dockerfile (#1158) 2017-05-06 14:43:26 +02:00
Fábio C. Barrionuevo da Luz
8eb08f553b Merge pull request #1152 from pydanny/pyup-update-ipdb-0.10.2-to-0.10.3 
Update ipdb to 0.10.3
 2017-04-30 18:48:35 -03:00
Fábio C. Barrionuevo da Luz
90d221e206 Merge pull request #1147 from pydanny/pyup-update-django-allauth-0.31.0-to-0.32.0 
Update django-allauth to 0.32.0
 2017-04-30 18:35:39 -03:00
pyup-bot
df4bac167f Update ipdb from 0.10.2 to 0.10.3 2017-04-30 14:35:19 -07:00
Fábio C. Barrionuevo da Luz
e02e7b860f Merge pull request #1145 from pydanny/pyup-update-django-redis-4.7.0-to-4.8.0 
Update django-redis to 4.8.0
 2017-04-30 18:21:17 -03:00
Fábio C. Barrionuevo da Luz
13a19ec2d2 Merge pull request #1149 from pydanny/pyup-update-pillow-4.1.0-to-4.1.1 
Update pillow to 4.1.1
 2017-04-30 18:17:12 -03:00
Fábio C. Barrionuevo da Luz
fb0aaced34 change [pep8] to [pycodestyle] on setup.cfg 
use [pycodestyle] instead of [pep8] on setup.cfg because [pep8] section is deprecated after 2.1.0 version of pycodestyle
 2017-04-29 18:57:23 -03:00
Shupeyko Nikita
9037fb57f3 Fix #1150 (#1151) 
Fix #1150
 2017-04-29 16:59:05 +03:00
pyup-bot
8beb5b40b2 Update pillow from 4.1.0 to 4.1.1 2017-04-28 11:09:13 -07:00
pyup-bot
a2666a8b41 Update django-allauth from 0.31.0 to 0.32.0 2017-04-27 02:18:57 -07:00
pyup-bot
3fe9ebaaf0 Update django-redis from 4.7.0 to 4.8.0 2017-04-25 06:04:16 -07:00
Shupeyko Nikita
f5ccce4ef8 Switch from runtime- to compile-time set production django docker service (#1144) 
Extends #971
 2017-04-24 23:12:30 +02:00
Shupeyko Nikita
65e64fe364 Fix CELERY_BROKER_URL naming mismatch (#1143) 
* Fix CELERY_BROKER_URL naming mismatch

Closes #1116

* Fix all occurences
 2017-04-24 19:35:58 +03:00
Shupeyko Nikita
5b75ad6c9d Require celery==3.1.24 instead of celery==4.0.2 (#1140) 2017-04-24 15:26:08 +03:00
Shupeyko Nikita
e78b6fb425 Fix W391 blank line at end of file (#1136) 2017-04-23 01:27:58 +03:00
Daniel Roy Greenfeld
6aced9ba73 Remove Python 2.7 support per #1129 (#1130) 
* Remove Python 2.7 support per

* Remove Python 2.7 references

* Remove Python 2.7 references

* remove python 2 entirely
 2017-04-21 12:31:45 -07:00
Shupeyko Nikita
23bd99fc5a Pin redis service image version (#1117) 2017-04-21 20:44:06 +03:00
Nikita P. Shupeyko
c4e646214a Workaround flake8 "imported but unused" errors 2017-04-21 18:52:53 +03:00
Daniel Roy Greenfeld
b0fe04fc52 First pass at Bootstrap 4 Alpha 6, just the basic layout 2017-04-20 15:18:30 -07:00
Daniel Roy Greenfeld
8864fffdc7 Update Pillow and django-environ 2017-04-20 14:44:39 -07:00
pyup.io bot
a833a8a358 Update django-model-utils from 2.6.1 to 3.0.0 (#1122) 2017-04-18 09:20:56 +02:00
pyup.io bot
19b4e299cb Update django-anymail from 0.8 to 0.9 (#1108) 2017-04-18 09:20:14 +02:00
Audrey Roy Greenfeld
5d78b32f2b Put local Docker setting into Jinja2 if block 2017-04-17 10:54:01 -07:00
Daniel Roy Greenfeld
8b82dfae8a Change order of modern django debug toolbar. 2017-04-17 10:51:58 -07:00
Daniel Roy Greenfeld
a383fa2378 Document source of unclear links 2017-04-14 11:54:38 -07:00
Daniel Roy Greenfeld
ba2301fc3c Fix multiple imports on one line 2017-04-13 11:30:57 -07:00
Daniel Roy Greenfeld
8673505683 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2017-04-13 11:28:00 -07:00
Daniel Roy Greenfeld
a3b0feec12 Flake8 fix 2017-04-13 11:27:54 -07:00
Shupeyko Nikita
e365c39f2a gitignore generated project's .cache/ dir (#1061) 2017-04-13 10:50:56 -07:00
pyup.io bot
e9d94dbf52 Update sphinx from 1.5.3 to 1.5.5 (#1104) 2017-04-13 10:50:34 -07:00
Shupeyko Nikita
1c1cc9ee9c Prevent PyCharm from formatting raven and opbeat imports (#1063) 
* Prevent PyCharm from formatting raven and opbeat imports

Since raven and opbeat are required in production only, imports might (most surely will) be wiped out during PyCharm code clean up started in other environments.

* Prevent PyCharm from formatting raven and opbeat imports

Since raven and opbeat are required in production only, imports might (most surely will) be wiped out during PyCharm code clean up started in other environments.

* Fix line breaks and spaces

* Fix linebreaks
 2017-04-13 10:50:11 -07:00
Audrey Roy Greenfeld
6453fea417 Easier placement of apps within the second level directory 2017-04-13 10:48:44 -07:00
Nikita P. Shupeyko
66ffa5c93c Switch to current runtime version 
Closes #1094
 2017-04-06 19:04:46 +03:00
pyup.io bot
3bbbcea0d0 Update django from 1.10.6 to 1.10.7 (#1110) 2017-04-05 10:36:50 +02:00
Jannis Gebauer
f62e05b95e stay on 1.10.x for now until 1.11 is compatible 2017-04-05 10:28:42 +02:00
pyup.io bot
9af01c50a8 Update django-debug-toolbar from 1.6 to 1.7 (#1069) 2017-04-01 18:14:22 +02:00
pyup.io bot
c5c8b6b5e8 Update django-extensions from 1.7.7 to 1.7.8 (#1096) 2017-04-01 18:12:50 +02:00
pyup.io bot
86922be94b Update pytz from 2016.10 to 2017.2 (#1098) 2017-04-01 18:12:29 +02:00
Wee Liat
0b14104ae0 added btn class to forget password (#1102) 2017-04-01 08:30:24 -07:00
Shupeyko Nikita
7da1bf79b8 Replace links section with depends_on in docker-compose config files (#1092) 
Closes #1091
 2017-03-24 18:45:31 +01:00
pyup.io bot
26962b41af Update gunicorn from 19.6.0 to 19.7.1 (#1089) 2017-03-24 11:28:12 +01:00
pyup.io bot
5b522d3dee Update werkzeug from 0.11.15 to 0.12.1 (#1080) 2017-03-24 11:28:00 +01:00
pyup.io bot
57e9a223fe Update psycopg2 to 2.7.1 (#1073) 
* Update psycopg2 from 2.7 to 2.7.1

* Update psycopg2 from 2.7 to 2.7.1

* Update psycopg2 from 2.7 to 2.7.1
 2017-03-24 11:25:36 +01:00
William Archinal
f3ea2570ab Use Argon2 password hashing algorithm by default (#1079) 2017-03-16 19:19:42 -07:00
Shupeyko Nikita
7c7970fac6 Fix autoprefixer options in gulp styles task (#1081) 
Fix `'last 2 version'` -> `'last 2 versions'` (https://www.npmjs.com/package/gulp-autoprefixer#usage)
 2017-03-16 08:06:09 -07:00
Sam Collins
d307d47995 Updated aws cache type to t2.micro (#1067) 2017-03-04 12:37:26 -08:00
Burhan Khalid
04146d580e version bumps 2017-03-03 09:11:54 +03:00
pyup.io bot
f6236b3aca Update django-coverage-plugin to 1.5.0 (#1048) 
* Update django-coverage-plugin from 1.4.2 to 1.5.0

* Update django-coverage-plugin from 1.4.2 to 1.5.0
 2017-02-25 14:34:00 +01:00
pyup.io bot
49efbc7075 Update django-extensions from 1.7.6 to 1.7.7 (#1049) 2017-02-25 14:33:50 +01:00
Kenial S. Lee
e079dfe17d Removed dependency of watch task and put it in runSequence; there was no runSequence for it, which makes watch task won’t be run. (#1019) 2017-02-21 11:57:48 -08:00
Reggie Riser
2006605e24 A few cleanups: 1) Fixed common.py references (now called base.py), 2) Made URLs consistent in pointing to dev Django docs as well as https, (#1037) 2017-02-21 11:55:51 -08:00
pyup.io bot
27d441fa7e Update boto from 2.45.0 to 2.46.1 (#1045) 2017-02-21 09:54:10 +01:00
Mounir
489c971123 pycharm doc typo (#1042) 
* pycharm doc typo

a very simple typo in the word without

* Update configuration.rst
 2017-02-20 14:23:18 +01:00
pyup.io bot
b3896c4f75 Update raven from 5.32.0 to 6.0.0 (#1041) 2017-02-20 14:22:48 +01:00
Fábio C. Barrionuevo da Luz
a0efe83901 fix issue #1039 2017-02-15 18:15:16 -03:00
Mesut YILMAZ
3cd57880e0 Removed redeclared env 2017-02-15 11:17:34 +03:00
Jimmy Gitonga
f4ef73efbf ADDED: HTTPS is on by default (#1025) 
ADDED: HTTPS is on by default. This will give a new user an
understanding of why Cookie Django is set up securely for deployment in
a production environment.
 2017-02-13 12:27:09 -08:00
Daniel Roy Greenfeld
672f21a0b2 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2017-02-13 10:49:06 -08:00
Daniel Roy Greenfeld
9a837171b6 Merge branch 'make-settings-consistent-w-req' of https://github.com/statwonk/cookiecutter-django into statwonk-make-settings-consistent-w-req 2017-02-13 10:48:10 -08:00
William Martin Stewart
f298ef7722 Inconsistent title case in 404 (#974) 
We should either title case it or just capitalise the first letter, imho.
 2017-02-13 10:44:02 -08:00
schacki
65611f14ea Updated settings to only include lists and ' (#930) 
* Updated settings to only include lists and '

Substituted " with ' in files
Migrated tuples  to lists

* Added trailing slashes

- trailing slashes
- minor cleanups
 2017-02-13 10:33:52 -08:00
Nikita P. Shupeyko
d0a21a50df Fix pytest DJANGO_SETTINGS_MODULE 
Switch from DJANGO_SETTINGS_MODULE = config.settings.local to DJANGO_SETTINGS_MODULE = config.settings.test
 2017-02-10 15:10:41 +03:00
Nikita P. Shupeyko
d4f6f0b99c Fix Docker test PyCharm Run Configurations settings file 
Switch from env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" to env name="DJANGO_SETTINGS_MODULE" value="config.settings.test"
 2017-02-10 14:33:29 +03:00
Fábio C. Barrionuevo da Luz
69bc96d9ba Merge pull request #985 from pydanny/dot_env_issue 
load .env file from root dir only if DJANGO_READ_DOT_ENV_FILE is True
 2017-02-09 16:03:17 -03:00
pyup.io bot
51609953a8 Update django-coverage-plugin to 1.4.2 (#1022) 
* Update django-coverage-plugin from 1.4.1 to 1.4.2

* Update django-coverage-plugin from 1.4.1 to 1.4.2
 2017-02-09 09:10:37 +01:00
pyup.io bot
b430efa0ed Update flake8 to 3.3.0 (#1021) 
* Update flake8 from 3.2.1 to 3.3.0

* Update flake8 from 3.2.1 to 3.3.0
 2017-02-09 09:10:22 +01:00
pyup.io bot
7a50dcc89a Update collectfast from 0.5.1 to 0.5.2 (#1024) 2017-02-09 09:08:55 +01:00
Fábio C. Barrionuevo da Luz
83900ddfd3 fix typo 2017-02-03 14:12:52 -03:00
pyup.io bot
ce27703731 Update django-compressor from 2.1 to 2.1.1 (#1015) 2017-02-02 14:47:27 +01:00
pyup.io bot
9be889a901 Update django-anymail from 0.7 to 0.8 (#1014) 2017-02-02 14:47:15 +01:00
pyup.io bot
ec3daa58e4 Update django-braces from 1.10.0 to 1.11.0 (#1013) 2017-02-02 14:47:02 +01:00
pyup.io bot
572df4f359 Update django-test-plus to 1.0.17 (#1012) 
* Update django-test-plus from 1.0.16 to 1.0.17

* Update django-test-plus from 1.0.16 to 1.0.17
 2017-02-02 14:46:50 +01:00
pyup.io bot
cd5a742d50 Update whitenoise from 3.2.3 to 3.3.0 (#1011) 2017-02-02 14:46:25 +01:00
pyup.io bot
01063b8b8b Update sphinx from 1.5.1 to 1.5.2 (#1010) 2017-02-02 14:46:13 +01:00
pyup.io bot
6085feb36c Update django-extensions from 1.7.5 to 1.7.6 (#1006) 2017-01-26 16:15:56 +01:00
pyup.io bot
29e957cd77 Update ipdb from 0.10.1 to 0.10.2 (#1007) 2017-01-26 16:15:45 +01:00
pyup.io bot
6cac408f32 Update django-coverage-plugin to 1.4.1 (#1008) 
* Update django-coverage-plugin from 1.4 to 1.4.1

* Update django-coverage-plugin from 1.4 to 1.4.1
 2017-01-26 16:15:27 +01:00
pyup.io bot
de4c8c4012 Update coverage to 4.3.4 (#999) 
* Update coverage from 4.3.3 to 4.3.4

* Update coverage from 4.3.3 to 4.3.4
 2017-01-19 10:01:29 +01:00
pyup.io bot
191fcf847a Update coverage to 4.3.3 (#997) 
* Update coverage from 4.3.1 to 4.3.3

* Update coverage from 4.3.1 to 4.3.3
 2017-01-17 16:13:04 +01:00
pyup.io bot
5af837d184 Update django-coverage-plugin to 1.4 (#993) 
* Update django-coverage-plugin from 1.3.1 to 1.4

* Update django-coverage-plugin from 1.3.1 to 1.4
 2017-01-17 16:12:11 +01:00
statwonk
62d86877e4 Missed a few references to the renamed settings file. This brings them inline. 2017-01-16 21:38:52 -06:00
statwonk
12a8875dce Two Scoops 1.8 on p. 56 indicates base.txt is preferred for consistency 2017-01-16 21:18:07 -06:00
pyup.io bot
3a337e4350 Update django-model-utils from 2.6 to 2.6.1 (#990) 2017-01-12 16:05:31 +01:00
pyup.io bot
b61b985527 Update gevent from 1.2.0 to 1.2.1 (#991) 2017-01-12 16:05:20 +01:00
pyup.io bot
a2a2a517a1 Update collectfast from 0.5.0 to 0.5.1 (#988) 2017-01-11 08:45:17 +01:00
Fábio C. Barrionuevo da Luz
b0c771b645 include DJANGO_READ_DOT_ENV_FILE on env.example 2017-01-09 15:53:30 -03:00
Fábio C. Barrionuevo da Luz
06603dda17 fix W291 trailing whitespace on common.py 2017-01-09 15:39:27 -03:00
Fábio C. Barrionuevo da Luz
2af079f7aa load .env file if DJANGO_READ_DOT_ENV_FILE is True 2017-01-09 15:35:13 -03:00
pyup.io bot
a542a7e51c Update collectfast from 0.4.1 to 0.5.0 (#981) 2017-01-09 10:31:21 +01:00
pyup-bot
a87858a413 Update django from 1.10.4 to 1.10.5 2017-01-04 12:52:37 -08:00
pyup.io bot
ff067ff31d Update whitenoise from 3.2.2 to 3.2.3 (#978) 2017-01-04 13:54:07 +01:00
pyup.io bot
d9edcbbd27 Update django-redis from 4.6.0 to 4.7.0 (#977) 2017-01-04 13:53:57 +01:00
pyup.io bot
8910552ab6 Update pillow from 3.4.2 to 4.0.0 (#976) 2017-01-04 13:53:46 +01:00
pyup.io bot
ef5417c82b Update werkzeug from 0.11.13 to 0.11.15 (#969) 2017-01-04 13:53:36 +01:00
pyup.io bot
067e40d098 Update django-anymail from 0.6.1 to 0.7 (#970) 2017-01-04 13:53:27 +01:00
pyup.io bot
b905f066be Update django-allauth from 0.29.0 to 0.30.0 (#973) 2017-01-04 13:53:17 +01:00
pyup.io bot
cd463b29da Update collectfast from 0.4.0 to 0.4.1 (#966) 2016-12-30 23:05:02 +01:00
pyup.io bot
28a512d0ad Update pytest-sugar to 0.8.0 (#963) 
* Update pytest-sugar from 0.7.1 to 0.8.0

* Update pytest-sugar from 0.7.1 to 0.8.0
 2016-12-28 22:33:35 +01:00
pyup.io bot
a838a7c90c Update werkzeug from 0.11.11 to 0.11.13 (#960) 2016-12-28 22:33:21 +01:00
pyup.io bot
ed0ce0d630 Update gevent from 1.2a2 to 1.2.0 (#957) 2016-12-28 22:33:07 +01:00
pyup.io bot
d25f35a90a Update coverage to 4.3.1 (#962) 
* Update coverage from 4.2 to 4.3.1

* Update coverage from 4.2 to 4.3.1
 2016-12-28 22:32:56 +01:00
pyup.io bot
cf8c052657 Update opbeat from 3.5.1 to 3.5.2 (#955) 2016-12-21 15:49:29 +01:00
pyup.io bot
f00acba613 Update collectfast from 0.3.1 to 0.4.0 (#948) 2016-12-17 12:07:57 +01:00
pyup.io bot
7bdc95818a Update factory-boy to 2.8.1 (#947) 
* Update factory-boy from 2.7.0 to 2.8.1

* Update factory-boy from 2.7.0 to 2.8.1
 2016-12-17 12:07:47 +01:00
pyup.io bot
0abfa781f7 Update gevent from 1.2a1 to 1.2a2 (#933) 2016-12-16 09:24:50 +01:00
pyup.io bot
0a37aa57bd Update sphinx from 1.5 to 1.5.1 (#940) 2016-12-16 09:24:42 +01:00
pyup.io bot
c67b171139 Update boto from 2.44.0 to 2.45.0 (#943) 2016-12-16 09:24:34 +01:00
pyup.io bot
5db3b39c19 Update boto from 2.43.0 to 2.44.0 (#931) 2016-12-08 19:15:51 -08:00
pyup.io bot
98a2e1705a Update pytz from 2016.7 to 2016.10 (#925) 2016-12-06 20:44:24 -08:00
pyup.io bot
7d4cfee45c Update sphinx from 1.4.9 to 1.5 (#923) 2016-12-06 20:44:15 -08:00
pyup.io bot
6c4085fce4 Update django from 1.10.3 to 1.10.4 (#920) 2016-12-06 20:43:54 -08:00
pyup.io bot
110f0f6ce8 Update django-extensions from 1.7.4 to 1.7.5 (#904) 2016-12-01 11:19:57 +01:00
Tim Freund
59948514ab Update doc links from getsentry.com to sentry.io (#917) 
Sentry changed their name and URLs:
https://blog.sentry.io/2016/08/30/sentry-io.html Links in the
cookiecutter-django project are updated to reflect the new locations.
 2016-11-30 14:32:38 -08:00
pyup.io bot
85dfec3ce3 Update pytest-django to 3.1.2 (#903) 
* Update pytest-django from 3.1.1 to 3.1.2

* Update pytest-django from 3.1.1 to 3.1.2
 2016-11-29 09:06:50 -08:00
Fábio C. Barrionuevo da Luz
a5c179594d revert last commit 2016-11-28 20:20:56 -03:00
Fábio C. Barrionuevo da Luz
0919cc438b Update common.py 2016-11-28 20:12:01 -03:00
Paul Brown
770abf960d nginx-secure.conf mixed tabs/spaces to only spaces (#902) 2016-11-24 08:21:47 -08:00
pyup.io bot
613587f889 Update sphinx from 1.4.8 to 1.4.9 (#901) 2016-11-24 08:31:40 +01:00
pyup.io bot
ea4c3f49aa Update django-allauth from 0.28.0 to 0.29.0 (#898) 2016-11-23 11:36:40 +01:00
pyup.io bot
efad688671 Update flake8 to 3.2.1 (#900) 
* Update flake8 from 3.2.0 to 3.2.1

* Update flake8 from 3.2.0 to 3.2.1
 2016-11-23 11:36:31 +01:00
pyup.io bot
d00074d27b Update pytest-django to 3.1.1 (#897) 
* Update pytest-django from 3.0.0 to 3.1.1

* Update pytest-django from 3.0.0 to 3.1.1
 2016-11-21 16:07:41 +01:00
pyup.io bot
b32a2ed8aa Update flake8 to 3.2.0 (#888) 
* Update flake8 from 3.0.4 to 3.2.0

* Update flake8 from 3.0.4 to 3.2.0
 2016-11-16 09:32:50 +01:00
pyup.io bot
6ec8583f60 Update raven from 5.31.0 to 5.32.0 (#889) 2016-11-16 09:32:44 +01:00
pyup.io bot
74e8296b8e Update django-environ from 0.4.0 to 0.4.1 (#885) 2016-11-14 11:52:45 +01:00
Jannis Gebauer
a05292347c upgrade gevent (#882) 2016-11-14 11:52:29 +01:00
Audrey Roy Greenfeld
313aff19a1 Enable gzip compression on Elastic Beanstalk per @realpython https://realpython.com/blog/python/deploying-a-django-app-to-aws-elastic-beanstalk/ 2016-11-08 09:50:51 -08:00
Fábio C. Barrionuevo da Luz
2212adceb1 Merge pull request #877 from pydanny/pyup-update-collectfast-0.2.3-to-0.3.1 
Update collectfast to 0.3.1
 2016-11-04 11:29:53 -03:00
Fábio C. Barrionuevo da Luz
87fa2a704c Merge pull request #876 from pydanny/pyup-update-opbeat-3.5.0-to-3.5.1 
Update opbeat to 3.5.1
 2016-11-04 11:29:39 -03:00
Fábio C. Barrionuevo da Luz
037d081253 Merge pull request #874 from pydanny/pyup-update-django-redis-4.5.0-to-4.6.0 
Update django-redis to 4.6.0
 2016-11-04 11:29:32 -03:00
pyup-bot
270bcef89c Update collectfast from 0.2.3 to 0.3.1 2016-11-02 15:20:40 -07:00
pyup-bot
16dd3c498a Update opbeat from 3.5.0 to 3.5.1 2016-11-02 12:20:40 -07:00
Jérôme Hugon
4f3e18d0cc read the env, so the env works (#863) 
Spend a whole afternoon tryin to make it works after reading your book... that was the solution
 2016-11-02 10:03:52 -07:00
pyup-bot
01fe56aaa2 Update django-redis from 4.5.0 to 4.6.0 2016-11-02 08:36:39 -07:00
pyup.io bot
4212eb5446 Update django-anymail from 0.6 to 0.6.1 (#873) 2016-11-02 10:11:38 +01:00
pyup.io bot
a37b368668 Update django from 1.10.2 to 1.10.3 (#872) 2016-11-02 10:10:59 +01:00
Fábio C. Barrionuevo da Luz
ff582dc4d0 Merge pull request #866 from pydanny/pyup-update-opbeat-3.4.0-to-3.5.0 
Update opbeat to 3.5.0
 2016-10-27 08:55:14 -03:00
Fábio C. Barrionuevo da Luz
f2f2b2ba22 Merge pull request #864 from pydanny/pyup-update-django-braces-1.9.0-to-1.10.0 
Update django-braces to 1.10.0
 2016-10-27 08:54:58 -03:00
Fábio C. Barrionuevo da Luz
d85a2f0e70 Merge pull request #867 from pydanny/pyup-update-django-anymail-0.5-to-0.6 
Update django-anymail to 0.6
 2016-10-27 08:35:02 -03:00
Brent Payne
8147f1df47 update raven to version 5.31.0 to avoid runtime error caused by SentryMiddleware when running django wsgi with gunicorn in python 3.5 2016-10-26 17:47:33 -07:00
pyup-bot
b3c9dc6a30 Update django-anymail from 0.5 to 0.6 2016-10-25 11:59:52 -07:00
pyup-bot
e1a7215e98 Update opbeat from 3.4.0 to 3.5.0 2016-10-25 06:27:47 -07:00
pyup-bot
77606bcc95 Update django-braces from 1.9.0 to 1.10.0 2016-10-24 13:25:05 -07:00
pyup.io bot
1d13b1915d Update django-test-plus to 1.0.16 (#858) 
* Update django-test-plus from 1.0.15 to 1.0.16

* Update django-test-plus from 1.0.15 to 1.0.16
 2016-10-20 17:08:43 +02:00
pyup.io bot
6eb3776d70 Update raven from 5.29.0 to 5.30.0 (#859) 2016-10-20 17:08:33 +02:00
shireenrao
85c7ff1288 remove html5.js as source no longer exists (#853) 
* remove html5.js as source no longer exists

* Update the path for html5shiv

Added path https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js
 2016-10-19 08:51:53 -07:00
pyup.io bot
fb576242a1 Update raven from 5.27.1 to 5.29.0 (#856) 2016-10-18 12:47:43 -07:00
pyup.io bot
f823f4ae94 Update boto from 2.42.0 to 2.43.0 (#854) 2016-10-18 12:47:31 -07:00
pyup.io bot
25feee54a5 Update pillow from 3.4.1 to 3.4.2 (#857) 2016-10-18 12:47:09 -07:00
pyup.io bot
f6bce5c5f7 Update django-allauth from 0.27.0 to 0.28.0 (#849) 2016-10-17 09:56:25 -07:00
pyup-bot
02ef6b76a4 Update django-crispy-forms from 1.6.0 to 1.6.1 2016-10-17 03:20:09 -07:00
Fábio C. Barrionuevo da Luz
3b3e53b57b fix issue #847 2016-10-12 10:43:48 -03:00
René Muhl
77ce5f04ee Upgrade django debug toolbar to 1.6 (#844) 
* Replaced django-debug-toolbar github link with version 1.6

* Contributor update
 2016-10-10 17:39:35 +02:00
Sam Collins
52e84608be Added --noinput to migate command (#842) 
When deploying with a stale content type the migration command can ask for user input which fails the deployment.
 2016-10-08 14:55:02 -07:00
Daniel Roy Greenfeld
04a58d5b21 Removed Heroku instant deploy button 2016-10-07 13:55:15 -07:00
Marlon
bb15e5a02e Create 403_csrf.html (#803) 
This takes advantage of the ability to easily customize the 403 template for CSRF, introduced in Django 1.10.
 2016-10-05 16:01:30 +02:00
pyup.io bot
50b883c7ea Update pytz from 2016.6.1 to 2016.7 (#835) 2016-10-05 15:58:46 +02:00
pyup.io bot
01f80c7857 Update pillow from 3.3.1 to 3.4.1 (#838) 2016-10-05 15:58:38 +02:00
pyup.io bot
ef2b68115d Update celery from 3.1.23 to 3.1.24 (#831) 2016-10-05 15:58:25 +02:00
pyup.io bot
ccedf35895 Update django from 1.10.1 to 1.10.2 (#834) 2016-10-05 15:58:16 +02:00
pyup-bot
024a9671c7 Update sphinx from 1.4.7 to 1.4.8 2016-10-01 09:20:26 -07:00
pyup.io bot
6446312eed Update sphinx from 1.4.6 to 1.4.7 (#832) 2016-10-01 08:09:52 -07:00
Fabio C. Barrioneuvo da Luz
c1b389b27d workaround to fix django-debug-toolbar issue #827 2016-09-29 13:12:11 -03:00
Fabio C. Barrioneuvo da Luz
bbcd408193 add django-debug-toolbar urlpatterns 2016-09-29 13:09:49 -03:00
Fábio C. Barrionuevo da Luz
2f8a7d0641 upgrade Sphinx to 1.4.6 2016-09-29 02:11:45 -03:00
pyup-bot
b28fe19f3a Update pytest-django from 2.9.1 to 3.0.0 2016-09-29 01:48:42 -03:00
pyup-bot
80c569e2c2 Update pytest-django from 2.9.1 to 3.0.0 2016-09-29 01:48:42 -03:00
pyup-bot
3872cd08c3 Update raven from 5.27.0 to 5.27.1 2016-09-29 01:48:42 -03:00
pyup-bot
ef020ecd31 Update django-model-utils from 2.5.2 to 2.6 2016-09-29 01:48:42 -03:00
Fabio C. Barrioneuvo da Luz
8f045fc08c update jquery to 3.1.1 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
e9fc2f0582 update django-redis and whitenoise version 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
97febbf8b4 removed django-autoslug until it's ready for 1.10 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
0e9eafbfc4 sync migrations with django1.10 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
b4e6e08100 change 'admin' url, to stay the same as generated by django 1.10 
https://github.com/django/django/blob/1.10.1/django/conf/project_template/project_name/urls.py-tpl#L20
 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
2aed9268b6 update frontend dependencies 2016-09-29 01:43:48 -03:00
Steve Steiner
6cbc513e6d Make test_docker.sh tests pass by passing new password auth rules 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
6c0cb7ed72 update django to 1.10.1 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
4f9bb652f2 ignore F401 error on manage.py 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
178844d616 use manage.py from django 1.10 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
f040921d9a add default AUTH_PASSWORD_VALIDATORS 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
f2aab6edc3 rename MIDDLEWARE_CLASSES to MIDDLEWARE 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
a091dcbae8 Fix elastic beanstalk checks 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
d31e86fc8a Now includes message for missing .env file. Fixed #819 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
cac685d909 Add Experimental AWS Elastic Beanstalk support (#817) 
Includes:

* First pass at Elastic Beanstalk integration
* Gets code and elasticache working
* Very rudimentary documentation
* Includes post hook cleanup
 2016-09-29 01:43:48 -03:00
Delio Castillo
3d25befb3f Updates to anymail 0.5 and adds new config setting for MAILGUN_SENDER_DOMAIN 2016-09-22 11:42:16 -07:00