Commit Graph

540 Commits

Author SHA1 Message Date
Daniel Roy Greenfeld
99a30d08dc Fix #313, which is removing dokku 2015-08-31 21:25:23 -07:00
Fabio C. Barrionuevo da Luz
ebc728613e update AngularJS version to 1.4.4 2015-08-30 23:29:57 -03:00
Fabio C. Barrionuevo da Luz
7ca8863a8c Small improvements in install_python_dependencies.sh and install_os_dependencies.sh scripts 2015-08-30 22:56:19 -03:00
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