cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-16 22:57:05 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,442 Commits 12 Branches 578 Tags 24 MiB
5cd58ce160
Commit Graph

6442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Burhan Khalid
f4a75e0d10 fixing the middleware order 2015-11-16 21:41:06 +03:00
Burhan Khalid
4c07b5dea6 initial configuration to support opbeat 2015-11-16 21:41:06 +03:00
Fábio C. Barrionuevo da Luz
70b2f74f34 Merge pull request #412 from burhan/settings-fixes 
fixing error in settings docs
 2015-11-16 15:38:39 -03:00
Burhan Khalid
b78b2ddf73 fixing error in settings 2015-11-16 21:24:21 +03:00
Burhan Khalid
07ec413f98 E303 too many blank lines fix 2015-11-16 19:20:15 +03:00
Burhan Khalid
a68f256e5b fixing the middleware order 2015-11-16 19:04:07 +03:00
Burhan Khalid
727281e99a initial configuration to support opbeat 2015-11-16 18:55:37 +03:00
Tom Atkins
005dd8c296 Replace Maildump with MailHog 2015-11-16 11:45:29 +00:00
Fábio C. Barrionuevo da Luz
9c28c8e0df Update CHANGELOG.md 2015-11-16 08:36:51 -03:00
Fábio C. Barrionuevo da Luz
61fed1a0b8 Merge pull request #408 from burhan/docs-cleanup 
cleanup of main readme
 2015-11-16 08:27:40 -03:00
Burhan Khalid
9920c6d5b9 upstream merge 2015-11-16 14:20:19 +03:00
Audrey Roy Greenfeld
5079db3a4a Merge pull request #381 from ad-m/patch-2 
Add factories for model users.User
 2015-11-14 20:05:10 -08:00
Adam Dobrawy
c86d5c928c Fix typo & import in UserFactory 2015-11-14 14:15:00 +01:00