cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-20 00:27:06 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,475 Commits 14 Branches 579 Tags 24 MiB
b378cc6435
Commit Graph

5475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ashley Camba
77b176ec51 fixing typo in django version 2013-12-17 16:58:49 +01:00
Ashley Camba
3a036b3b14 fixing typo in django version 2013-12-17 16:56:20 +01:00
Ashley Camba
c2c575084b adding django 1.6.1 to project requirements 2013-12-17 16:53:56 +01:00
Ashley Camba
4a606d084a re-adding import to setup.py 2013-12-17 16:50:15 +01:00
Ashley Camba
0102b8a0ee adding manage.py to scripts 2013-12-17 16:44:20 +01:00
Ashley Camba
969cc4d5a8 making the setup.py as simple as posible 2013-12-17 16:39:16 +01:00
Ashley Camba
a1a1fc994f adding version and __init__.py file 2013-12-17 16:33:49 +01:00
Ashley Camba
e197fd33b1 refactoring project to a also be a python package 2013-12-17 16:27:18 +01:00
Saurabh Kumar
c6d4b8fac6 Add .gitattributes file. 
To deal with line endings. A project should not rely on
global settings.

https://help.github.com/articles/dealing-with-line-endings

Signed-off-by: Saurabh Kumar <thes.kumar@gmail.com>
 2013-12-12 17:31:45 +05:30
Daniel Greenfeld
86dd24ff6a Merge pull request #50 from luzfcb/fix-missing-documentation 
Fixed missing documentation Email Backend configuration in Development Environment
 2013-11-25 14:03:27 -08:00
Fábio C. Barrioneuvo da Luz
6254598882 Fixed missing documentation Email Backend configuration in Development Environment 2013-11-25 18:42:40 -03:00
Daniel Greenfeld
172036f8f3 integrating c00eae724e which provides a more saner default for handling email in development 2013-11-12 08:12:45 -08:00
Daniel Greenfeld
fd309e29f9 Adding @ccurvey and @luzfcb to contributors 2013-11-12 08:09:25 -08:00
Daniel Greenfeld
5290aed9a1 integration of submissions from @luzfcb and @syst3ml00t 2013-11-12 07:58:28 -08:00
Daniel Greenfeld
ce591e3d55 Add Taylor Baldwin to contributors. 2013-11-06 19:39:56 -08:00
Daniel Greenfeld
52fbd314e9 Adding new contributor Lyla Fischer and some missing contributors. 2013-10-28 13:21:21 -07:00
Daniel Greenfeld
66e48fec78 Merge pull request #37 from Lyla-Fischer/session_cookie 
removed requirement for security from session cookie
 2013-10-28 13:14:30 -07:00
Lyla Fischer
32b6598f15 removed requirement for security from session cookie 2013-10-28 14:57:28 -04:00
Daniel Greenfeld
6b14e33073 Settings mapping effort take 1 for help with #35 2013-10-25 07:59:48 -07:00
Daniel Greenfeld
b094ee1010 Merge pull request #30 from toffer/fix-static-settings 
Fix static paths in settings.py.
 2013-10-15 13:43:12 -07:00
Jim Munro
27e2228665 Merge pull request #33 from toffer/fix-vars-in-sphinx-docs 
Update cookiecutter vars in sphinx files. Looks good.
 2013-10-09 13:32:14 -07:00
Jim Munro
56e50f762c Merge pull request #29 from toffer/set-site-domain-and-name 
Add migration to set site domain and name.Looks good thank!
 2013-10-09 13:28:12 -07:00
Tom Offermann
07bd7a3bf8 Update cookiecutter vars in sphinx files. 
Many variables were missing the `cookiecutter` prefix.

In conf.py:
Added prefix to `project_name` and `description`.
Changed `ChangeMyName` to `cookiecutter.author_name`.
Changed `ChangeToMyName` to `cookiecutter.author_name`.
Don't hard-code year. Use `cookiecutter.year`.

In Makefile and make.bat:
Added prefix to `project_name`.

In LICENSE.rst:
Changed `full_name` to `author_name` and added prefix.

Fix year.
 2013-10-09 13:05:10 -07:00
Jim Munro
0fc5b2c567 Merge pull request #31 from toffer/comment-fix-in-urls-py 
Fix comment.
 2013-10-09 13:03:16 -07:00
Jim Munro
ad840ab0fb Merge pull request #32 from toffer/unescape-cookiecutter-vars-in-template 
Unescape cookiecutter vars in base.html template.
 2013-10-09 11:33:35 -07:00
Tom Offermann
414a127b33 Use project_name in base.html navbar. 
Project name is a better, public-facing name than repo name.
 2013-10-09 10:26:42 -07:00
Tom Offermann
328a92310a Unescape cookiecutter vars in base.html template. 
Cookiecutter variables don't get replaced inside a raw block,
so we need to turn off raw temporarily.
 2013-10-09 10:26:34 -07:00
Tom Offermann
7700ab4f7e Fix comment. 2013-10-06 22:16:21 -07:00
Tom Offermann
4999f8e4fd Fix static paths in settings.py. 
* STATIC_ROOT is at the same level as BASE_DIR, not in the BASE_DIR.
* STATIC_ROOT is set as an absolute path.
* Set STATICFILES_DIRS so collectstatic looks in `BASE_DIR/static`,
  not `BASE_DIR/../static`.

Fixes #11.
 2013-10-04 12:04:04 -07:00
Tom Offermann
3c06571734 Removed "TODO" to automate script. 
Automated in previous commit.
 2013-10-04 11:40:56 -07:00