cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-30 05:24:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
276 Commits 12 Branches 585 Tags 25 MiB
a5402511b0
Commit Graph

174 Commits

Author SHA1 Message Date
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
Fábio C. Barrionuevo da Luz
8e1a999b3f Update boto version on production requirements 2014-02-21 14:58:55 -02: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
Julio Castillo
6a73c547af Update Django requirement to version 1.6.2 2014-02-11 16:30:04 +01:00
Julio Castillo
963cd84ae9 Include html5shim with protocol-relative url 2014-02-10 18:03:31 +01: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
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
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
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
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
Saurabh Kumar
0d5ce1393b Update django-debug-toolbar 0.11.0 => 1.0 2014-01-10 02:51:28 +05:30
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
Yaroslav Halchenko
4679b36f04 BF: query __version__ from the project not from repo 2013-12-27 23:05:09 -05:00
Ashley Camba
7d6a48ad9f bumping django version to 1.6.1 in requirements 2013-12-17 17:27:58 +01: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
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
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
5290aed9a1 integration of submissions from @luzfcb and @syst3ml00t 2013-11-12 07:58:28 -08: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
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
Tom Offermann
f3c54e8039 Add migration to set site domain and name. 2013-10-04 11:40:15 -07:00
Daniel Greenfeld
cf0727d94c Merge pull request #28 from toffer/patch-1 
Fill in form action attribute in user_detail.html.
 2013-10-03 01:10:43 -07:00
Daniel Greenfeld
26b2e9ce6a via @natea since the settings.py file is nested inside the config/ dir, we need to go up one directory to find the static files 2013-10-03 10:14:42 +02:00
Daniel Greenfeld
2afb506061 via @natea set the python path in the procfile, and use foreman to start the server 2013-10-03 10:13:30 +02:00
Daniel Greenfeld
21518e8977 via @natea fix a missing cookiecutter prefix 2013-10-03 10:10:42 +02:00
Daniel Greenfeld
73824b1e97 Inspired by @natea, Make the deploy to Heroku instructions nicely formatted and EMAIL_BACKEND default 2013-10-03 10:08:03 +02:00
Tom Offermann
f8b4e6f0a1 Fill in form action attribute in user_detail.html. 
Using Chrome, the update form didn't submit with a blank action, but worked fine once I specified it.

Also, in researching whether a blank action attribute was OK, I found out that according to the HTML5 spec, the action attribute "must have a value that is a valid non-empty URL potentially surrounded by spaces."

http://www.w3.org/TR/html5/forms.html#attr-fs-action
 2013-10-01 23:40:58 -07:00
Daniel Greenfeld
3680c7b60e Merge pull request #26 from jimfmunro/fix-heroku 
add config and moved staticfiles section
 2013-09-26 18:59:17 -07:00
Jim Munro
fc7402f922 correct about-page url 2013-09-26 14:05:42 -06:00
Jim Munro
eeaece5571 add config and moved staticfiles section 2013-09-26 13:23:58 -06:00
jmunro
baa83a762c wont define the cache value unless default keyword is present for argument 2013-09-22 22:15:37 -06:00
Daniel Greenfeld
31defe87bd fix the django-model-utils 2013-09-22 15:03:33 +02:00
Daniel Greenfeld
7ab7cf910d Bump South to the stable 0.8.2 release 2013-09-22 14:51:26 +02:00
Daniel Greenfeld
595c75e2f1 Update django-avatar to 2.0 2013-09-22 14:47:34 +02:00
Daniel Greenfeld
b57a0aec0a Update CACHE controls to work better with django-configurations 2013-09-22 14:42:56 +02:00
jmunro
f76ef042d1 added config for basic memcache setup 2013-09-21 21:59:53 -06:00
Vitaly Babiy
b32718c955 Fixing the default check on databases setting. 2013-09-19 20:41:12 -04:00
Daniel Greenfeld
a1dff3e976 Basic settings stuff 2013-09-19 12:18:26 +02:00
Daniel Greenfeld
7323f87e37 More fixes per @jezdez's oversight 2013-09-17 15:11:22 +02:00
Daniel Greenfeld
527a9b29a1 Bump up the Django version 2013-09-17 14:25:39 +02:00
Daniel Greenfeld
79cb6a3205 Post @jezdez cleanup 2013-09-17 14:19:31 +02:00
Daniel Greenfeld
cee802c859 Add django-configurations 2013-09-15 15:02:13 +02:00
Daniel Greenfeld
737f14dcc6 Specify bootstrap3 for crispy forms 2013-09-02 11:54:16 +02:00
Daniel Greenfeld
e38e5ce7ab django-crispy-forms now can be pinned 2013-09-02 11:52:32 +02:00
Daniel Greenfeld
bcaeed88c4 Update password_change.html 2013-09-01 19:38:57 +02:00
Daniel Greenfeld
f436dddf71 Update password_reset_from_key.html 2013-09-01 19:38:34 +02:00
Bouke Haarsma
c01b4a2f9a Use domain_name variable for Site object 2013-08-29 10:04:50 +02:00
Daniel Greenfeld
0914c7a923 Merge pull request #12 from Bouke/patch-6 
Typo in cookiecutter variable domain name
 2013-08-29 00:38:24 -07:00
Bouke Haarsma
aaf7ef9c76 Typo in cookiecutter variable 2013-08-29 09:16:22 +02:00
Bouke Haarsma
60f577e706 License is BSD, not MIT 2013-08-29 08:57:20 +02:00
Daniel Greenfeld
ce98a8f6f2 Merge pull request #8 from Bouke/patch-2 
Heroku caching only in production
 2013-08-28 04:47:22 -07:00
Bouke Haarsma
3ac2b7cdbe Fix environ not being defined 2013-08-28 13:37:53 +02:00
Bouke Haarsma
bca3f53b6d Heroku caching only in production 2013-08-28 13:25:42 +02:00
Bouke Haarsma
1723385df6 Fixes deployment to Heroku 2013-08-28 12:53:08 +02:00
Daniel Greenfeld
f807eb9ef5 Update base.txt 2013-08-27 09:08:52 +02:00
Daniel Greenfeld
45b04ff20e Update settings.py 2013-08-26 05:03:29 +02:00
Daniel Greenfeld
bf351fb510 Update settings.py 2013-08-24 13:33:34 +02:00
Daniel Greenfeld
f09afdea74 Add {{cookiecutter.secret_key}} context variable 2013-08-24 13:30:28 +02:00
Daniel Greenfeld
59770c8996 fix avatar templates to correct #6 2013-08-23 09:52:25 +02:00
Daniel Greenfeld
bd085f7176 Update requirements.txt 2013-08-20 20:27:07 +02:00
Daniel Greenfeld
38be169897 Add caching 2013-08-20 20:26:28 +02:00
Daniel Greenfeld
0e9eb8c9ac Update everything to work with Bootstrap 3.0.0 as well as include Avatar templates 2013-08-20 17:53:17 +02:00
Daniel Greenfeld
57687958d0 Merge pull request #5 from bennylope/author-fix 
Django project contributors should list project author
 2013-08-20 08:21:09 -07:00
Ben Lopatin
d3d8e1147c Repo contributors should start with project author 2013-08-20 10:07:49 -04:00
Lukas Klein
0acac55835 Update README.rst 2013-08-20 16:03:33 +02:00
Daniel Greenfeld
dbb6f495a9 Update base.html 2013-08-20 10:56:49 +02:00
Daniel Greenfeld
f99def2ea4 Update README.rst 2013-08-19 22:19:36 +02:00
Daniel Greenfeld
e06772eec4 Heroku deployment instructions 2013-08-19 20:32:07 +02:00
Daniel Greenfeld
b8896cb26f Add a modal block 2013-08-19 17:47:15 +02:00
Daniel Greenfeld
f373ae79da Adding angular ng-app attribute 2013-08-19 15:42:43 +02:00
Daniel Greenfeld
059efa73c3 Adding Angular instead of Juguler. 2013-08-19 15:42:14 +02:00
Daniel Greenfeld
e98855723b Fix some minor issues 2013-08-18 15:24:23 +02:00