Commit Graph

4140 Commits

Author SHA1 Message Date
Burhan Khalid
4ff84a5799 Merge branch 'master' of https://github.com/mjhea0/cookiecutter-django into mjhea0-master 2016-01-17 12:58:45 +03:00
Burhan Khalid
c9e0c5386e Merge branch 'master' of github.com:burhan/cookiecutter-django 2016-01-17 12:54:36 +03:00
Daniel Roy Greenfeld
b66ec6594e Fix test breakers 2016-01-16 11:00:56 -08:00
Daniel Roy Greenfeld
f78069f523 Fixes #345 explain need for django.contrib.sites 2016-01-16 10:43:01 -08:00
Daniel Roy Greenfeld
07514be580 Fixes #345 explain need for django.contrib.sites 2016-01-16 10:40:32 -08:00
Daniel Roy Greenfeld
39dffcbf9f Merge pull request #465 from highpost/master
Added an explanation of how to define the DATABASE_URL environment va…
2016-01-15 10:21:22 -08:00
Audrey Roy Greenfeld
56f12301d7 Add #468 to changelog. Add @Collederas to contributors. 2016-01-15 00:01:25 -08:00
Audrey Roy Greenfeld
24531d9dae Update setup.py to 1.9.1. 2016-01-15 00:01:04 -08:00
Audrey Roy Greenfeld
5137d17dc7 Merge pull request #468 from Collederas/patch-1
Update setup.py
2016-01-14 23:56:15 -08:00
Luis Nell
76b1858861 Adds celerybeat db to gitignore
Doesn't make sense to have the task scheduling db in any VCS.
2016-01-13 21:25:27 +01:00
Audrey Roy Greenfeld
aa157bba18 Require wheel 0.26.0 on Python 3 to get around certain common pip install errors. 2016-01-13 10:41:02 -08:00
Collederas
3b51689860 Update setup.py 2016-01-13 09:17:36 +01:00
Burhan Khalid
ee7f889a9b upgrade django-extensions for a bugfix that breaks django 1.9 compatibility 2016-01-09 20:22:19 +03:00
Burhan Khalid
bbbbb25253 upgrade pillow 2016-01-09 20:10:11 +03:00
Burhan Khalid
d9bbb613c5 upgrade django to 1.9.1 2016-01-09 20:05:23 +03:00
Burhan Khalid
7794121406 updated changelog, and fixed the dates 2016-01-09 20:00:13 +03:00
Burhan Khalid
2bbc0672e1 upgrading crispy-forms to 1.6, adding support for bootstrap 4 and compatibility updates for django 1.9 2016-01-09 19:55:59 +03:00
Burhan Khalid
82224ee612 upgrading django-model-utils to 2.4, which adds support for django 1.9 2016-01-09 19:53:21 +03:00
Daniel Sears
57aed057cc Added an explanation of how to define the DATABASE_URL environment variable. 2016-01-08 15:40:19 -08:00
Burhan Khalid
9d42b346c7 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2016-01-08 13:41:56 +03:00
Jannis Gebauer
424d176b0d windows fix for docker 2016-01-08 11:30:27 +01:00
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
Burhan Khalid
d1a763b9fe fixing typos (again) 2016-01-08 13:21:45 +03:00
Burhan Khalid
9f23929548 Merge pull request #1 from jayfk/patch-2
fixed typo
2016-01-08 13:19:15 +03:00
Jay
f8a610502a fixed redis url on docker 2016-01-08 11:16:14 +01:00
Burhan Khalid
a24664b5a4 Merge branch 'win-docker' 2016-01-08 12:59:39 +03: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
Michael Herman
0ea21b4704 added articles section to readme 2016-01-07 17:17:37 -07:00
Michael Herman
bfc3b09379 Merge remote-tracking branch 'upstream/master' 2016-01-07 17:16:56 -07:00
Daniel Roy Greenfeld
32a61e8678 Modernize the date 2016-01-07 12:30:36 -08:00
Audrey Roy Greenfeld
0637ba63ee Fix Markdown formatting of changelog. 2016-01-07 09:36:36 -08:00
Burhan Khalid
640d1de8ac Update Dockerfile
Typo
2016-01-07 08:59:30 +03:00
Audrey Roy Greenfeld
a63ab00de2 Add #432 to changelog. 2016-01-06 21:47:14 -08:00
Audrey Roy Greenfeld
97c582dd8b Minor cleanup to Contributors. 2016-01-06 21:44:05 -08:00
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