cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-26 11:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
205 Commits 15 Branches 582 Tags 25 MiB
cfa787384d
Commit Graph

205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saurabh Kumar
cfa787384d fix(settings): fixes wrong cache config used for heroku 
* Installs `django-heroku-memcacheify` only on heroku to 
  avoid installing `libmemcached-dev`[1] locally. 

[1] https://github.com/rdegges/django-heroku-memcacheify#install

Fixes: https://github.com/pydanny/cookiecutter-django/issues/80
 2014-03-22 22:46:28 +05:30
Daniel Greenfeld
1ad866770a make cookiecutter.json more obvious in purpose 2014-03-11 19:25:14 -07:00
Daniel Greenfeld
9cc5bc0cb7 Took project_name out of the directory structure 2014-03-11 19:19:39 -07:00
Daniel Greenfeld
457515aada Merge pull request #81 from bennylope/template-spacing 
Makes template var/tag delimiter spacing consistent
 2014-02-28 11:35:28 -08:00
Ben Lopatin
016e049d07 Makes template var/tag delimiter spacing consistent 
Single space between delimiter matches prescribed Django template style
and is consistent with the style those really smart people used in Two
Scoops of Django.
 2014-02-28 14:29:12 -05:00
Daniel Greenfeld
37fed6a01b Merge pull request #77 from luzfcb/patch-2 
Update boto version on production requirements
 2014-02-21 17:54:08 -08:00
Fábio C. Barrionuevo da Luz
8e1a999b3f Update boto version on production requirements 2014-02-21 14:58:55 -02:00
Daniel Greenfeld
8616f77b75 Merge pull request #76 from luzfcb/patch-1 
Update version of libs
 2014-02-20 13:59:56 -08:00
Fábio C. Barrionuevo da Luz
1555013415 Update version of libs 
Update django-cache-url and django-model-utils to latest version
 2014-02-20 19:00:24 -02:00
Daniel Greenfeld
8e0fe061ce Merge pull request #73 from juliocc/master 
Update Django to version 1.6.2
 2014-02-11 08:12:21 -08:00
Julio Castillo
6a73c547af Update Django requirement to version 1.6.2 2014-02-11 16:30:04 +01:00
Daniel Greenfeld
49207bd40a Add @juliocc to contributors 2014-02-10 09:10:01 -08:00
Daniel Greenfeld
6f52976faf Merge pull request #72 from juliocc/master 
Include html5shim using protocol-relative url
 2014-02-10 09:08:43 -08:00
Julio Castillo
963cd84ae9 Include html5shim with protocol-relative url 2014-02-10 18:03:31 +01:00
Daniel Greenfeld
cc13c7b62e Merge pull request #71 from chrisfranklin/patch-1 
Change DJANGO_SETTINGS_MODULE to config.settings
 2014-02-08 22:57:49 -08:00
Chris Franklin
f1cee2b56b Change DJANGO_SETTINGS_MODULE to config.settings 
It was previously {{cookiecutter.project_name}}.config.settings
 2014-02-05 16:49:24 +00:00
Daniel Greenfeld
f62bf97413 Add @knitatoms 2014-01-29 16:16:56 -08:00
Daniel Greenfeld
84bc8b3bc7 Merge pull request #67 from knitatoms/patch-1 
Add documentation on 'getting up and running'
 2014-01-29 16:15:32 -08:00
Tom Atkins
6e440e5967 Add documentation on 'getting up and running' 
Some hopefully usefully instructions to help people get up and running.

Re: Issue #34 On my machine I didn't need to install memcached to successfully install the local requirements.

Re: Issue #39 I've linked to this issue for now. It would be good to remove the need for those steps and then this link can be removed.
 2014-01-29 20:35:06 +00:00
Daniel Greenfeld
cc78893a73 Merge pull request #49 from theskumar/feature/editorconfig 
feat(coding-style): Add editorconfig for consistent coding style
 2014-01-24 09:24:30 -08:00
Daniel Greenfeld
a7bf092450 Merge pull request #66 from theskumar/pip-requirements 
chore(requirements): update pip requirements to latest stable.
 2014-01-24 09:23:25 -08:00
Saurabh Kumar
54cc4d8d66 feat(coding-style): Add editorconfig for consistent coding style 
More info at http://editorconfig.org/

* The list of projects already using it to standardize their coding
styles[1].

* Inspired by editorconfig of django-model-utils[2].

[1]: http://git.io/pz1vWA
[2]: http://git.io/QIAWvw
 2014-01-24 16:56:46 +05:30
Saurabh Kumar
caf43b0f49 chore(requirements): update pip requirements to latest stable. 2014-01-24 16:15:48 +05:30
Daniel Greenfeld
df9f6726bf Merge pull request #65 from theskumar/static-files-update 
Static files update
 2014-01-22 11:25:35 -08:00
Saurabh Kumar
d8f54f4d3f chore(static): update jquery 1.10.1 => 1.10.2 2014-01-23 00:20:22 +05:30
Saurabh Kumar
3f0470edce chore(static): update angularjs 1.0.7 => 1.2.9 2014-01-23 00:19:30 +05:30
Saurabh Kumar
57e1387228 chore(static): update bootstrap 3.0.0 => 3.0.3 2014-01-23 00:18:02 +05:30
Daniel Greenfeld
8f84ab8c16 Merge pull request #64 from theskumar/collectfast 
feat(aws/s3): use Collectfast by @antonagestam for faster collectstatic.
 2014-01-22 10:40:33 -08:00
Saurabh Kumar
04f0511111 feat(aws/s3): use Collectfast by @antonagestam for faster collectstatic. 2014-01-22 22:53:33 +05:30
Daniel Greenfeld
faf861715f Merge pull request #61 from theskumar/newyear 
chore(docs): update default year to 2014.
 2014-01-10 09:52:28 -08:00
Daniel Greenfeld
9143f6ca37 Merge pull request #60 from theskumar/patch-2 
fix(grunt): Use 'sass' as folder name instead of 'scss'.
 2014-01-10 09:51:58 -08:00
Saurabh Kumar
3b3542ce45 chore(docs): update default year to 2014. 2014-01-10 14:02:24 +05:30
Saurabh Kumar
ac091c4f96 fix(grunt): Use 'sass' as folder name instead of 'scss'. 
* Sass is the actual name of the language, not scss[1].

[1] http://sass-lang.com/
 2014-01-10 13:52:09 +05:30
Daniel Greenfeld
d0c41c00cf Merge pull request #59 from theskumar/grunt 
feat(grunt): Add grunt task runner. (ref #58)
 2014-01-09 15:52:31 -08:00
Saurabh Kumar
f79314ea2b feat(grunt): Add grunt task runner. 
* Livereload server.
* Auto compile scss files.

* Heroku python buildpack needs to be specified explicitly to avoid auto detections
of the app as a `Node` app due to presence of `Package.json`.
 2014-01-10 05:06:35 +05:30
Daniel Greenfeld
e6a8827992 Merge pull request #56 from theskumar/patch-1 
Update django-debug-toolbar 0.11.0 => 1.0
 2014-01-09 13:58:33 -08:00
Saurabh Kumar
0d5ce1393b Update django-debug-toolbar 0.11.0 => 1.0 2014-01-10 02:51:28 +05:30
Daniel Greenfeld
ea7e4991d6 Update CONTRIBUTORS.txt 2014-01-08 15:19:10 -08:00
Daniel Greenfeld
29026108c3 Merge pull request #57 from oubiga/master 
Updated Heroku Toolbelt command
 2014-01-08 15:18:25 -08:00
Pablo
ecefa61a47 Updated Heroku Toolbelt command 
Previous versions of the Heroku Toolbelt used config:add and config:remove.
 2014-01-08 12:03:52 +01:00
Daniel Greenfeld
32dfc50a77 Add @yarikoptic to contributors 2014-01-02 15:42:54 -08:00
Daniel Greenfeld
0a1dffd10e Merge pull request #55 from yarikoptic/patch-1 
BF: query __version__ from the project not from repo
 2014-01-02 15:41:43 -08:00
Yaroslav Halchenko
4679b36f04 BF: query __version__ from the project not from repo 2013-12-27 23:05:09 -05:00
Daniel Greenfeld
ce400f98f1 Update README.rst 2013-12-17 08:47:37 -08:00
Daniel Greenfeld
0cc41bb492 Merge pull request #53 from ashwoods/master 
bumping django version to 1.6.1 in requirements
 2013-12-17 08:38:33 -08:00
Ashley Camba
7d6a48ad9f bumping django version to 1.6.1 in requirements 2013-12-17 17:27:58 +01:00
Daniel Greenfeld
db6a7f8ec9 Update CONTRIBUTORS.txt 2013-12-17 08:22:33 -08:00
Daniel Greenfeld
dcb1869f32 Merge pull request #52 from ashwoods/master 
making project folder a valid python package
 2013-12-17 08:22:18 -08:00
Daniel Greenfeld
977dfa2748 Update CONTRIBUTORS.txt 2013-12-17 08:20:22 -08:00
Daniel Greenfeld
6a98480dab Merge pull request #51 from theskumar/gitattributes 
Add .gitattributes file.
 2013-12-17 08:20:05 -08:00