Commit Graph

668 Commits

Author SHA1 Message Date
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
Daniel Greenfeld
dcfd752506 Added @crdconnor's Hitch library to changeme and readme 2015-08-12 11:44:47 -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
5ce04d108b Add new feature 2015-08-09 08:03:08 -07:00
Daniel Greenfeld
2996576556 Upped test to 100% and catching up on changelog 2015-08-09 08:00:24 -07:00
Daniel Greenfeld
21a12ee3f6 Update README.rst 2015-08-08 17:23:56 -07:00
Daniel Greenfeld
1d8c56af3e Merge pull request #293 from burhan/tests-update
Updating the tests
2015-08-08 12:53:58 -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
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
1388cd126a Update CHANGELOG.md 2015-08-05 19:49:41 -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
8d580347d7 Update the changelog 2015-08-05 18:34:41 -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
be05c131e0 Fixed changelog 2015-08-03 22:54:12 -07:00
Daniel Greenfeld
34e59c88fa Log what we did to improve tests 2015-08-03 22:52:52 -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