Commit Graph

1968 Commits

Author SHA1 Message Date
Daniel Roy Greenfeld
672f21a0b2 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2017-02-13 10:49:06 -08:00
Daniel Roy Greenfeld
8723093d6e Merge branch 'statwonk-make-settings-consistent-w-req' 2017-02-13 10:48:44 -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
Daniel Roy Greenfeld
059c4b822e Change Docker to be an option, not the default. 2017-02-13 10:47:15 -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
Cullen Rhodes
4d567c7d8e Remove mention of the deploy button from Heroku docs (#953)
Commit 04a58d5 removed the Heroku instant deploy button but the docs
still mention this as an option, this commit updates the docs to reflect
this change.
2017-02-13 10:41:01 -08:00
Audrey Roy Greenfeld
c72ac58300 Add missing string import 2017-02-13 10:39:43 -08:00
Sebastian Reyes Espinosa
e4d1f4dae6 An small pythonic approach to password (#949)
Providing a more pythonic line for password generation using for that the string content.
2017-02-13 10:37:36 -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
Fábio C. Barrionuevo da Luz
02d047c5b1 Merge pull request #1032 from webyneter/master
use "config.settings.test" as default DJANGO_SETTINGS_MODULE in pytest configuration
2017-02-10 10:46:53 -03: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
Fábio C. Barrionuevo da Luz
b89cccbfaf add @webyneter to contributors list 2017-02-10 09:02:02 -03:00
Fábio C. Barrionuevo da Luz
aa6e25dc64 Merge pull request #1031 from webyneter/master
Fix Docker test PyCharm Run Configurations settings file
2017-02-10 08:53:15 -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
Matt Braymer-Hayes
5b75a9ccf2 1029: Fix typo in Docker deployment docs (#1030)
* #1029 Replace "wan't" with "want"

* #1029 Add self to CONTRIBUTORS.rst
2017-02-10 09:21:04 +01: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
9bc7027fb0 Update cookiecutter from 1.5.0 to 1.5.1 (#1018) 2017-02-09 09:09:19 +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
pyup.io bot
19a4de576a Update tox from 2.5.0 to 2.6.0 (#1017) 2017-02-09 09:08:43 +01:00
Daniel Roy Greenfeld
a2fe9199a6 Added bullet about security 2017-02-08 09:02:24 -08: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
515e55c5ab Update pytest from 3.0.5 to 3.0.6 (#1003) 2017-01-26 16:16:08 +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
580d90a4be Update pyflakes from 1.4.0 to 1.5.0 (#986) 2017-01-11 08:45:28 +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
10fa906599 add DJANGO_READ_DOT_ENV_FILE to settings docs 2017-01-09 16:02:53 -03: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.io bot
ced25f1f39 Update sh from 1.12.8 to 1.12.9 (#980) 2017-01-09 10:31:11 +01:00
Daniel Roy Greenfeld
a6f2dd3a0a Update README.rst 2017-01-06 11:30:03 -08:00
Fábio C. Barrionuevo da Luz
6ace664c03 Merge pull request #979 from pydanny/pyup-update-django-1.10.4-to-1.10.5
Update django to 1.10.5
2017-01-04 18:11:11 -03:00