Commit Graph

1205 Commits

Author SHA1 Message Date
Audrey Roy Greenfeld
d5a21c2d88 Merge branch 'creame-imp-control-user-registration' 2016-01-06 21:37:50 -08:00
Audrey Roy Greenfeld
5a65c9e8a9 Merge contributors change. 2016-01-06 21:37:23 -08:00
Burhan Khalid
0877147b58 initial fixes for docker issue on windows 10 2016-01-06 20:04:36 +03:00
Jay
8f03fc443b postgres 9.5 has arrived 2016-01-06 09:58:18 +01:00
Adam Bogdał
dfcdc5f15b Move file to the appropriate path 2016-01-05 21:35:10 +01:00
Adam Bogdał
bab2c175ad Add dockerignore file 2016-01-05 19:13:37 +01:00
Fábio C. Barrionuevo da Luz
a5abee4150 Update CHANGELOG.md 2016-01-04 19:40:23 -03:00
Fábio C. Barrionuevo da Luz
c6d0a41f77 Merge pull request #457 from EricZaporzan/add-tether-script
Added a cdn link to Tether, which is a new requirement for Bootstrap 4
2016-01-04 19:33:50 -03:00
Daniel Roy Greenfeld
49a57e7c6b Made @burhan a core committer 2016-01-04 13:54:59 -08:00
Jannis Gebauer
150577120a update changelog 2016-01-04 11:54:09 +01:00
Jannis Gebauer
65e2d411a0 tweaked docker docs 2016-01-04 11:52:26 +01:00
Eric Zaporzan
438ccf1b82 Added cdn link to Tether, which is a new requirement for Bootstrap 4 (specifically tooltips). 2016-01-02 03:33:35 -05:00
Michael Herman
c06586856c added external resource to readme 2015-12-30 17:40:51 -07:00
Jannis Gebauer
fd88bfa534 Update CHANGELOG.md 2015-12-30 21:00:58 +01:00
Jannis Gebauer
d7acf795c0 Adds Jan Van Bruggen to contributors 2015-12-30 20:59:02 +01:00
Jannis Gebauer
e33f05a153 Merge pull request #455 from jvanbrug/master
Replace pull-right (broken) with pull-xs-right
2015-12-30 20:55:44 +01:00
Jan Van Bruggen
db4e3deeab Replace pull-right (broken) with pull-xs-right
twbs/bootstrap#18340 removed `.pull-left` and `.pull-right`
since they're redundant with `.pull-xs-left` and `.pull-xs-right`.

This solves the styling bug explained in
pydanny/cookiecutter-django#452.
2015-12-29 12:16:30 -08:00
Jay
91f223d7bd added raven logging for celery 2015-12-21 11:28:27 +01:00
Saurabh Kumar
23877e908a Merge pull request #448 from pydanny/fix-error-pages-preview
fix(urls): update 4xx error pages preview, to accept exceptions
2015-12-16 18:11:31 +05:30
Fábio C. Barrionuevo da Luz
c066edd70b Merge pull request #447 from dsclementsen/master
fix DJANGO_SENTRY_DSN env variable if use_sentry
2015-12-16 08:19:50 -03:00
Saurabh Kumar
77c6a12eaa fix(urls): update 4xx error pages preview, to accept exceptions
closes #444
2015-12-16 14:16:54 +05:30
dsclementsen
cdd3932ff5 DJANGO_SENTRY_DSN env variable if use_sentry
Closes pydanny/cookiecutter-django#446
2015-12-16 17:53:28 +11:00
Fábio C. Barrionuevo da Luz
244c81be66 Update CHANGELOG.md 2015-12-15 20:54:17 -03:00
Fábio C. Barrionuevo da Luz
a91803b7e0 Merge pull request #445 from stepmr/patch-5
Fix celery worker app name in Procfile
2015-12-15 20:52:45 -03:00
stepmr
def4fcbafa Fix celery worker app name in Procfile 2015-12-15 15:29:00 -08:00
Daniel Roy Greenfeld
d498ee5184 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-12-13 09:46:20 -08:00
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