cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-12-04 23:44:08 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,508 Commits 15 Branches 589 Tags 26 MiB
2ad3858e26
Commit Graph

6508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Greenfeld
ae71813dd2 Merge pull request #119 from glarrain/patch-2 
settings: fix indentation for `CACHES`
 2014-07-18 09:45:43 -07:00
Daniel Greenfeld
0fa22a0b2d Merge pull request #118 from glarrain/patch-1 
README: remove set config variables for SendGrid
 2014-07-18 09:45:22 -07:00
Daniel Greenfeld
1cbf2c9e37 Merge pull request #116 from glarrain/master 
README: remove redundant settings option
 2014-07-18 09:39:38 -07:00
German Larrain
a2116e721e settings: fix indentation for CACHES 2014-07-17 20:54:49 -04:00
German Larrain
5a78cf98cd README: remove set config variables for SendGrid 
Fix https://github.com/pydanny/cookiecutter-django/issues/117
 2014-07-17 20:46:42 -04:00
German Larrain
529b85e518 README: remove redundant settings option 
Of the three `heroku run python ... manage.py ...` commands, two specified `--settings=config.settings`, which is redundant with what is in `manage.py`, and there is no reason for those two to have that option and for the third not to.
 2014-07-17 20:41:00 -04:00
Daniel Greenfeld
a2eecedaa0 Merge pull request #115 from mattlinares/master 
Expand regex match on users/urls.py UserDetailView
 2014-07-13 14:24:34 -07:00
Matt Linares
ad5857c955 Expand regex match on users/urls.py UserDetailView 2014-07-13 22:56:38 +02:00
Daniel Greenfeld
24cb80c0f3 Create CONTRIBUTING.rst 2014-07-11 08:32:45 -07:00
Daniel Greenfeld
abce2444c7 Merge pull request #113 from Tavistock/patch-2 
updating contrib
 2014-07-09 22:18:13 -07:00
Daniel Greenfeld
1b667ff9e5 Merge pull request #110 from Tavistock/patch-1 
Changed page_title block to be html in the content block
 2014-07-09 22:18:06 -07:00
Travis McNeill
ad9b8ada79 updating contrib 2014-07-10 00:44:56 -04:00
Daniel Greenfeld
7b9686fbd4 Merge pull request #112 from ikkebr/patch-3 
Update CONTRIBUTORS.txt
 2014-07-09 14:11:33 -07:00
Daniel Greenfeld
612aa160de Merge pull request #107 from ikkebr/patch-2 
Added a default LOGIN_URL
 2014-07-09 14:11:07 -07:00
Daniel Greenfeld
38cf9e4514 Merge pull request #106 from ikkebr/patch-1 
Updated external links
 2014-07-09 14:10:44 -07:00
Henrique Pereira
4473b24b85 Update CONTRIBUTORS.txt 
Added my name as requested in #106 and #107
 2014-07-09 17:12:11 -03:00
Travis McNeill
6e0f1da0a2 Changed page_title block to be html in the content block 
base.html has no page_title block
 2014-07-09 14:40:56 -04:00
Daniel Greenfeld
464d0ee9b3 Update CONTRIBUTORS.txt 2014-06-04 10:19:34 -07:00
Daniel Greenfeld
d6d6a344a6 Merge pull request #108 from mozillazg/remove_django-discover-runner 
Remove django-discover-runner app
 2014-06-04 10:18:33 -07:00
Mozillazg
52a2c555ca Remove django-discover-runner app. 
Because it has been added to Django 1.6 as the default test runner.
 2014-06-04 11:19:59 +08:00
Henrique Pereira
78894b85cf Added a default LOGIN_URL 
Added "account_login" as the default LOGIN_URL in settings.py.

This fixes a problem where the application will throw a 404 on the login page if you changed allauth from "/accounts" to anything else.
 2014-05-28 14:36:43 -03:00
Henrique Pereira
52e2261f3f Updated external links 
Updated Bootstrap, jQuery and Angular external links
 2014-05-28 11:16:08 -03:00
Daniel Greenfeld
fdff60d930 Added @kevinastone to contributors 2014-05-23 09:22:09 -07:00
Daniel Greenfeld
86c8343ddc Merge pull request #104 from kevinastone/master 
Added a simple Vagrantfile for setting up a development virtual machine.
 2014-05-23 09:21:16 -07:00
Kevin Stone
37e3059d65 Added a simple Vagrantfile for setting up a development virtual machine. 2014-05-21 21:14:07 -07:00
Daniel Greenfeld
02f03e3d56 Merge pull request #103 from luzfcb/master 
upgrade dependencies to latest versions available
 2014-05-15 11:52:01 -07:00
Fábio C. Barrioneuvo da Luz
d2ccc8972d upgrade dependencies to latest versions available 2014-05-15 10:44:40 -03:00
Daniel Greenfeld
c413c1e1e0 Merge pull request #101 from luzfcb/patch-2 
update django-debug-toolbar config to fix DeprecationWarning
 2014-05-03 09:01:19 -07:00
Fábio C. Barrionuevo da Luz
e124233167 update django-debug-toolbar config 
See more: http://django-debug-toolbar.readthedocs.org/en/1.2/configuration.html#toolbar-options
 2014-05-02 22:51:01 -03:00
Daniel Greenfeld
7dcd6c5870 Fix missing javascript rendering in reset_password view. 2014-05-02 18:07:37 -07:00
Daniel Greenfeld
7777efd9b1 Merge pull request #100 from luzfcb/missing-docs 
Added missing docs and others
 2014-05-02 14:34:36 -07:00
Fábio C. Barrioneuvo da Luz
5309a70261 Simplified configuration database on Heroku. 
See more: https://devcenter.heroku.com/articles/heroku-postgresql#establish-primary-db
 2014-05-02 16:55:14 -03:00
Fábio C. Barrioneuvo da Luz
3d75936e9f added Heroku SENDGRID deploy docs, makes more explicit deploy instructions and add links to relevant projects 2014-05-02 16:49:26 -03:00
Daniel Greenfeld
f12e54ce6e Install grunt, not air. Thanks @merwork! 2014-05-02 09:04:00 -07:00
Daniel Greenfeld
099db80a76 Merge pull request #99 from luzfcb/patch-1 
update django version on requirements file to latest
 2014-04-28 14:43:33 -07:00
Fábio C. Barrionuevo da Luz
8c35a1a3c9 update django version to latest 2014-04-28 18:17:26 -03:00
Daniel Greenfeld
38453926b9 Merge pull request #97 from luzfcb/upgrade-libraries 
upgrade dependencies to latest versions available
 2014-04-22 13:02:35 -07:00
Fábio C. Barrioneuvo da Luz
a78744e820 upgrade dependencies to latest versions available 2014-04-22 15:56:26 -03:00
Daniel Greenfeld
e407be9152 Merge pull request #94 from theskumar/fix/user-admin 
fix(app/user): use proper UserAdmin auth form
 2014-03-25 19:23:46 -07:00
Daniel Greenfeld
22356d5778 Merge pull request #93 from theskumar/disable-debug-in-production 
chore(config): makes debug=False in production
 2014-03-25 19:23:24 -07:00
Daniel Greenfeld
5295f21c4f Merge pull request #92 from theskumar/fix/cookiecutter-variable 
fix(cookie cutter): fixes the misuse of `repo_name`/`project_name`
 2014-03-25 19:22:58 -07:00
Daniel Greenfeld
6e41fb26f0 Merge pull request #91 from theskumar/docs-update 
chore(docs): make it more awesome
 2014-03-23 18:56:02 -07:00
Daniel Greenfeld
3c2f1695f2 Merge pull request #90 from theskumar/fix/heroku-memcache-settings 
fix(settings): fixes wrong cache config used for heroku
 2014-03-23 18:55:16 -07:00
Daniel Greenfeld
9744161295 Merge pull request #89 from theskumar/500-page 
chore(ErrorPage): make 500 error page more informative
 2014-03-23 18:54:44 -07:00
Daniel Greenfeld
3ef41c5071 Merge pull request #88 from theskumar/account-form 
fix(template): fix form actions attribute in accounts template.
 2014-03-23 18:54:22 -07:00
Daniel Greenfeld
192e021768 Merge pull request #87 from theskumar/pgbackups 
chore(docs): heroku pgbackups enable auto-month by-default.
 2014-03-23 18:53:11 -07:00
Saurabh Kumar
39d0be9b98 fix(app/user): use proper UserAdmin auth form 
* use `django.contrib.auth.admin.UserAdmin`.
* using `admin.ModelAdmin` do not provide forms to
  properly handle `passwords`

[1]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#custom-users-and-the-built-in-auth-forms
 2014-03-22 23:58:26 +05:30
Saurabh Kumar
5c7fa4933b chore(config): makes debug=False in production 
* Make debug=False by default and enable it only
  in Local/Development environment.

Fixes: https://github.com/pydanny/cookiecutter-django/issues/75
 2014-03-22 23:29:11 +05:30
Saurabh Kumar
125037cf8a fix(cookie cutter): fixes the misuse of repo_name/project_name 
* project_name may contain spaces, do not use for generating emails
* 'name' variable in package.json is used by Gruntfile to figure-out
   the directory structure of project, so `repo_name` is what must
   be used here
 2014-03-22 23:06:29 +05:30
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