Commit Graph

1605 Commits

Author SHA1 Message Date
Fábio C. Barrionuevo da Luz
111ed7276f Merge pull request #428 from FailSafe86/patch-1
Update developing-locally.rst
2015-12-01 12:02:58 -03:00
Thomas Korrison
564cacd87b Update CONTRIBUTORS.rst 2015-12-01 14:29:56 +00:00
Thomas Korrison
a24ff2c4a7 Update CHANGELOG.md 2015-12-01 14:28:21 +00:00
Thomas Korrison
a304e466a5 Update developing-locally.rst 2015-12-01 14:25:55 +00:00
Thomas Korrison
917bf99ea3 Update developing-locally.rst 2015-12-01 14:09:50 +00:00
Fabio C. Barrioneuvo da Luz
ae42895c09 update requirements 2015-11-29 10:24:03 -03:00
Fabio C. Barrioneuvo da Luz
252d005e77 update version of django in setup.py 2015-11-25 16:29:53 -03:00
Fábio C. Barrionuevo da Luz
5610d4a7c1 Merge pull request #426 from pydanny/luzfcb-all-green-the-return
update version of ipython in hitch requirements
2015-11-25 15:42:19 -02:00
Fábio C. Barrionuevo da Luz
63b1f07cd2 Update CHANGELOG.md 2015-11-25 14:35:56 -03:00
Fábio C. Barrionuevo da Luz
28311e7502 update version of ipython 2015-11-25 14:35:07 -03:00
Audrey Roy Greenfeld
fdf17c7e32 Update changelog about removing debugging tools. 2015-11-25 08:35:13 -08:00
Audrey Roy Greenfeld
59a6c637ac Remove debugging tools from non-generated part of project, since those are personal prefs. 2015-11-25 08:33:06 -08:00
Audrey Roy Greenfeld
7b949ba6cc Update gunicorn to 19.4.1. 2015-11-25 08:20:19 -08:00
Fábio C. Barrionuevo da Luz
4c684d4efc Merge pull request #425 from pydanny/luzfcb-all-green-XD
Update version of psutil
2015-11-25 10:40:31 -02:00
Fábio C. Barrionuevo da Luz
6f0c2af33a Update CHANGELOG.md 2015-11-25 09:36:10 -03:00
Fábio C. Barrionuevo da Luz
fa46eb7cc2 update psutil version to 3.3.0 2015-11-25 09:35:17 -03:00
Fabio C. Barrioneuvo da Luz
c9f500116d fix celery configuration in local.py 2015-11-24 22:00:16 -03:00
Fábio C. Barrionuevo da Luz
90ed4f81e2 Merge pull request #424 from pydanny/update-requirements
update requirements
2015-11-24 21:51:16 -02:00
Fabio C. Barrioneuvo da Luz
d33e673c3c update requirements 2015-11-24 20:14:01 -03:00
Fabio C. Barrioneuvo da Luz
0ef11d1818 sh package version pinned to 1.11 2015-11-23 23:11:52 -03:00
Fábio C. Barrionuevo da Luz
a2a4b196fb Merge pull request #423 from pydanny/update-requirements
update requirements
2015-11-24 00:01:49 -02:00
Fabio C. Barrioneuvo da Luz
6092145760 update requirements 2015-11-23 21:15:11 -03:00
Jannis Gebauer
5aec6203c2 add Jon Miller to contributors 2015-11-22 23:28:27 +01:00
Jannis Gebauer
20ea440cc2 add gevent python3 fix to the changelog 2015-11-22 23:27:11 +01:00
Jannis Gebauer
a5675f89e4 Make sure that python 2 users can stay on stable 2015-11-22 23:24:25 +01:00
Jannis Gebauer
73d78ba673 Merge pull request #421 from jondelmil/master
Change gevent from 1.0.2 to 1.1rc1 to support Py35.
2015-11-22 23:20:51 +01:00
Jon Miller
dc47e19a03 Change gevent from 1.0.2 to 1.1rc1 to support Py35. 2015-11-22 15:42:35 -06:00
Fabio C. Barrioneuvo da Luz
1d9e0960bc add Jan Van Bruggen to CONTRIBUTORS. Update CHANGELOG 2015-11-22 13:56:55 -03:00
Fábio C. Barrionuevo da Luz
98777022ec Merge pull request #419 from jvanbrug/master
Move div class unquote outside the if tag
2015-11-22 14:41:52 -02:00
Jan Van Bruggen
733071f121 Move div class unquote outside the if tag 2015-11-22 08:38:36 -08:00
Daniel Roy Greenfeld
d6de05e971 Updated changelog and contributors. Now including @tedmiston 2015-11-20 08:55:41 -08:00
Daniel Roy Greenfeld
b0f0b8686d Merge pull request #416 from bogdal/patch-1
Use python 3.5 on Heroku/Travis
2015-11-20 08:50:58 -08:00
Daniel Roy Greenfeld
2fdbdded70 Merge pull request #415 from tedmiston/master
Fix typo in readme
2015-11-20 08:46:54 -08:00
Daniel Roy Greenfeld
c5209bd7b5 Updated contributors and changelog for @keybit's work 2015-11-18 17:19:53 -08:00
Daniel Roy Greenfeld
506bf770e3 Merge pull request #409 from keybits/mailhog
Replace Maildump with MailHog
2015-11-18 17:12:50 -08:00
Adam Bogdał
518862d328 Use python 3.5 on Travis 2015-11-18 15:07:08 +01:00
Adam Bogdał
c5481135f2 Use python 3.5 on Heroku 2015-11-18 13:52:45 +01:00
Tom Atkins
2f0cedb270 Fix merge conflict in README.rst 2015-11-18 11:19:46 +00:00
Tom Atkins
c653801d5a Add mailhog binary to gitignore 2015-11-18 11:16:44 +00:00
Tom Atkins
3316a3b023 Fix merge conflict in README.rst 2015-11-18 11:16:25 +00:00
Audrey Roy Greenfeld
7eb0fc0e81 Add pyc fix to changelog 2015-11-17 21:07:14 -08:00
Audrey Roy Greenfeld
840f4a7d4c *.pyc is already covered by *.py[cod]
No need to include it separately.
2015-11-17 21:05:28 -08:00
Taylor Edmiston
f45b81b7a0 Fix typo in readme 2015-11-17 22:54:29 -05:00
Daniel Roy Greenfeld
aad3284f58 Merge 2015-11-17 16:58:40 -08:00
Daniel Roy Greenfeld
d69a6f020b Update changelog for @burhan 2015-11-17 16:58:00 -08:00
Daniel Roy Greenfeld
d7dab03e1e Merge pull request #411 from burhan/opbeat-integration
initial configuration to support opbeat
2015-11-17 16:49:16 -08:00
Burhan Khalid
e2c700da5c updating env.example 2015-11-17 10:27:58 +03:00
Tom Atkins
e4f922763f Add mailhog binary to gitignore 2015-11-16 19:17:03 +00:00
Burhan Khalid
8b2ec73a8c Merge branch 'opbeat-integration' of github.com:burhan/cookiecutter-django into opbeat-integration
* 'opbeat-integration' of github.com:burhan/cookiecutter-django:
  E303 too many blank lines fix
  fixing the middleware order
  initial configuration to support opbeat
2015-11-16 21:42:56 +03:00
Burhan Khalid
03edea3021 E303 too many blank lines fix 2015-11-16 21:41:06 +03:00