Commit Graph

595 Commits

Author SHA1 Message Date
Fabio C. Barrionuevo da Luz
0fbd6ccd72 add shellscript helper to install all python dependencies of the project (local, test, and production dependencies) 2015-03-13 21:07:42 -03:00
Fabio C. Barrionuevo da Luz
164a496a85 add shellscript helper to install external dependencies (non-python dependencies) listed on requirements.apt file 2015-03-13 21:07:25 -03:00
Fabio C. Barrionuevo da Luz
1ceae50833 add requirements file of external dependencies (non-python dependencies), named "requirements.apt" - fix issue #34 2015-03-13 21:06:58 -03:00
Saurabh Kumar
ba2bcf8190 Merge pull request #199 from ka7eh/ka7eh
Updated INSTALLED_APPS for 'collectfast'.
2015-03-13 12:20:08 +05:30
Kaveh
431f7a69a3 Removed django version check for collectfast. 2015-03-12 08:58:01 -05:00
Saurabh Kumar
91c3ff00ed fix(setup.py): do not import package in setup.py
- adds `__version_info__` meta for package
- update django requirement to 1.7.6

closes #98
2015-03-12 13:58:11 +05:30
Fabio Caritas Barrionuevo da Luz
bddf914bd5 updated django version to 1.7.6 and django-debug-toolbar to 1.3.0 2015-03-10 11:39:58 -03:00
Kaveh
abd0883b61 Updated INSTALLED_APPS for 'collectfast'. 2015-03-09 14:44:43 -05:00
Fábio C. Barrionuevo da Luz
9c4ad0da1a updated django-extensions version to 1.5.1 2015-03-09 11:58:59 -03:00
Fábio C. Barrionuevo da Luz
d7e813aa15 updated flake8 version to 2.4.0 2015-03-09 01:36:27 -03:00
Fábio C. Barrionuevo da Luz
4d9d7d9110 update gunicorn version to 19.3.0 2015-03-07 12:53:33 -03:00
Saurabh Kumar
195db003fc Merge pull request #191 from philippeluickx/master
Middleware security placed in production configuration
2015-02-27 11:07:50 +05:30
Fábio C. Barrionuevo da Luz
10f563abf0 updated django version to 1.7.5 2015-02-26 13:35:26 -03:00
Philippe Luickx
2580dad42d Middleware security placed in production configuration 2015-02-26 17:15:47 +02:00
Saurabh Kumar
a9a729e500 feat(templating): make TIMEZONE default to UTC and configurable
Thanks @burhan for reportings this.

closes #109
2015-02-24 19:06:31 +05:30
Kevin Ndung'u
59487ba542 Fix small typo in wsgi.py
Add missing `cookiecutter`  reference in wsgi.py
2015-02-12 12:49:33 +03:00
Fabio C. Barrionuevo da Luz
b1f24e6940 Update requirements 2015-02-10 14:16:00 -03:00
Fabio C. Barrionuevo da Luz
b2938581d9 fix issue #178 2015-02-10 14:06:54 -03:00
Fábio C. Barrionuevo da Luz
58b8a9407d Merge pull request #176 from kevgathuku/double-quotes
Use double quotes for author name fields
2015-02-10 13:36:11 -03:00
Fabio C. Barrionuevo da Luz
34afcbb453 ignore pep8 on django-configurations import in wsgi.py file 2015-02-10 12:55:33 -03:00
Kevin Ndung'u
0162d07e1c Use double quotes on author field in setup.py 2015-02-09 14:00:26 +03:00
Kevin Ndung'u
3649a2939e Use double quotes for author name fields
This is meant to handle errors caused when the author name
contains punctuation i.e apostrophes
2015-02-09 13:32:31 +03:00
Daniel Greenfeld
e18b4271b6 Update production.txt 2015-01-28 10:40:34 -08:00
Daniel Greenfeld
5595ebcc64 Update requirements 2015-01-28 10:39:44 -08:00
Daniel Greenfeld
9c995f0cbb Update requirements 2015-01-28 10:39:21 -08:00
Saurabh Kumar
53baa67b2b update django 1.7.2 -> 1.7.3 (security update)
https://www.djangoproject.com/weblog/2015/jan/13/security/
2015-01-16 23:13:34 +05:30
Daniel Greenfeld
32bee30d6a Corrected 'repo_name' so it's not on my personal branch 2015-01-13 08:39:10 -08:00
Daniel Greenfeld
b54309c48f Switched to using cookiecutter 0.9.0 Jinjafied cookiecutter.json 2015-01-13 08:37:28 -08:00
Chris Franklin
4412abd588 Update django-allauth 0.18.0 --> 0.19.0 2015-01-04 23:26:34 +00:00
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
Jay
073666e09c now passes flake8 2014-10-12 10:32:17 +02:00
Jay
eadd3e77f8 added optional celery support out of the box 2014-10-12 10:32:17 +02: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
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
Daniel Greenfeld
618cd6018a Fix authentication 2013-08-18 09:44:26 +02:00
Albrecht Mühlenschulte
2f67f978c7 a comma to much - is no more. 2013-08-17 19:24:26 +02:00
Daniel Greenfeld
b3a43bc633 Template caching 2013-08-16 21:23:16 +02:00
Daniel Greenfeld
109f4c9b68 Tweak the auth 2013-08-16 21:07:01 +02:00
Daniel Greenfeld
dd7fb952d7 fix allauth 2013-08-16 20:52:30 +02:00
Daniel Greenfeld
a2195db9ae Customization prep 2013-08-16 18:23:22 +02:00
Daniel Greenfeld
0fba2400fa Put in markers for configuration, plus Procfile 2013-08-16 17:53:14 +02:00
Daniel Greenfeld
f5e754c285 Getting templates and URLS to work 2013-08-16 16:28:23 +02:00
Daniel Greenfeld
d58da9e5e8 Setup fixes 2013-08-16 15:52:03 +02:00
Daniel Greenfeld
eb35064b13 Fix the user templates 2013-08-16 15:19:50 +02:00
Daniel Greenfeld
a6a4f2272d Fix the templates so they don't blow up cookiecutter 2013-08-16 15:17:18 +02:00
Daniel Greenfeld
d47f30c9fc more config 2013-08-16 14:36:21 +02:00
Daniel Greenfeld
4dd2a3c78f OOdles of templates 2013-08-16 14:07:28 +02:00
Daniel Greenfeld
2d6d2c0e65 So much boilerplate 2013-08-16 13:54:47 +02:00
Daniel Greenfeld
2135de2edc many nice enhancements 2013-08-16 13:35:18 +02:00
Daniel Greenfeld
a629c7a4a2 Update base.txt 2013-08-16 13:04:55 +02:00
Daniel Greenfeld
58e4fd23d5 Update LICENSE.rst 2013-08-16 12:58:06 +02:00
Daniel Greenfeld
d004b57280 Update README.rst 2013-08-16 12:55:28 +02:00
Daniel Greenfeld
c9437cacc3 Push to github 2013-08-16 12:55:43 +02:00
Daniel Greenfeld
e2a9fbee6a Remove glyphicons 2013-08-16 12:37:59 +02:00
Daniel Greenfeld
6c772daca3 moar settings stuff 2013-08-15 20:31:04 +02:00
Daniel Greenfeld
c8a01b6bad Fix the layout to match the cookie cutter pattern 2013-08-15 20:03:08 +02:00
Daniel Greenfeld
d862465712 base template 2013-08-15 19:59:11 +02:00
Daniel Greenfeld
988b4f8a46 Getting pieces to work 2013-08-15 19:47:35 +02:00