Commit Graph

264 Commits

Author SHA1 Message Date
zcho
a3ceb4c9f5 Fix lost import
Return lost import for 
raise forms.ValidationError(self.error_messages['duplicate_username'])
2015-01-04 13:59:38 +03:00
Andy
bdb2147590 Fixed typo 2015-01-03 16:56:01 -06:00
Andy
a81ffdc87d Fixed typo 2015-01-03 16:54:35 -06:00
Saurabh Kumar
16f55a389d upgrade to django 1.7.2 2015-01-03 11:45:06 +05:30
Saurabh Kumar
920dfc2ebb chore(requirements): update pillow 2.6.1 -> 2.7.0
see: http://pillow.readthedocs.org/releasenotes/2.7.0.html
2015-01-02 16:27:34 +05:30
Fábio C. Barrionuevo da Luz
b5054f4cc8 Merge pull request #168 from Phyxsius/patch-1
Fixed typo [skip ci]
2014-12-31 17:54:05 -03:00
Andy
f712016bf7 Fixed typo and case change 2014-12-31 11:27:37 -06:00
Andy
69fb567787 Fixed typo 2014-12-24 00:13:23 -06:00
Saurabh Kumar
a4568173f6 fix boto==2.34.1 not available, update dep to latest 2014-12-19 14:41:23 +05:30
Martin Blech
a362c4041a Added django-extensions to local configuration
It's one of the recommended apps in Two Scoops of Django. `runserver_plus` and
`shell_plus` are real time-savers!
2014-12-18 18:29:02 -03:00
Daniel Greenfeld
ec3a480595 Merge pull request #158 from martinblech/atomic-requests
Added ATOMIC_REQUESTS=True to default DB setup
2014-12-18 09:12:34 -08:00
Saurabh Kumar
7b09ef5090 Merge pull request #157 from martinblech/replace-yourapp
Replaced `yourapp` with `repo_name` template var.
2014-12-18 22:35:44 +05:30
Fabio C. Barrioneuvo da Luz
c35b810aa4 update requirements 2014-12-18 12:19:56 -03:00
Chris Franklin
e0cf4337d2 Fix quote marks in common config to be consistent. 2014-12-03 15:07:22 +00:00
Chris Franklin
9ee47dab78 Fix quote marks 2014-12-03 15:04:52 +00:00
Chris Franklin
7e048c8942 Fix spelling mistakes in production config 2014-12-03 15:02:52 +00:00
Martin Blech
96d053c866 Added ATOMIC_REQUESTS=True to default DB setup
Quoting Two Scoops of Django:
> Use `ATOMIC_REQUESTS` as long as the performance overhead is bearable. That
> means "forever" on most sites.
2014-12-02 17:30:46 -03:00
Martin Blech
f1c53656bc Replaced yourapp with repo_name template var.
No need to ask the user to replace it by hand, cookiecutter can do it for them.
2014-12-01 21:09:28 -03:00
Martin Blech
48a1ddd48c Added default Vagrant gateway to INTERNAL_IPS
Makes Django Debug Toolbar show up too when running inside the Vagrant VM.
2014-12-01 20:54:48 -03:00
Matt Warren
e29879d813 addresses issue mentioned here: https://code.djangoproject.com/ticket/19353
adding users in admin resulted in reference to auth.User
2014-11-26 00:21:25 +05:30
Felipe Arruda Pontes
811c1a3336 bumping version of Django in setup.py to correspond to requirements/base.txt 2014-11-13 00:31:17 -02:00
Benjamin ABEL
a78ec1d134 Fix pep8 errors in docs/conf.py 2014-10-30 14:06:39 +01:00
Benjamin ABEL
e59cd33ec8 Update django to 1.7.1 2014-10-29 22:11:27 +01:00
Sławek Ehlert
cdac4b6f06 minor pep8 fixes
fixes those small linting issues that should not be in this template.

``users/models.py`` F401 warnings are intentionally left for
convenience in future coding.
2014-10-27 23:51:27 +01:00
Daniel Greenfeld
259f0afae6 Added triple quotes to admin name fix #145
This fixes the problem with author names with apostrophes breaking the settings files.
2014-10-21 21:33:56 -07:00
Chris Franklin
593ed5a07d Add sendgrid instructions and note about backup. 2014-10-12 16:13:48 +01:00
Chris Franklin
f4e4dce6f2 Fix RST syntax. 2014-10-12 16:07:02 +01:00
Chris Franklin
e97f91f475 Add dokku deployment instructions
Not ready to be merged, WIP.
2014-10-12 15:59:17 +01:00
Saurabh Kumar
e3e3eca2d2 fix(dep): update pillow, collectfast & heroku-memcacheify to latest 2014-10-08 10:34:23 +05:30
Eyad Sibai
ea4e4121b1 typo fix 2014-10-04 13:58:31 +05:30
Saurabh Kumar
3c29f79c4c fix(docs): remove syncdb command from instructions
It is not required in django > 1.7

closes #140
2014-10-04 12:37:22 +05:30
Bernd Meyer
3900088772 Added the latest version of pytz (2014.7) to requirements/base.txt to
avoid errors with DateTime fields.
2014-10-03 12:12:59 -07:00
Bernd Meyer
63f64b648b Fixed missing @ before db name. 2014-10-03 08:08:28 -07:00
Bernd Meyer
07435921a6 Added database credentials and security check for db password.
Added database credentials (user name: 'django', password: 'blank') and
security check for db password. The security check will raise an error
if the database password is 'blank' in production.
2014-10-03 08:04:09 -07:00
Bernd Meyer
ce916f12e1 Added pytz to requirements/base.txt
Added the latest version of pytz (2014.7) to requirements/base.txt to
avoid errors with DateTime fields.
2014-10-03 07:08:38 -07:00
Fábio C. Barrionuevo da Luz
9eca939861 reverted pylibmc to 1.2.3 version
Reverted pylibmc to 1.2.3 version because django-heroku-memcacheify==0.5 require pylibmc==1.2.3 

https://github.com/rdegges/django-heroku-memcacheify/blob/master/setup.py#L18
2014-09-18 17:42:42 -03:00
Saurabh Kumar
5d004ba6e4 fix(security/dj-secure): add missing middleware of django-secure
- For the working of django-secure the middleware class needs
to be added. (http://django-secure.readthedocs.org/en/latest/index.html#usage)
- add correct values for SECURE_PROXY_SSL_HEADER for heroku
2014-09-13 02:06:34 +05:30
Daniel Greenfeld
e84c9daea4 Merge pull request #128 from talpor/master
Yay! Update django to 1.7 👍 👍 👍 👍 👍
2014-09-03 13:55:21 -07:00
Alberto Sanchez
ce85e8b6dc fix sites migrations 2014-09-03 15:07:36 -04:30
Alberto Sanchez
a5402511b0 change migrations from south to new django format 2014-09-03 12:53:06 -04:30
Alberto Sanchez
6c3828cb4e update django to 1.7 2014-09-03 12:51:27 -04:30
Alberto Sanchez
eefdf06fb0 remove south 2014-09-03 12:49:34 -04:30
Daniel Greenfeld
c82d020ea1 Update requirements 2014-09-03 10:05:57 -07:00
Saurabh Kumar
8a56273cec update pillow 2.5.2 => 2.5.3
- A security release update for pillow.
2014-08-24 20:47:06 +05:30
Daniel Greenfeld
03c34c547a Updated Django for 1.6.6 security release 2014-08-21 20:41:48 -03:00
Saurabh Kumar
81576069f8 refractor(settings): break up the settings into one module per configuration
- moves urls.py to project_root
- moves wsgi.py to project_root
- 'config.settings' is replaced by 'config', selectively applicable
  configs are imported in '__init__.py'

fixes: #47
2014-08-18 22:26:16 +05:30
Daniel Greenfeld
1701aed142 Updated South and added badge 2014-08-17 11:23:19 -03:00
Daniel Greenfeld
5a9ddc586a Update requirements 2014-08-17 11:22:19 -03:00
Daniel Greenfeld
93fb8f8698 merge 2014-08-17 11:20:05 -03:00
Daniel Greenfeld
d7f16a4d14 Adding now value 2014-08-17 11:18:53 -03:00
Sławek Ehlert
10e3e8f6ab add flake8 and setup.cfg for linting
some changes to pass flake8 linting. added setup.cfg for flake8
configuration. Ignoring E265 can be added to this file because
config/settings.py is flooded with this error. After #105 gets
merged it'll be OK.
2014-08-07 21:10:26 +02:00
Russell Davies
596b2e8df8 Updated wsgi to default to Production configuration
Prevents the application server from running in Local configuration if
DJANGO_CONFIGURATION variable is not set.  Related to: pydanny#75
2014-07-19 16:03:02 +01:00
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
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
Matt Linares
ad5857c955 Expand regex match on users/urls.py UserDetailView 2014-07-13 22:56:38 +02: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
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
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
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
Kevin Stone
37e3059d65 Added a simple Vagrantfile for setting up a development virtual machine. 2014-05-21 21:14:07 -07:00
Fábio C. Barrioneuvo da Luz
d2ccc8972d upgrade dependencies to latest versions available 2014-05-15 10:44:40 -03: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
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
Fábio C. Barrionuevo da Luz
8c35a1a3c9 update django version to latest 2014-04-28 18:17:26 -03: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
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
Saurabh Kumar
9e1b75959b chore(docs): make it more awesome
* cleanup heroku deploy instrunctions.
* collectstatic is run automaitcally by heroku
* includes 'getting started' section in generated code.
* add 'createsuperuser' explicity, as migrate will not
  add them by default. (Until it's fixed in https://github.com/pydanny/cookiecutter-django/issues/39)
2014-03-22 22:37:12 +05:30
Saurabh Kumar
de18582b54 chore(docs): heroku pgbackups enable auto-month by-default.
https://devcenter.heroku.com/articles/pgbackups#migrating-between-plans
2014-03-22 20:12:25 +05:30
Saurabh Kumar
ed798e9527 fix(template): fix form actions attribute in accounts template.
If the action is "empty" google chrome doesn't submit the form.
2014-03-22 20:02:24 +05:30
Saurabh Kumar
3bdf355b42 chore(ErrorPage): make 500 error page more informative 2014-03-22 20:00:50 +05:30
Daniel Greenfeld
9cc5bc0cb7 Took project_name out of the directory structure 2014-03-11 19:19:39 -07: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
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