cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-14 21:57:09 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,179 Commits 11 Branches 576 Tags 24 MiB
1616332af6
Commit Graph

662 Commits

Author SHA1 Message Date
Burhan Khalid
7228833fe9 Merge pull request #462 from burhan/win-docker 
initial fixes for docker issue on windows 10
 2016-01-08 13:29:24 +03:00
Jay
f8a610502a fixed redis url on docker 2016-01-08 11:16:14 +01:00
Adam Bogdał
8dc86c3390 Add exceptions 2016-01-08 10:57:57 +01:00
Jannis Gebauer
30e0f2ace1 fixed typo 2016-01-08 10:15:37 +01:00
Burhan Khalid
640d1de8ac Update Dockerfile 
Typo
 2016-01-07 08:59:30 +03: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
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
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
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
stepmr
def4fcbafa Fix celery worker app name in Procfile 2015-12-15 15:29:00 -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
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
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
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
areski
c2e79902bf Bump Django to v1.9 2015-12-09 13:33:17 +01: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
Fabio C. Barrioneuvo da Luz
ae42895c09 update requirements 2015-11-29 10:24:03 -03:00
Fábio C. Barrionuevo da Luz
28311e7502 update version of ipython 2015-11-25 14:35:07 -03: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
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
Fabio C. Barrioneuvo da Luz
d33e673c3c update requirements 2015-11-24 20:14:01 -03:00
Fabio C. Barrioneuvo da Luz
6092145760 update requirements 2015-11-23 21:15:11 -03:00
Jannis Gebauer
a5675f89e4 Make sure that python 2 users can stay on stable 2015-11-22 23:24:25 +01:00
Jon Miller
dc47e19a03 Change gevent from 1.0.2 to 1.1rc1 to support Py35. 2015-11-22 15:42:35 -06:00
Jan Van Bruggen
733071f121 Move div class unquote outside the if tag 2015-11-22 08:38:36 -08:00
Daniel Roy Greenfeld
b0f0b8686d Merge pull request #416 from bogdal/patch-1 
Use python 3.5 on Heroku/Travis
 2015-11-20 08:50:58 -08:00
Adam Bogdał
518862d328 Use python 3.5 on Travis 2015-11-18 15:07:08 +01:00
Adam Bogdał
c5481135f2 Use python 3.5 on Heroku 2015-11-18 13:52:45 +01:00
Tom Atkins
c653801d5a Add mailhog binary to gitignore 2015-11-18 11:16:44 +00:00
Tom Atkins
3316a3b023 Fix merge conflict in README.rst 2015-11-18 11:16:25 +00:00
Audrey Roy Greenfeld
840f4a7d4c *.pyc is already covered by *.py[cod] 
No need to include it separately.
 2015-11-17 21:05:28 -08:00
Burhan Khalid
e2c700da5c updating env.example 2015-11-17 10:27:58 +03:00
Burhan Khalid
03edea3021 E303 too many blank lines fix 2015-11-16 21:41:06 +03:00
Burhan Khalid
f4a75e0d10 fixing the middleware order 2015-11-16 21:41:06 +03:00
Burhan Khalid
4c07b5dea6 initial configuration to support opbeat 2015-11-16 21:41:06 +03:00
Audrey Roy Greenfeld
5079db3a4a Merge pull request #381 from ad-m/patch-2 
Add factories for model users.User
 2015-11-14 20:05:10 -08:00
Adam Dobrawy
c86d5c928c Fix typo & import in UserFactory 2015-11-14 14:15:00 +01:00
Barclay StudyPC
1ae2d85dd6 Load url tags removed - deprecated in django 1.9 2015-11-12 15:07:22 +00:00
yunti
219afa9153 Update base.txt 2015-11-12 12:43:56 +00:00
Audrey Roy Greenfeld
d1de33fb3e Use django_coverage_plugin to check template test coverage. 2015-11-11 21:07:16 -08:00
Adam Dobrawy
794c9f1ce7 Fix flake erros in UserFactory 2015-11-12 05:54:38 +01:00
Adam Dobrawy
88c6a1775b Added default password to UserFactory 2015-11-12 05:51:15 +01:00
Daniel Roy Greenfeld
a1ec736a9f Merge pull request #382 from crdoconnor/master 
Hitch : Updates to the default end to end test framework template
 2015-11-09 07:23:07 -08:00
Daniel Roy Greenfeld
c49c942ba7 Merge pull request #394 from show0k/patch-1 
Fix python version issue in .travis.yml
 2015-11-09 07:19:28 -08:00
Garry Polley
d92d6e6fec Update django-extensions to current release. 
Fixes #400
 2015-11-08 14:58:07 -06:00
Jay
1ce169d5de added NEW_RELIC_LICENSE_KEY to environment variables 2015-11-07 20:20:19 +01:00
Jay
6699e6d125 added NEW_RELIC_APP_NAME so that it appears on the dashboard 2015-11-07 20:18:11 +01:00
Jannis Gebauer
ba00160aab Merge pull request #362 from amjith/master 
Add newrelic for monitoring.
 2015-11-07 20:10:00 +01:00
Jay
205ac33abc 'dsn'.upper() 2015-11-07 19:05:56 +01:00
Jay
87c5360b18 added DJANGO_SENTRY_DSN 2015-11-07 19:04:19 +01:00
Jannis Gebauer
0be1b8ebbe Merge pull request #397 from ChrisPappalardo/master 
changed ADMIN_URL to DJANGO_ADMIN_URL in env.example
 2015-11-07 18:08:31 +01:00
Daniel Roy Greenfeld
fe9be62cf5 Added *tests* to , because including it is cheating 2015-11-06 16:21:16 -08:00
Chris Pappalardo
85e0471911 changed ADMIN_URL to DJANGO_ADMIN_URL in env.example; the former is not an expected env variable 2015-11-06 10:23:44 -08:00
Audrey Roy Greenfeld
930dee5ddb Merge pull request #391 from mcho421/master 
Fix gevent requirement for Python 3
 2015-11-05 19:57:29 -08:00
Fabio C. Barrioneuvo da Luz
8c05e0140b update django-extensions to 1.5.8 2015-11-05 10:02:05 -03:00
Fabio C. Barrionuevo da Luz
dbe5bcc690 update requirements 2015-11-04 23:24:49 -03:00
Théo Segonds
7f3fad80ce Update .travis.yml 
fix python version issue
 2015-11-03 16:23:00 +01:00
Colm O'Connor
acdec670f0 Resolved conflict from changed base.html not having HTML IDs 2015-11-02 15:23:49 +08:00
mcho421
8c2a4cc317 Fix gevent requirement for Python 3 2015-10-31 12:34:37 +11:00
Audrey Roy Greenfeld
1adb10c300 Merge pull request #378 from MathijsHoogland/patch-3 
Added sudo: true to the travis file
 2015-10-26 23:44:59 -05:00
Daniel Roy Greenfeld
084fb2529e Fixed flake8 issue 2015-10-25 17:37:34 -07:00
Audrey Roy Greenfeld
8307e43d15 Move LOGGING setting to production from common, since it's not useful locally. 2015-10-25 17:30:36 -05:00
Audrey Roy Greenfeld
d04a59fbe8 Update nav in base template to latest Bootstrap 4 version. 2015-10-24 20:31:36 -05:00
Jannis Gebauer
8fe03fe553 no need to chown the file 2015-10-24 19:27:04 +02:00
Jannis Gebauer
fc54af7b15 use REDIS_URL instead of DJANGO_CACHE_URL, fixes #379 2015-10-24 19:25:46 +02:00
Jannis Gebauer
fe497c6dd0 move development postgres data volume to /data/dev to avoid conflicts with production volume 2015-10-24 19:23:43 +02:00
Jannis Gebauer
571530dd09 removed unused commands from development dockerfile 2015-10-24 19:22:08 +02:00
Jannis Gebauer
dc67886f64 Merge pull request #385 from pydanny/change-add-to-copy 
Use COPY instead of ADD in Dockerfiles
 2015-10-24 19:15:53 +02:00
Audrey Roy Greenfeld
dcaa3e91c2 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-10-22 12:37:35 -07:00
Audrey Roy Greenfeld
f9f4876e11 Remove unnecessary gitkeep. Already another file in that dir. 2015-10-22 12:37:14 -07:00
Audrey Roy Greenfeld
3d6169c2b9 Use COPY instead of ADD as per https://docs.docker.com/articles/dockerfile_best-practices/#add-or-copy 2015-10-22 12:35:55 -07:00
Daniel Roy Greenfeld
2b550a75d5 removed isort link 2015-10-21 13:19:08 -07:00
Saurabh Kumar
676739332a Update requirement, coverage, factory-boy 2015-10-22 00:25:01 +05:30
Saurabh Kumar
f01cddeae6 fix requirement, update django-autoslug to 1.9.3 
Thanks @cdvv7788 / @aniketmaithani
 2015-10-22 00:19:24 +05:30
Colm O'Connor
cc98785734 Hitch : Updates to the default framework template - to accomodate new features, rationalized features and bug fixes. 2015-10-20 17:53:03 +08:00
Audrey Roy Greenfeld
c98934d7d5 When developing on Windows, only install psycopg2 in test/prod. 2015-10-19 16:02:42 -07:00
Adam Dobrawy
e1d76ea25e Add factories for users 2015-10-18 13:58:41 +02:00
Audrey Roy Greenfeld
a7c2cf8f56 Set example ALLOWED_HOSTS to be domain and its subdomains. 2015-10-15 14:40:12 -07:00
Daniel Roy Greenfeld
08ab710ea4 Cryptographically secured env.example secret key 2015-10-15 09:29:43 -07:00
MathijsHoogland
ccc0262c5e Added sudo: true to the travis file 
Sudo isn't true for default for some people in travis.
 2015-10-14 16:41:28 +02:00
MathijsHoogland
5a8f1ed4b1 Removed unnecessary space 2015-10-14 14:22:22 +02:00
Saurabh Kumar
4f7e5e5c97 Update requirements to latest stable 
- django-autoslug==1.9.2
- django-debug-toolbar==1.4
- gevent==1.0.2
 2015-10-13 14:22:36 +05:30
Anna Callahan
daedd6c4c3 Fix for raven not being loaded on development 
related to issue #302
 2015-10-11 14:10:39 -04:00
Amjith Ramanujam
4acd6ad098 Remove blank lines to fix flake8 compliance. 2015-10-08 05:38:05 -07:00
Audrey Roy Greenfeld
1027befea1 Merge pull request #361 from pydanny/multiple-dockerfiles 
Multiple Dockerfiles. Implementation of #360.
 2015-10-06 10:46:18 -07:00
Fabio C. Barrioneuvo da Luz
b22611a1a3 update requirements 2015-10-05 18:09:55 -03:00
Chris Franklin
694bbb2e81 Fixes #363 - Remove stray closing tags, fix navbar margin 
Removes stray </ul> tags that don't seem like they should be there. Reduces topbar bottom margin because it looked bad.
 2015-10-04 15:44:06 +01:00
Amjith Ramanujam
c35d759b74 Fix the template syntax error. 2015-10-04 05:51:09 -07:00