Commit Graph

191 Commits

Author SHA1 Message Date
Jannis Gebauer
7d7b044432 Remove webpack and merge (#778) (#785)
* Remove webpack and merge

* Put postgresql_version line back in cookiecutter.json

* Put goldhand back in contributors file, added ssteinerX

* Add *.egginfo to .gitignore

* Fix dangling endif in README.rst
2016-09-12 00:22:21 +02:00
Jannis Gebauer
6a9ec57bf5 removed django-coverage-plugin until it's ready for 1.10 2016-09-12 00:01:19 +02:00
Audrey Roy Greenfeld
04bd07bbef Make user form template indentation consistent 2016-09-10 09:59:52 -07:00
Daniel Hepper
12aed4724e Use app registry instead of INSTALLED_APPS to discover celery tasks (#754)
* Use app registry instead of INSTALLED_APPS to discover celery tasks. Fixes #717

* Added Daniel Hepper to contributors list
2016-09-10 13:33:25 +02:00
Alexandre Provencio
b2207f5768 Pep8 imports (#767) 2016-09-10 13:32:14 +02:00
Daniel Roy Greenfeld
28542a91a4 Removed floppyforms (see #703)
While this is an awesome package...

* Nothing in Cookiecutter Django uses it 
* Doesn't work with Django 1.10 yet
* Developers can add it themselves
2016-09-09 20:13:33 -07:00
Audrey Roy Greenfeld
2b2caaf6ce Template indentation cleanup 2016-09-09 16:39:49 -07:00
Audrey Roy Greenfeld
8bbf83d3d7 Combine load tags, fix indentation 2016-09-09 16:29:18 -07:00
pyup.io bot
909b85291e Update django-extensions from 1.7.3 to 1.7.4 (#777) 2016-09-08 11:19:14 +02:00
Peter Bittner
29049719d1 Correct header markup, reduce paragraph spacing (#775)
* Correct header markup, reduce paragraph spacing

* Add @bittner to contributors
2016-09-05 01:13:16 +02:00
Stanislav Shabalin
6f6f37cba8 replace unicode-slugify with awesome-slugify (#761) 2016-09-04 10:52:52 -07:00
Jannis Gebauer
3ad0f57ef5 Merge pull request #765 from aleprovencio/fix-compressor
Fix compressor section on common.py
2016-09-02 09:49:32 +02:00
Jannis Gebauer
0f527271a3 Merge pull request #766 from aleprovencio/separator-line
Put separator line following the current pattern
2016-09-02 09:49:16 +02:00
Jannis Gebauer
bf69bfe40e Merge pull request #769 from aleprovencio/whitespace
Fix whitespace around operator
2016-09-02 09:48:41 +02:00
Jannis Gebauer
37ef48558a Merge pull request #770 from pydanny/pyup-update-raven-5.25.0-to-5.26.0
Update raven to 5.26.0
2016-09-02 09:48:18 +02:00
Jannis Gebauer
30820b95f3 Merge pull request #763 from pydanny/pyup-update-werkzeug-0.11.10-to-0.11.11
Update werkzeug to 0.11.11
2016-09-02 09:47:34 +02:00
pyup-bot
b3c27b9b30 Update raven from 5.25.0 to 5.26.0 2016-08-31 14:34:56 -07:00
Alexandre Provencio
31c63f0d3f Fix compressor section on common.py 2016-08-31 14:44:24 -03:00
Alexandre Provencio
86c1cd5f26 Fix whitespace around operator 2016-08-31 12:59:36 -03:00
Alexandre Provencio
b33b104251 Put separator line following the current pattern 2016-08-31 12:56:25 -03:00
Alexandre Provencio
3ad2d5c61e Fix docstrings 2016-08-31 12:48:25 -03:00
pyup-bot
cf092b6269 Update werkzeug from 0.11.10 to 0.11.11 2016-08-31 06:19:54 -07:00
Jannis Gebauer
043ff3d8dc Merge pull request #636 from mirskiy/master
Changed nginx confs for dockers new networking
2016-08-31 11:39:16 +02:00
pyup-bot
56f2048b32 Update django-extensions from 1.7.2 to 1.7.3 2016-08-26 12:58:51 -07:00
Philip Deuchler
887ba934e2 Fixes an issue with Jinja choking on a django template tag (#759)
* Fixes an issue with Jinja choking on a django template tag, similar to #278

* Same fix for field_errors_block.html
2016-08-26 12:35:48 -07:00
Daniel Roy Greenfeld
77c8abc4b0 merge 2016-08-26 11:27:36 -07:00
Daniel Roy Greenfeld
28293c0cad Fixing the README.rst 2016-08-26 11:26:20 -07:00
Audrey Roy Greenfeld
de2c7198b2 Merge pull request #756 from Parbhat/Patch-2
fix: Gulpfile Issue #738 and correct order of PostgreSQL version
2016-08-26 11:10:59 -07:00
Audrey Roy Greenfeld
a2386c796c Merge pull request #757 from pydanny/pyup-update-opbeat-3.3.4-to-3.4.0
Update opbeat to 3.4.0
2016-08-26 11:10:08 -07:00
Daniel Roy Greenfeld
c01d81b2fe Added bootstrap4 templates to fix Crispy Forms 2016-08-26 10:40:18 -07:00
Daniel Roy Greenfeld
50573b1910 Formatting hack to get around crispy-forms unfortunate hardcoding in helpers.FormHelper 2016-08-26 09:33:36 -07:00
pyup-bot
6ce53bf6d8 Update opbeat from 3.3.4 to 3.4.0 2016-08-25 06:43:43 -07:00
Parbhat Puri
f5be5731cb fix: Gulpfile Issue #738 2016-08-25 16:07:17 +05:30
Michael Luk
5f53ebe5f1 add missing 'raw' tag to fix jinja error (#755) 2016-08-25 13:27:25 +05:30
Daniel Roy Greenfeld
ba2673ab5f Made Bootstrap4 Alpha 2 compliant 2016-08-24 19:31:13 -07:00
Audrey Roy Greenfeld
e1b3070abe Add spaces around templated author name 2016-08-24 15:48:03 -07:00
pyup-bot
5ce00085d2 Update raven from 5.24.3 to 5.25.0 2016-08-23 15:49:30 -07:00
Jannis Gebauer
5dc41812d5 Update base.txt 2016-08-23 08:24:43 +02:00
Daniel Roy Greenfeld
d98bbcd70e Fix #737, so django-compressor works on Windows 2016-08-22 07:36:40 -07:00
Andreas Meistad
41059ff4df Change use_python2 [N] to use_python3 [Y]
Fixes #747
2016-08-21 22:11:01 +02:00
pyup-bot
3b3948feec Update django-allauth from 0.26.1 to 0.27.0 2016-08-19 07:10:12 -07:00
pyup-bot
ee31df81fa Update django-test-plus from 1.0.14 to 1.0.15 2016-08-18 14:50:01 -07:00
pyup-bot
95e31d6554 Update django-test-plus from 1.0.14 to 1.0.15 2016-08-18 14:50:01 -07:00
Audrey Roy Greenfeld
7279aa29eb Merge pull request #734 from pydanny/pyup-update-django-floppyforms-1.6.2-to-1.7.0
Update django-floppyforms to 1.7.0
2016-08-18 10:27:00 -07:00
Audrey Roy Greenfeld
3fc22c1f50 Merge pull request #735 from pydanny/pyup-update-django-extensions-1.7.1-to-1.7.2
Update django-extensions to 1.7.2
2016-08-18 10:26:39 -07:00
pyup-bot
24d03c477c Update pillow from 3.3.0 to 3.3.1 2016-08-18 06:04:58 -07:00
Daniel Roy Greenfeld
87bb085550 Force rssmin to be installed without C extensions 2016-08-16 15:31:59 -07:00
Daniel Roy Greenfeld
f1f499ddd3 Update version to Django 1.9.9 2016-08-16 14:15:04 -07:00
Parbhat Puri
e5fe8fa935 fix: offset class modified in Bootstrap 4 alpha 3 (#720) 2016-08-16 12:22:56 -07:00
yunti
6224a15884 Update crispy forms template pack (#718)
Updated to be inline with bootstrap 4 currently used in the project
2016-08-16 12:22:16 -07:00