Commit Graph

687 Commits

Author SHA1 Message Date
Fabio C. Barrionuevo da Luz
795fccc15f Update version of django-crispy-forms to 1.5.1, django-extensions to 1.5.6, django-test-plus to 1.0.9, gevent to 1.1b3, coverage to 4.0b2, hitchpython to 0.3.3 and hitchtest to 0.7.6 2015-08-30 22:52:38 -03:00
Daniel Greenfeld
86239af98f Merge pull request #315 from pydanny/bootstrap-4
Upgrade to Bootstrap 4 alpha
2015-08-30 15:45:09 -07:00
Audrey Roy Greenfeld
139deaf6b8 Put <nav> into a div with a nicer-displaying bottom margin. 2015-08-30 15:41:46 -07:00
Audrey Roy Greenfeld
243e823a2e Upgrade jQuery to 2.1.4 and Bootstrap JS to Bootstrap 4. 2015-08-30 14:53:52 -07:00
Daniel Roy Greenfeld
97017f7a17 README reorganization 2015-08-30 12:17:46 -07:00
Daniel Roy Greenfeld
f02eacaece Move dokku to the docs section 2015-08-30 12:12:21 -07:00
Audrey Roy Greenfeld
15dd400769 Be consistent with using non-fluid container in base template. 2015-08-29 21:46:05 -07:00
Audrey Roy Greenfeld
69617648d5 Remove navbar's corners, and invert colors. 2015-08-29 21:44:51 -07:00
Audrey Roy Greenfeld
968c04369e Update stylesheet to Bootstrap 4. Remove optional theme stylesheet. 2015-08-29 12:11:10 -07:00
Audrey Roy Greenfeld
8330706775 Update navbar and toggle to Bootstrap 4 HTML. 2015-08-29 12:09:45 -07:00
Daniel Roy Greenfeld
cb4e1d0d9d Switch to django-mailgun-redux 2015-08-28 22:01:26 -07:00
Audrey Roy Greenfeld
63753ac078 Merge pull request #288 from stepmr/grunt-updates
Grunt Updates: use libsass, add postcss
2015-08-25 20:56:15 -07:00
Daniel Roy Greenfeld
f573fbcb7d Changed requirements files to match current dependency versions 2015-08-20 22:08:40 -07:00
Daniel Greenfeld
5c19e0d5f2 Correct spelling 2015-08-19 20:18:08 -07:00
Saurabh Kumar
83dab0b380 Upgrade django to 1.8.4 [security release]
https://www.djangoproject.com/weblog/2015/aug/18/security-releases/
2015-08-19 11:59:21 +05:30
Jay
c7ea475f06 refactoring + added documentation
- removed env.production and added a env.example that should be renamed to `.env` (not tracked by default)
- Refactored docker-compose.yml
    * adding user to django, celeryworker, celerybeat so that we got rid of the `su` hack
    * removed rabbitmq
- Refactored Dockerfile
- Refactored `entrypoint.sh` and added inline documentation
- Removed `su` hack from gunicorn.sh
- Added documentation
2015-08-18 17:50:20 +02:00
Jay
0a3ad4d0ec Merge commit '79dbcc16f8d32f57d25fa7326f6fdd847eecf25a'
# Conflicts:
#	README.rst
2015-08-18 14:05:47 +02:00
Daniel Greenfeld
dd7259d5aa Updating Tornado so we aren't in the red for requirements. 2015-08-14 16:23:37 -07:00
Daniel Greenfeld
0d68abcc39 Merge pull request #295 from crdoconnor/master
Added support for the Hitch integration testing framework.
2015-08-12 11:41:17 -07:00
Colm O'Connor
4f68d3eb2a Removed sudo from pip install hitch, since the test invoker strictly speaking does not need to be run globally. 2015-08-12 08:49:06 +08:00
Daniel Greenfeld
2996576556 Upped test to 100% and catching up on changelog 2015-08-09 08:00:24 -07:00
Daniel Greenfeld
0477f2ddb5 Merge pull request #285 from jayfk/patch-1
Reflect Celery taskapp refactoring in the docs
2015-08-06 19:03:43 -07:00
Daniel Greenfeld
e02dca8228 Raising coverage of rendered project to 97%. 2015-08-06 18:54:27 -07:00
Kaido Kert
76a207d8da Oops - revert celery defaults change, separate PR 2015-08-06 11:21:08 -07:00
Daniel Greenfeld
74509ac5cb Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-08-05 19:53:52 -07:00
Daniel Greenfeld
8f690d3724 Fixed borked User model 2015-08-05 19:53:46 -07:00
Daniel Greenfeld
d65f2bde6d Merge pull request #292 from burhan/feature/sentry-support
Feature/sentry support
2015-08-05 19:48:34 -07:00
Daniel Greenfeld
518c5d561a making the user object python 2 and 3 friendly 2015-08-05 18:32:12 -07:00
Audrey Roy Greenfeld
9c74fe4bde Move gevent above maildump
Because maildump's dependencies aren't pinned.
2015-08-05 15:24:34 -07:00
Audrey Roy Greenfeld
ff12536765 If using maildump, pin gevent
If using maildump, pin gevent to the version supporting Python 3.
2015-08-05 15:23:01 -07:00
Audrey Roy Greenfeld
773130acb2 Update coverage version to 4.0b1. 2015-08-05 15:11:51 -07:00
Audrey Roy
ed90eb07b6 Better specification of migrations in .coveragerc. 2015-08-04 21:11:36 -07:00
Colm O'Connor
a8836b390b Added note to the README about hitch not running on windows, and instructions on how to install the test runner. 2015-08-04 23:47:37 +08:00
Colm O'Connor
3f2484d75c Enable hitch tests to be run in Travis CI. 2015-08-04 23:39:27 +08:00
Daniel Greenfeld
85ee76ad7c Flake8 fix 2015-08-03 23:03:45 -07:00
Daniel Greenfeld
9f4e904348 Add tests to the admin 2015-08-03 22:48:55 -07:00
Audrey Roy
9e48191115 Instructions to open the HTML coverage report. 2015-08-03 22:31:39 -07:00
Audrey Roy
a7a3661786 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-08-03 22:31:08 -07:00
Audrey Roy
5a455b320f Add coverage project-level config file. 2015-08-03 22:30:58 -07:00
Daniel Greenfeld
1b0e53a374 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-08-03 22:22:07 -07:00
Daniel Greenfeld
48721b3d32 Remove unnecessary form 2015-08-03 22:22:03 -07:00
Audrey Roy
370145bb21 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-08-03 22:21:04 -07:00
Audrey Roy
d4366ce5d5 Add instructions for test coverage. 2015-08-03 22:20:12 -07:00
Daniel Greenfeld
9bb3f08ea3 Update django-allauth 2015-08-03 22:11:53 -07:00
Daniel Greenfeld
f31e10042f Cleaned up signup form 2015-08-03 21:06:56 -07:00
Daniel Greenfeld
bc9e9c7d22 Upgrading test packages 2015-08-03 21:00:42 -07:00
Colm O'Connor
18b1843481 Added support for the Hitch integration testing framework. 2015-08-01 18:26:06 +08:00
Fabio C. Barrioneuvo da Luz
136ade3f67 update django-floppyforms version to 1.5.2 2015-07-30 08:45:11 -03:00
Daniel Greenfeld
09bbc5f853 Removed legacy permalink decorator. 2015-07-29 20:20:26 -07:00
Burhan Khalid
4b0d35194f making sure tests pass 2015-07-29 00:02:57 +03:00
Burhan Khalid
a79e845533 flake8 and misc fixes 2015-07-28 23:26:16 +03:00
Burhan Khalid
69398a8292 fixing production settings logic for middleware 2015-07-28 19:02:41 +03:00
Burhan Khalid
80383aba19 fixing a bug in the allauth configuration 2015-07-27 18:43:37 +03:00
Burhan Khalid
7403679ee7 fixing an allauth setting bug 2015-07-27 18:42:23 +03:00
Fabio C. Barrioneuvo da Luz
dca0a016cf update ipython to 3.2.1 and django-allauth to 0.22.0 2015-07-27 08:36:45 -03:00
stepmr
a59f3458e9 Update package.json
- add missing pixrem dependency
2015-07-23 12:17:49 -07:00
stepmr
ac1379e35b Update autoprefixer browser support
- Use twitter bootstrap project defaults to all compiling bootstrap-sass
2015-07-23 12:08:49 -07:00
stepmr
16abdf0bb2 Update Gruntfile.js
- Use grunt-sass instead of compass
- Update grunt build task to use postcss with autoprefixer, cssnano and pixrem
2015-07-23 12:05:53 -07:00
stepmr
0e66834ae3 Update package.json
- Update npm dependencies
- Use grunt-sass (ie node-sass/libsass)
- Add posttcss with autoprefixer and cssnano
2015-07-23 11:49:26 -07:00
Burhan Khalid
40ea180998 updating requirements and misc. fixes 2015-07-22 19:03:15 +03:00
jayfk
5da51a3ece Reflect Celery taskapp refactoring in the docs
Fixes https://github.com/pydanny/cookiecutter-django/issues/279
2015-07-21 11:27:50 +02:00
Jay
79dbcc16f8 renaming taskman to taskapp to reflect upstream changes 2015-07-21 11:08:29 +02:00
Jay
35d61c9eee added docker-compose documentation 2015-07-21 10:42:31 +02:00
Jay
7690b42c27 switched to redis cache 2015-07-21 10:22:02 +02:00
Jay
bff7487121 Merge branch 'master' into docker-compose 2015-07-21 10:02:52 +02:00
Saurabh Kumar
613b91d71e Merge pull request #258 from burhan/feature/redis-cache
adding redis support
2015-07-21 07:23:26 +05:30
kaido
362f86a4c1 Switch celery default serialization to JSON, to avoid pickle related deprecation warnings 2015-07-19 21:55:29 -07:00
kaidokert
b275c7ca72 Add .pep8 and .pylintrc 2015-07-20 02:10:31 +01:00
stepmr
a9e210dbf5 Generate safe secret_key by default
Use openssl to generate a secure, random secret_key
2015-07-18 13:13:49 -07:00
stepmr
696eca2fd2 Use PYTHONHASHSEED=random
- Django reccomends setting the PYTHONHASHSEED environment variable to random.  See: https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/#python-options
2015-07-18 13:09:59 -07:00
stepmr
b2816c0e94 Updated heroku setup
- Heroku's free postgres tier is now "hobby-dev"
- pg:backups require a scheduled time
- add missing Mailgun API key
2015-07-18 12:48:04 -07:00
Daniel Greenfeld
f073fb6ab5 Added @models.permalink decorator to User.get_absolute_url() method 2015-07-17 08:41:41 -07:00
Daniel Greenfeld
009c4993cc Fixed error in user_form.html 2015-07-17 03:42:42 -07:00
Daniel Greenfeld
52876da0e2 Add testplus 2015-07-16 15:35:16 -07:00
Jay
def7f47572 experimental docker-compose support 2015-07-16 17:43:02 +02:00
Daniel Greenfeld
36454d9893 Removed unnecessary block tag and 'user:' prefix. 2015-07-16 08:25:53 -07:00
Daniel Greenfeld
a848bde153 Merge pull request #264 from burhan/feature/maildump
Use maildump instead of ConsoleEmailHandler
2015-07-16 07:27:15 -07:00
jayfk
c9ab3b958e Fixed a bug where 'DEFAULT_FROM_EMAIL' was used to cast the value instead of providing a default 2015-07-16 11:10:36 +02:00
Burhan Khalid
a54081a761 tweaking the comments to match master README 2015-07-16 07:44:49 +03:00
Burhan Khalid
f966888ff1 making maildump optional 2015-07-16 07:21:06 +03:00
Burhan Khalid
07354a3d37 Fixing links for maildump and updating master README 2015-07-16 07:03:16 +03:00
Burhan Khalid
a103eaa93e Adding support for maildump for local development (replaces the nice, but not friendly console email handler) 2015-07-16 06:58:08 +03:00
Daniel Greenfeld
895dc09a45 Much cleaner user urls and added get_absolute_url to User 2015-07-15 20:37:38 -07:00
Daniel Greenfeld
70c871dfbd Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-07-15 13:40:43 -07:00
Daniel Greenfeld
8852fef5f7 Add name to user detail page 2015-07-15 13:40:38 -07:00
Fábio C. Barrionuevo da Luz
d181fca7d4 fix issue #275 2015-07-15 16:53:44 -03:00
Daniel Greenfeld
d412946f93 Fix User initial migration 2015-07-15 12:40:04 -07:00
Daniel Greenfeld
88188812a1 Fix user_list.html 2015-07-15 12:00:20 -07:00
Daniel Greenfeld
1d194d0e12 Remove unnecessary divs from the User form 2015-07-15 11:08:49 -07:00
Daniel Greenfeld
6dbe252c83 Use a more global 'name' field in User model 2015-07-15 11:06:03 -07:00
Daniel Greenfeld
696d1c5606 Making bootstrap containers fluid 2015-07-14 13:23:26 -07:00
Burhan Khalid
5589003ff3 fixing requirements 2015-07-14 12:05:25 +03:00
Daniel Greenfeld
265d14b645 Added ipdb for improved REPL 2015-07-13 20:33:49 -07:00
Audrey Roy
03dba391ca Don't make Home active in base template. 2015-07-13 19:28:42 -07:00
Audrey Roy
35112546c4 Close navbar-collapse div. 2015-07-13 19:26:40 -07:00
Audrey Roy
7a147e72e2 Update navbar HTML to latest Bootstrap as per http://getbootstrap.com/components/#navbar 2015-07-13 19:20:13 -07:00
Daniel Greenfeld
e25942652d Added instructions on how to install compass. 2015-07-13 15:50:00 -07:00
Daniel Greenfeld
acfef44b64 Remove specification for installing just grunt.
Otherwise it ignores the other modules.
2015-07-13 15:39:51 -07:00
Daniel Greenfeld
3710e9b953 Changed 'taskman' to 'taskapp 2015-07-13 13:32:47 -07:00
Daniel Greenfeld
f038f8fd88 Merge pull request #266 from jayfk/master
added optional celery support
2015-07-13 13:19:55 -07:00
Jay
9bfca28f6f refactored to load celery from an AppConfig 2015-07-10 11:30:42 +02:00
Fábio C. Barrionuevo da Luz
7837c4e099 update Django version to 1.8.3
https://www.djangoproject.com/weblog/2015/jul/08/security-releases/
2015-07-09 11:47:10 -03:00
Burhan Khalid
32dd1be245 merging from upstream 2015-07-08 12:58:19 +03:00
Fábio C. Barrionuevo da Luz
b498bb4245 Merge pull request #263 from burhan/patch/move-aws-settings
set correct variables for heroku/doku
2015-07-07 16:39:26 -03:00
Burhan Khalid
076c7c21c6 set correct variables for heroku/doku 2015-07-07 22:29:41 +03:00
Fábio C. Barrionuevo da Luz
a3c46bb8a0 Merge pull request #262 from burhan/patch/move-aws-settings
unifying environment variables
2015-07-07 16:23:46 -03:00
Burhan Khalid
740483f0e7 unifying environment variables 2015-07-07 22:06:46 +03:00
Fabio C. Barrioneuvo da Luz
e5dc8b97c1 update dependencies versions
update pylibmc version to 1.5.0
django-allauth to 0.21.0
Pillow to 2.9.0
whitenoise to 2.0.2
2015-07-07 09:15:26 -03:00
Burhan Khalid
768b8cf2c8 adding support for mailgun 2015-07-06 21:25:08 +03:00
Burhan Khalid
3c285e0569 adding redis support 2015-07-06 14:09:13 +03:00
Audrey Roy
f370702c4d Instructions for creating user accounts. Fix #39. 2015-06-28 14:56:13 -07:00
Audrey Roy
e9e560eb17 Break up 'Getting up and running' into more readable sections 2015-06-28 14:56:13 -07:00
Audrey Roy
79ac986be8 Add instruction to migrate after doing createdb. 2015-06-28 14:28:58 -07:00
Audrey Roy
5e48e162f7 Add PostgreSQL createdb instructions to generated README. 2015-06-28 14:14:34 -07:00
Daniel Greenfeld
cd8c694b15 Added .env to protect repos
For those instances when people use a project directory to store the location of their virtual environment.
2015-06-28 11:28:41 -07:00
Saurabh Kumar
de08741305 Merge pull request #233 from schinkelg/master
Update common.py postgres connection string
2015-06-24 13:10:25 +05:30
Fabio C. Barrioneuvo da Luz
009f6b79a4 update ipython version to 3.2.0
whitenoise version to 2.0
coverage version to 4.0a6
2015-06-22 09:21:16 -03:00
Daniel Greenfeld
88a6ba641e Update django-debug-toolbar to 1.3.2 2015-06-19 17:37:27 -07:00
Cullen Rhodes
444fb56da3 Update README.rst
Update heroku addons commands, addons:add has been deprecated in favour of create
2015-06-16 14:23:13 +01:00
Fábio C. Barrionuevo da Luz
dd077abeef update psycopg2 version to 2.6.1 2015-06-15 09:35:05 -03:00
Fábio C. Barrionuevo da Luz
96e9f1d80f update Pillow version to 2.8.2 2015-06-08 08:06:39 -03:00
Fábio C. Barrionuevo da Luz
74d9cd8576 Merge pull request #234 from luzfcb/new-django18-template-configurations
add new django1.8 template configurations in common.py settings file
2015-05-25 12:09:03 -03:00
Daniel Greenfeld
d94cf5f9c5 Update production.txt 2015-05-23 10:33:38 -07:00
Fábio C. Barrionuevo da Luz
ea27c208b3 update pylibmc version to 1.4.3 2015-05-22 08:54:50 -03:00
Fábio C. Barrionuevo da Luz
1d8848159f update Django version to 1.8.2
Django security release: https://www.djangoproject.com/weblog/2015/may/20/security-release/
2015-05-20 17:31:58 -03:00
Fabio C. Barrionuevo da Luz
568dacd8ed add missing documentations 2015-05-19 13:20:52 -03:00
Fabio C. Barrionuevo da Luz
00f3a5cfff update flake8 version to 2.4.1, pytest to 2.7.1 and django-autoslug to 1.8.0 2015-05-19 12:39:21 -03:00
Fabio C. Barrionuevo da Luz
a0e95caf5a update django-floppyforms version to 1.4.1 2015-05-15 22:42:00 -03:00
Fabio C. Barrioneuvo da Luz
86fec9d933 update pytz version to 2015.4 and django-extensions to 1.5.5 2015-05-13 14:16:45 -03:00
Saurabh Kumar
932ec5dd44 Add meta x-ua-compatible in the rendered base.html
See more:
* https://github.com/h5bp/html5-boilerplate/blob/master/src/doc/html.md#x-ua-compatible
2015-05-09 23:51:48 +05:30
Saurabh Kumar
2bedcb6e6e Add osx and sublime_text specific gitignores 2015-05-09 23:21:34 +05:30
Saurabh Kumar
41faca3a54 Update Angularjs to 1.3.15 (latest stable) 2015-05-09 23:14:50 +05:30
Saurabh Kumar
353be64535 Deprecate protocol-relative URLs
Always use the HTTPS URL when it’s available.

See also:
* https://github.com/konklone/cdns-to-https#conclusion-cdns-should-redirect-to-https
* http://www.paulirish.com/2010/the-protocol-relative-url/
* 2de99b2ba3
2015-05-09 23:10:32 +05:30
Saurabh Kumar
c6e3d23a52 Add urls, when in DEBUG mode to view error pages 2015-05-09 23:01:07 +05:30
Saurabh Kumar
e6199aa1dc Wrap all line-length to max 80 chars 2015-05-09 22:41:18 +05:30
Saurabh Kumar
b9dbdee99e Drop support for Vagrantfile
- not much value added
- also, in favor of Docker based development environments
2015-05-09 22:32:11 +05:30
Saurabh Kumar
ac957cdd1b Rename LICENSE.rst to LICENSE
- Let's follow the standard filename as it's used everywhere and created
by github.
2015-05-09 22:29:45 +05:30
Saurabh Kumar
2d81d61167 Make use of 'admin.register' decorator in admin.py 2015-05-09 22:23:36 +05:30
Saurabh Kumar
b60e13ed31 Use list, instead of 'patterns' for urlpatterns 2015-05-09 22:22:57 +05:30
Saurabh Kumar
e07e436b46 Remove admin.autodiscover() call, it's called automatically in 1.7+ 2015-05-09 22:13:28 +05:30
Fabio C. Barrionuevo da Luz
c3b9ffe809 fix error "ImproperlyConfigured: app_dirs must not be set when loaders is defined." [skip ci] 2015-05-08 00:23:20 -03:00
Fabio C. Barrionuevo da Luz
10156ad087 user new django 1.8 template configurations [skip ci] 2015-05-07 23:13:49 -03:00
Ger Schinkel
3696cea41f Added configuration option for Windows and if-statement for the postgres connection string. 2015-05-07 22:46:58 +02:00
Ger Schinkel
f45698af3e Update common.py postgres connection string
By removing localhost we enable the default use of Unix sockets.
2015-05-07 15:22:28 +02:00
Daniel Greenfeld
d2184fac58 Update local.txt 2015-05-04 10:52:51 -07:00
Saurabh Kumar
e1fdc5a80f Upgrade coverage to 4.0a5 2015-05-02 09:59:27 +05:30
Saurabh Kumar
07b1d5f58a Upgrade to django 1.8.1 (Bugfix release)
See: https://docs.djangoproject.com/en/1.8/releases/1.8.1/
2015-05-02 09:41:52 +05:30
Saurabh Kumar
49ab03e4cf Remove unnecessary account templates
closes #126
2015-05-01 00:29:11 +05:30
Saurabh Kumar
bb5505f3a4 fix(whitenoise): move dependency in base.txt,
- required for 'runserver' to run properly

Thanks to @acquayefrank

closes #230
2015-04-29 08:39:43 +05:30
Saurabh Kumar
f8160a089d chore(editorconfig): add rules for *.md and *.py w.r.t isort/flake8 2015-04-28 13:07:25 +05:30
Saurabh Kumar
c54628c90e Mention about running "heroku run python manage.py check --deploy" 2015-04-26 22:12:38 +05:30
Daniel Greenfeld
91eb30da8c Merge pull request #227 from pydanny/whitenoise-support
feat(static_storage): Add support for whitenoise (optional)
2015-04-26 08:46:23 -07:00
Saurabh Kumar
3abb87acbc Drop Support for django-avatar [not compatible with django 1.8]
- makes the whole cookie lighter and acceptable to wider community
- redues cookie maintainance buren
2015-04-26 16:45:21 +05:30
Saurabh Kumar
948200f4cf Update sites -> migrations 2015-04-26 16:45:21 +05:30
Saurabh Kumar
b6e5a995ef Update users -> migrations 2015-04-26 16:45:21 +05:30
Saurabh Kumar
9701997cc8 Update requirements to django 1.8 2015-04-26 16:45:21 +05:30
Saurabh Kumar
5fa988b8de Minor update to make signup/login template better. 2015-04-26 16:44:41 +05:30
Saurabh Kumar
7fb6f94d5e feat(static_storage): Add support for whitenoise (optional)
- Add option to opt for whitenoise via cookiecutter
- Seperate Media and Static Configuration

closes #213
2015-04-26 15:31:31 +05:30
Saurabh Kumar
9f3116ba4c Major refractor to move PYTHON_PATH to top-level repo dir
- PYTHON_PATH now should point to `root_dir` instead of `apps_dir`
- `manage.py` now lives at the root dir
- `config` is moved out to root dir
2015-04-26 11:35:46 +05:30
Saurabh Kumar
0cc9958635 fix(settings/production): Use python2/3 compatible unicode->btye conversion 2015-04-26 11:15:48 +05:30
Saurabh Kumar
efc9fbe961 fix(heroku/config): set DJANGO_SETTINGS_MODULE for manage.py to work properly 2015-04-26 11:01:22 +05:30
Saurabh Kumar
b60b01c4fe fix(settings/production): fix typo s/AWS_EXPIREY/AWS_EXPIRY/g 2015-04-26 10:43:34 +05:30
Saurabh Kumar
cdd0cc3a02 chore(settings/local): add some documentation and formating 2015-04-26 10:39:38 +05:30
Saurabh Kumar
815fa26611 fix(heroku): replace depreciated pgbackups addon with pg:backups
https://devcenter.heroku.com/articles/heroku-postgres-backups#scheduling-backups
2015-04-26 10:36:25 +05:30
Saurabh Kumar
0f8f564790 Merge pull request #217 from ka7eh/ka7eh
Fixed a bug with escaped spaces in Cache-Control.
2015-04-25 19:42:11 +05:30
Saurabh Kumar
3c60cf7a63 Add editorconfig for Makefile, it must always use tab 2015-04-25 19:10:32 +05:30
Saurabh Kumar
581563fa35 Make SECRET_KEY required in production and not in development 2015-04-25 18:59:33 +05:30
Saurabh Kumar
47f89d9df1 Fixed local settings, SECRET_KEY setter and add TEST_RUNNER explicitly
Thanks @ad-m for reporting

closes #223
2015-04-25 18:36:35 +05:30
Adam Dobrawy
ddded31e62 Fix APPS_DIR to move up to config
```In [2]: environ.Path('/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py')
Out[2]: <Path:/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py>

In [3]: environ.Path('/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py') -1
Out[3]: <Path:/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config>

In [4]: environ.Path('/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py') - 2
Out[4]: <Path:/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}>
```
I believe we don't want store data (see STATICFILES_DIRS) in config directory.
2015-04-25 00:02:18 +02:00
Kaveh
a2947ecc73 Added a note as a reminder to revert the last commit after this issue is
fixed: https://github.com/jschneier/django-storages/issues/47
2015-04-24 13:32:37 -05:00
Lin Xianyi
9c758e40e5 Typo for DATABASES in config/production.py 2015-04-24 11:37:50 +08:00
Fábio C. Barrionuevo da Luz
ba0689634e update Collectfast version to 0.2.3 2015-04-22 19:35:15 -03:00
Daniel Greenfeld
87510b86d8 Merge pull request #203 from garry-cairns/master
Added Docker develop and deploy instructions in response to https://github.com/pydanny/cookiecutter-django/issues/125#issuecomment-74349410 💣
2015-04-21 16:00:09 -07:00
Saurabh Kumar
5cc4ea1f1d Update django-braces and django-floppyforms to lastest
- django-floppyform has official support for django 1.8 (for #208)
- https://github.com/brack3t/django-braces/releases/tag/v1.8.0
2015-04-20 23:58:45 +05:30
Kaveh
ccbcd6cd6a Fixed a bug with escaped spaces in Cache-Control.
see: https://github.com/boto/boto/issues/2536
2015-04-20 13:05:01 -05:00
Saurabh Kumar
ec8283dbe7 Make all the PEP8 failure pass 2015-04-20 18:03:58 +05:30
Saurabh Kumar
a289d98a49 Fix minor typo in comment section 2015-04-20 10:19:07 +05:30
Saurabh Kumar
89c0fb3ff8 Replace django-configuration with django-environ
- makes it compatible with django 1.8
- removes magic
2015-04-20 03:48:41 +05:30
Fábio C. Barrionuevo da Luz
b007a8e0ac update pylibmc version to 1.4.2 2015-04-15 09:36:05 -03:00
Fábio C. Barrionuevo da Luz
6626c922f9 Merge pull request #200 from luzfcb/issue-34
add requirements file of non-python dependencies and helper scripts - fix issue #34
2015-04-12 22:40:13 -03:00
Fabio C. Barrionuevo da Luz
afb9f607e9 refactored install_os_dependencies.sh
add .idea on .gitignore
2015-04-11 12:32:49 -03:00
Alex Tsai
5f7874a9a3 Swap to django-storages-redux, an actively maintained (py3 compatible) fork of django-storages 2015-04-11 12:24:52 +05:30
Fábio C. Barrionuevo da Luz
53f71345f3 update boto version to 2.38.0 2015-04-09 21:56:48 -03:00
Fabio Caritas Barrionuevo da Luz
f16648f9fd update requirements 2015-04-06 14:44:41 -03:00
Saurabh Kumar
4404122bda Merge pull request #201 from pydanny/fix-s3-calling-format
fix(settings): fix non-existing import of s3
2015-04-06 20:26:48 +05:30
Saurabh Kumar
0c7eaff6a8 Merge pull request #202 from streeter/patch-1
Fix a typo
2015-04-06 20:26:28 +05:30
Kevin Ndung'u
f598ae19b8 Update jQuery and Bootstrap versions 2015-03-31 12:52:17 +03:00
Garry Cairns
cf8f5d6a8c Added development and deployment instructions for Docker and EC2 2015-03-21 22:48:54 +00:00
Garry Cairns
b925de21ce Added development and deployment instructions for Docker and EC2 2015-03-21 22:45:02 +00:00
Fábio C. Barrionuevo da Luz
ce5b7a1f59 updated django version to 1.7.7 2015-03-19 11:48:33 -03:00
Chris Streeter
70cbc12fbf Fix a typo 2015-03-17 20:02:55 -07:00
Saurabh Kumar
8566d4d0b0 fix(settings): fix non-existing import of s3
- `from S3 import CallingFormat` - the S3 module never existed.
- fixed the calling format accoroding to `STATIC_URL`
2015-03-17 17:35:07 +05:30
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