Commit Graph

1897 Commits

Author SHA1 Message Date
Nikita P. Shupeyko
ce6f330555 Fix line breaks and spaces 2017-03-23 23:20:23 +03:00
Nikita P. Shupeyko
71727ec7fa Merge remote-tracking branch 'origin/prevent-pycharm-from-formatting-raven-and-opbeat-imports' into prevent-pycharm-from-formatting-raven-and-opbeat-imports 2017-03-20 17:04:25 +03:00
Nikita P. Shupeyko
7af813caaa 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.
2017-03-20 17:03:16 +03: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
Nikita P. Shupeyko
adfd13b81d Merge branch 'master' into prevent-pycharm-from-formatting-raven-and-opbeat-imports 2017-03-16 13:06:26 +03:00
Rafael Laverde
4156a99b6a Docs: Add missing MAILGUN_SENDER_DOMAIN setting in pythonanywhere wsgi configuration. (#1075) 2017-03-13 18:18:14 -07:00
Adam Kaliński
62214af49a Remove Webpack from docs (#1070)
* Remove Webpack from README.md

* Remove Webpack from docs
2017-03-05 09:32:28 -08: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
Nikita P. Shupeyko
955ccb1d23 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.
2017-03-01 15:43:41 +03:00
Burhan Khalid
f9392b7b1f Merge branch 'master' of github.com:pydanny/cookiecutter-django 2017-02-28 23:27:00 +03:00
Jannis Gebauer
33167e64ba add pyup.io coupon 2017-02-27 16:08:15 +01: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
Fabio C. Barrioneuvo da Luz
d0cd31e019 fix docker build on travis-ci 2017-02-15 17:27:12 -03:00
Fábio C. Barrionuevo da Luz
05dba885be add @myilmaz to contributors list 2017-02-15 16:40:38 -03:00
Fábio C. Barrionuevo da Luz
2a8ac82a0f Merge pull request #1038 from myilmaz/duplicate_env
Removed redeclared env
2017-02-15 16:34:06 -03:00
Mesut YILMAZ
3cd57880e0 Removed redeclared env 2017-02-15 11:17:34 +03:00
Audrey Roy Greenfeld
1e9ca84de7 Removed backslashes from punctuation used in random key 2017-02-13 21:59:21 -08:00
Audrey Roy Greenfeld
67873552b0 Removed single and double quotes from punctuation used in random key 2017-02-13 21:57:59 -08:00
Sebastian Reyes Espinosa
44f67452a9 An small pythonic approach to password (#1036)
* An small pythonic approach to password

Providing a more pythonic line for password generation using for that the string content, as suggested for the documentation in #949.

* Adding missing line

Adding missing import at the head of the file. The previous commit added the string content, but I didn't added the needed import line. This fixes it.
2017-02-13 15:37:14 -08: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
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