Commit Graph

3779 Commits

Author SHA1 Message Date
Daniel Roy Greenfeld
7d9eba607b Added @areski to our contributors list 2015-12-13 09:44:53 -08:00
Daniel Roy Greenfeld
7c0348a9e3 Merge pull request #435 from areski/bump-to-django19
Bump Django to v1.9
2015-12-13 09:42:47 -08:00
Daniel Roy Greenfeld
93e753086c Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-12-13 09:39:12 -08:00
Daniel Roy Greenfeld
4338227f16 Updated changelog 2015-12-13 09:39:05 -08:00
Daniel Roy Greenfeld
761c71696b Merge pull request #441 from stepmr/patch-2
Support opbeat logging with celery
2015-12-13 09:37:09 -08:00
Daniel Roy Greenfeld
afc94ccbdb Merge pull request #440 from stepmr/patch-1
Update runtime.txt with PY2 support
2015-12-13 09:35:46 -08:00
Daniel Roy Greenfeld
f7572a55c1 Update changelog 2015-12-12 14:25:16 -08:00
Daniel Roy Greenfeld
40bce156c6 Merge pull request #442 from stepmr/patch-3
Add celery worker to Procfile
2015-12-12 14:20:30 -08:00
stepmr
681247e4b7 Add celery worker to Procfile 2015-12-11 23:10:08 -08:00
stepmr
506eb22be0 Support opbeat logging with celery
- support opbeat logging with celery
- modify sentry imports to avoid conflicts
2015-12-11 17:56:54 -08:00
stepmr
a588d804f7 Update runtime.txt
- Support python-2.7.10 runtime
2015-12-11 17:42:30 -08:00
Daniel Roy Greenfeld
ae0a2b82ba Update CHANGELOG.md 2015-12-11 07:35:19 -08:00
Daniel Roy Greenfeld
57037df04c Merge pull request #437 from yunti/patch-1
Update Heroku runtime.txt for python 3.5.1
2015-12-11 07:34:29 -08:00
yunti
d21b021e7a Update runtime.txt 2015-12-11 14:43:30 +00:00
Fabio C. Barrioneuvo da Luz
fc37d65661 fix issue #436 2015-12-11 09:05:49 -03:00
Daniel Roy Greenfeld
aa0a8cc9b9 Merge pull request #434 from sydhenry/patch-1
SECRET_KEY gen to short
2015-12-09 15:37:26 -08:00
areski
c2e79902bf Bump Django to v1.9 2015-12-09 13:33:17 +01:00
Sydney Henry
4291243a9c Keep admin url short 2015-12-08 22:16:22 -07:00
Sydney Henry
21f5637a65 SECRET_KEY gen to short
when `heroku run python manage.py check --deploy` is ran this error occurs
?: (security.W009) Your SECRET_KEY has less than 50 characters or less than 5 unique characters. Please generate a long and random SECRET_KEY, otherwise many of Django's security-critical features will be vulnerable to attack.

changing the num of ran to a larger number fixes this issue
2015-12-08 22:10:46 -07:00
Daniel Roy Greenfeld
677927d786 Merge of @burhans reorg 2015-12-06 16:07:42 -08:00
David Díaz
cc1da172f4 [IMP] django-allauth configuration: Allow enable or disable user registration using ACCOUNT_ALLOW_REGISTRATION setting. 2015-12-05 20:12:53 +01:00
Fábio C. Barrionuevo da Luz
062d6d31a4 pin requires.io django version to < 1.9 2015-12-02 08:36:15 -03:00
Fábio C. Barrionuevo da Luz
69252c3d02 Merge pull request #430 from FailSafe86/patch-2
Update CHANGELOG.md
2015-12-01 12:08:17 -03:00
Fábio C. Barrionuevo da Luz
245a912ef4 Merge pull request #429 from FailSafe86/patch-3
Update CONTRIBUTORS.rst
2015-12-01 12:03:04 -03:00
Fábio C. Barrionuevo da Luz
111ed7276f Merge pull request #428 from FailSafe86/patch-1
Update developing-locally.rst
2015-12-01 12:02:58 -03:00
Thomas Korrison
564cacd87b Update CONTRIBUTORS.rst 2015-12-01 14:29:56 +00:00
Thomas Korrison
a24ff2c4a7 Update CHANGELOG.md 2015-12-01 14:28:21 +00:00
Thomas Korrison
a304e466a5 Update developing-locally.rst 2015-12-01 14:25:55 +00:00
Thomas Korrison
917bf99ea3 Update developing-locally.rst 2015-12-01 14:09:50 +00:00
Fabio C. Barrioneuvo da Luz
ae42895c09 update requirements 2015-11-29 10:24:03 -03:00
Fabio C. Barrioneuvo da Luz
252d005e77 update version of django in setup.py 2015-11-25 16:29:53 -03:00
Fábio C. Barrionuevo da Luz
5610d4a7c1 Merge pull request #426 from pydanny/luzfcb-all-green-the-return
update version of ipython in hitch requirements
2015-11-25 15:42:19 -02:00
Fábio C. Barrionuevo da Luz
63b1f07cd2 Update CHANGELOG.md 2015-11-25 14:35:56 -03:00
Fábio C. Barrionuevo da Luz
28311e7502 update version of ipython 2015-11-25 14:35:07 -03:00
Audrey Roy Greenfeld
fdf17c7e32 Update changelog about removing debugging tools. 2015-11-25 08:35:13 -08:00
Audrey Roy Greenfeld
59a6c637ac Remove debugging tools from non-generated part of project, since those are personal prefs. 2015-11-25 08:33:06 -08:00
Audrey Roy Greenfeld
7b949ba6cc Update gunicorn to 19.4.1. 2015-11-25 08:20:19 -08:00
Fábio C. Barrionuevo da Luz
4c684d4efc Merge pull request #425 from pydanny/luzfcb-all-green-XD
Update version of psutil
2015-11-25 10:40:31 -02:00
Fábio C. Barrionuevo da Luz
6f0c2af33a Update CHANGELOG.md 2015-11-25 09:36:10 -03:00
Fábio C. Barrionuevo da Luz
fa46eb7cc2 update psutil version to 3.3.0 2015-11-25 09:35:17 -03:00
Fabio C. Barrioneuvo da Luz
c9f500116d fix celery configuration in local.py 2015-11-24 22:00:16 -03:00
Fábio C. Barrionuevo da Luz
90ed4f81e2 Merge pull request #424 from pydanny/update-requirements
update requirements
2015-11-24 21:51:16 -02:00
Fabio C. Barrioneuvo da Luz
d33e673c3c update requirements 2015-11-24 20:14:01 -03:00
Fabio C. Barrioneuvo da Luz
0ef11d1818 sh package version pinned to 1.11 2015-11-23 23:11:52 -03:00
Fábio C. Barrionuevo da Luz
a2a4b196fb Merge pull request #423 from pydanny/update-requirements
update requirements
2015-11-24 00:01:49 -02:00
Fabio C. Barrioneuvo da Luz
6092145760 update requirements 2015-11-23 21:15:11 -03:00
Jannis Gebauer
5aec6203c2 add Jon Miller to contributors 2015-11-22 23:28:27 +01:00
Jannis Gebauer
20ea440cc2 add gevent python3 fix to the changelog 2015-11-22 23:27:11 +01:00
Jannis Gebauer
a5675f89e4 Make sure that python 2 users can stay on stable 2015-11-22 23:24:25 +01:00
Jannis Gebauer
73d78ba673 Merge pull request #421 from jondelmil/master
Change gevent from 1.0.2 to 1.1rc1 to support Py35.
2015-11-22 23:20:51 +01:00