Commit Graph

897 Commits

Author SHA1 Message Date
Daniel Roy Greenfeld
e94207b589 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-09-09 17:56:41 -07:00
Daniel Roy Greenfeld
3d93e10cf9 fixed #3, added secret key generator 2015-09-09 17:56:27 -07:00
Daniel Greenfeld
a91d1a41fd Added htmlcov to .gitignore.
No reason to keep these files, as they are purposefully ephemeral.
2015-09-08 18:05:11 -07:00
Daniel Roy Greenfeld
07027c77df Changelog for @bagdal 2015-09-04 21:08:06 -07:00
Daniel Greenfeld
87f02cdf4d Merge pull request #321 from bogdal/deploy-to-heroku-button
Add heroku configuration file
2015-09-04 21:02:09 -07:00
Fábio C. Barrionuevo da Luz
73759e38b5 add Adam Bogdał to CONTRIBUTORS list 2015-09-03 21:20:42 -03:00
Daniel Greenfeld
b5876ce60a fix @318
Added the pre-built custom user model as a feature because it's come up in #318 and #232.
2015-09-03 15:21:30 -07:00
Daniel Greenfeld
e29857c8ad Added @bogdal's latest to the CHANGELOG 2015-09-03 15:18:58 -07:00
Daniel Greenfeld
4b69720c25 Merge pull request #319 from bogdal/allowed-hosts
Allowed hosts
2015-09-03 15:17:22 -07:00
Adam Bogdał
467ccee10c Add heroku configuration file 2015-09-03 20:52:59 +02:00
Daniel Greenfeld
06428e3ab5 Merge pull request #320 from bogdal/sentry-config
Fix sentry configuration
2015-09-02 15:19:54 -07:00
Adam Bogdał
734fef14e8 Add DJANGO_ALLOWED_HOSTS variable to the env.example file 2015-09-02 23:22:40 +02:00
Adam Bogdał
b13bd0578e Make logs more descriptive 2015-09-02 22:59:40 +02:00
Adam Bogdał
e73e967c8d Fix sentry configuration 2015-09-02 22:10:37 +02:00
Adam Bogdał
1ab5e73b51 Add allowed_hosts to the settings list 2015-09-01 20:50:50 +02:00
Adam Bogdał
b047191709 Set .herokuapp.com as allowed host on heroku 2015-09-01 20:35:43 +02:00
Adam Bogdał
1571b91dad Add ability to set ALLOWED_HOSTS 2015-09-01 20:18:28 +02:00
Audrey Roy Greenfeld
6b58d65bb6 Remove comments referring to specific lines, which are brittle. Replace with descriptive comment. 2015-08-31 21:53:04 -07:00
Daniel Roy Greenfeld
99a30d08dc Fix #313, which is removing dokku 2015-08-31 21:25:23 -07:00
Fábio C. Barrionuevo da Luz
bbc1d337f2 Update README.rst 2015-08-31 00:16:39 -03:00
Fábio C. Barrionuevo da Luz
fe4bf2b7ed Update README.rst 2015-08-31 00:14:44 -03:00
Fabio C. Barrionuevo da Luz
ec12e84407 update CHANGELOG 2015-08-31 00:06:32 -03:00
Fabio C. Barrionuevo da Luz
5ab0f3d07e update usage example 2015-08-31 00:06:11 -03: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
Fábio C. Barrionuevo da Luz
acc8e0bc4c Update README.rst 2015-08-30 22:14:25 -03:00
Fábio C. Barrionuevo da Luz
d6fb935e7f Update README.rst 2015-08-30 22:12:18 -03:00
Daniel Greenfeld
1153edf2f7 Update CHANGELOG.md 2015-08-30 15:46:30 -07: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
Daniel Greenfeld
2bf111d03a Update CHANGELOG.md 2015-08-27 20:18:10 -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
Daniel Greenfeld
50c6732d55 Update CHANGELOG.md 2015-08-18 09:52:13 -07:00
Daniel Greenfeld
8853abc2f5 Merge pull request #284 from jayfk/master
Enhanced Docker Support using docker-compose
2015-08-18 09:50:21 -07:00
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
27a2ed46be merged upstream changes (resolves merge conflict) 2015-08-18 14:09:32 +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