Commit Graph

  • d498ee5184 Merge branch 'master' of github.com:pydanny/cookiecutter-django Daniel Roy Greenfeld 2015-12-13 09:46:20 -0800
  • 7d9eba607b Added @areski to our contributors list Daniel Roy Greenfeld 2015-12-13 09:44:53 -0800
  • 7c0348a9e3 Merge pull request #435 from areski/bump-to-django19 Daniel Roy Greenfeld 2015-12-13 09:42:47 -0800
  • 93e753086c Merge branch 'master' of github.com:pydanny/cookiecutter-django 1.8.7 Daniel Roy Greenfeld 2015-12-13 09:39:12 -0800
  • 4338227f16 Updated changelog Daniel Roy Greenfeld 2015-12-13 09:39:05 -0800
  • 761c71696b Merge pull request #441 from stepmr/patch-2 Daniel Roy Greenfeld 2015-12-13 09:37:09 -0800
  • afc94ccbdb Merge pull request #440 from stepmr/patch-1 Daniel Roy Greenfeld 2015-12-13 09:35:46 -0800
  • f7572a55c1 Update changelog Daniel Roy Greenfeld 2015-12-12 14:25:16 -0800
  • 40bce156c6 Merge pull request #442 from stepmr/patch-3 Daniel Roy Greenfeld 2015-12-12 14:20:30 -0800
  • 681247e4b7 Add celery worker to Procfile stepmr 2015-12-11 23:10:08 -0800
  • 506eb22be0 Support opbeat logging with celery stepmr 2015-12-11 17:56:54 -0800
  • a588d804f7 Update runtime.txt stepmr 2015-12-11 17:42:30 -0800
  • 2417cc245a Adding CentOS installation directives and warning of only CentOS / Ubuntu Compatibility Bob Strecansky 2015-12-11 10:53:13 -0500
  • ae0a2b82ba Update CHANGELOG.md Daniel Roy Greenfeld 2015-12-11 07:35:19 -0800
  • 57037df04c Merge pull request #437 from yunti/patch-1 Daniel Roy Greenfeld 2015-12-11 07:34:29 -0800
  • d21b021e7a Update runtime.txt yunti 2015-12-11 14:43:30 +0000
  • fc37d65661 fix issue #436 Fabio C. Barrioneuvo da Luz 2015-12-11 08:53:43 -0300
  • aa0a8cc9b9 Merge pull request #434 from sydhenry/patch-1 Daniel Roy Greenfeld 2015-12-09 15:37:26 -0800
  • c2e79902bf Bump Django to v1.9 areski 2015-12-09 13:33:17 +0100
  • 4291243a9c Keep admin url short Sydney Henry 2015-12-08 22:16:22 -0700
  • 21f5637a65 SECRET_KEY gen to short Sydney Henry 2015-12-08 22:10:46 -0700
  • e0f0e82ae5 Merge 8f5d61324d into 677927d786 thisismsreddy 2015-12-08 21:58:46 +0000
  • 06e4bbe22a Adding prereqs for Ubuntu Bob Strecansky 2015-12-08 12:59:06 -0500
  • 677927d786 Merge of @burhans reorg Daniel Roy Greenfeld 2015-12-06 16:07:42 -0800
  • cc1da172f4 [IMP] django-allauth configuration: Allow enable or disable user registration using ACCOUNT_ALLOW_REGISTRATION setting. David Díaz 2015-12-05 20:12:53 +0100
  • 062d6d31a4 pin requires.io django version to < 1.9 Fábio C. Barrionuevo da Luz 2015-12-02 08:36:15 -0300
  • 69252c3d02 Merge pull request #430 from FailSafe86/patch-2 Fábio C. Barrionuevo da Luz 2015-12-01 12:08:17 -0300
  • 245a912ef4 Merge pull request #429 from FailSafe86/patch-3 Fábio C. Barrionuevo da Luz 2015-12-01 12:03:04 -0300
  • 111ed7276f Merge pull request #428 from FailSafe86/patch-1 Fábio C. Barrionuevo da Luz 2015-12-01 12:02:58 -0300
  • 564cacd87b Update CONTRIBUTORS.rst Thomas Korrison 2015-12-01 14:29:56 +0000
  • a24ff2c4a7 Update CHANGELOG.md Thomas Korrison 2015-12-01 14:28:21 +0000
  • a304e466a5 Update developing-locally.rst Thomas Korrison 2015-12-01 14:25:55 +0000
  • 917bf99ea3 Update developing-locally.rst Thomas Korrison 2015-12-01 14:09:50 +0000
  • ae42895c09 update requirements Fabio C. Barrioneuvo da Luz 2015-11-29 10:24:03 -0300
  • 252d005e77 update version of django in setup.py Fabio C. Barrioneuvo da Luz 2015-11-25 16:29:53 -0300
  • 5610d4a7c1 Merge pull request #426 from pydanny/luzfcb-all-green-the-return Fábio C. Barrionuevo da Luz 2015-11-25 15:42:19 -0200
  • 63b1f07cd2 Update CHANGELOG.md Fábio C. Barrionuevo da Luz 2015-11-25 14:35:56 -0300
  • 28311e7502 update version of ipython Fábio C. Barrionuevo da Luz 2015-11-25 14:35:07 -0300
  • fdf17c7e32 Update changelog about removing debugging tools. Audrey Roy Greenfeld 2015-11-25 08:35:13 -0800
  • 59a6c637ac Remove debugging tools from non-generated part of project, since those are personal prefs. Audrey Roy Greenfeld 2015-11-25 08:33:06 -0800
  • 7b949ba6cc Update gunicorn to 19.4.1. Audrey Roy Greenfeld 2015-11-25 08:20:19 -0800
  • 4c684d4efc Merge pull request #425 from pydanny/luzfcb-all-green-XD Fábio C. Barrionuevo da Luz 2015-11-25 10:40:31 -0200
  • 6f0c2af33a Update CHANGELOG.md Fábio C. Barrionuevo da Luz 2015-11-25 09:36:10 -0300
  • fa46eb7cc2 update psutil version to 3.3.0 Fábio C. Barrionuevo da Luz 2015-11-25 09:35:17 -0300
  • c9f500116d fix celery configuration in local.py Fabio C. Barrioneuvo da Luz 2015-11-24 22:00:16 -0300
  • 90ed4f81e2 Merge pull request #424 from pydanny/update-requirements Fábio C. Barrionuevo da Luz 2015-11-24 21:51:16 -0200
  • d33e673c3c update requirements Fabio C. Barrioneuvo da Luz 2015-11-24 20:14:01 -0300
  • 0ef11d1818 sh package version pinned to 1.11 1.8.6 Fabio C. Barrioneuvo da Luz 2015-11-23 23:11:52 -0300
  • a2a4b196fb Merge pull request #423 from pydanny/update-requirements Fábio C. Barrionuevo da Luz 2015-11-24 00:01:49 -0200
  • 6092145760 update requirements Fabio C. Barrioneuvo da Luz 2015-11-23 21:15:11 -0300
  • 5aec6203c2 add Jon Miller to contributors Jannis Gebauer 2015-11-22 23:28:27 +0100
  • 20ea440cc2 add gevent python3 fix to the changelog Jannis Gebauer 2015-11-22 23:27:11 +0100
  • a5675f89e4 Make sure that python 2 users can stay on stable Jannis Gebauer 2015-11-22 23:24:25 +0100
  • 73d78ba673 Merge pull request #421 from jondelmil/master Jannis Gebauer 2015-11-22 23:20:51 +0100
  • dc47e19a03 Change gevent from 1.0.2 to 1.1rc1 to support Py35. Jon Miller 2015-11-22 15:42:35 -0600
  • 1d9e0960bc add Jan Van Bruggen to CONTRIBUTORS. Update CHANGELOG Fabio C. Barrioneuvo da Luz 2015-11-22 13:56:55 -0300
  • 98777022ec Merge pull request #419 from jvanbrug/master Fábio C. Barrionuevo da Luz 2015-11-22 14:41:52 -0200
  • 733071f121 Move div class unquote outside the if tag Jan Van Bruggen 2015-11-22 08:38:36 -0800
  • d6de05e971 Updated changelog and contributors. Now including @tedmiston Daniel Roy Greenfeld 2015-11-20 08:55:41 -0800
  • b0f0b8686d Merge pull request #416 from bogdal/patch-1 Daniel Roy Greenfeld 2015-11-20 08:50:58 -0800
  • 2fdbdded70 Merge pull request #415 from tedmiston/master Daniel Roy Greenfeld 2015-11-20 08:46:54 -0800
  • c5209bd7b5 Updated contributors and changelog for @keybit's work Daniel Roy Greenfeld 2015-11-18 17:19:53 -0800
  • 506bf770e3 Merge pull request #409 from keybits/mailhog Daniel Roy Greenfeld 2015-11-18 17:12:50 -0800
  • 518862d328 Use python 3.5 on Travis Adam Bogdał 2015-11-18 15:07:08 +0100
  • c5481135f2 Use python 3.5 on Heroku Adam Bogdał 2015-11-18 13:52:45 +0100
  • 2f0cedb270 Fix merge conflict in README.rst Tom Atkins 2015-11-18 11:19:46 +0000
  • c653801d5a Add mailhog binary to gitignore Tom Atkins 2015-11-16 19:17:03 +0000
  • 3316a3b023 Fix merge conflict in README.rst Tom Atkins 2015-11-18 11:16:25 +0000
  • 82c198f9e8 Merge 7b672dfc33 into 7eb0fc0e81 Burhan Khalid 2015-11-18 05:50:17 +0000
  • 7eb0fc0e81 Add pyc fix to changelog Audrey Roy Greenfeld 2015-11-17 21:07:14 -0800
  • 840f4a7d4c *.pyc is already covered by *.py[cod] Audrey Roy Greenfeld 2015-11-17 21:05:28 -0800
  • f45b81b7a0 Fix typo in readme Taylor Edmiston 2015-11-17 22:54:29 -0500
  • aad3284f58 Merge Daniel Roy Greenfeld 2015-11-17 16:58:40 -0800
  • d69a6f020b Update changelog for @burhan Daniel Roy Greenfeld 2015-11-17 16:58:00 -0800
  • d7dab03e1e Merge pull request #411 from burhan/opbeat-integration Daniel Roy Greenfeld 2015-11-17 16:49:16 -0800
  • 7b672dfc33 fixing and formatting contributors list Burhan Khalid 2015-11-17 12:18:42 +0300
  • e2c700da5c updating env.example Burhan Khalid 2015-11-17 10:27:58 +0300
  • e4f922763f Add mailhog binary to gitignore Tom Atkins 2015-11-16 19:17:03 +0000
  • 8b2ec73a8c Merge branch 'opbeat-integration' of github.com:burhan/cookiecutter-django into opbeat-integration Burhan Khalid 2015-11-16 21:42:56 +0300
  • 03edea3021 E303 too many blank lines fix Burhan Khalid 2015-11-16 19:20:15 +0300
  • f4a75e0d10 fixing the middleware order Burhan Khalid 2015-11-16 19:04:07 +0300
  • 4c07b5dea6 initial configuration to support opbeat Burhan Khalid 2015-11-16 18:55:37 +0300
  • 70b2f74f34 Merge pull request #412 from burhan/settings-fixes Fábio C. Barrionuevo da Luz 2015-11-16 15:38:39 -0300
  • b78b2ddf73 fixing error in settings Burhan Khalid 2015-11-16 21:24:21 +0300
  • 07ec413f98 E303 too many blank lines fix Burhan Khalid 2015-11-16 19:20:15 +0300
  • a68f256e5b fixing the middleware order Burhan Khalid 2015-11-16 19:04:07 +0300
  • 727281e99a initial configuration to support opbeat Burhan Khalid 2015-11-16 18:55:37 +0300
  • 005dd8c296 Replace Maildump with MailHog Tom Atkins 2015-11-16 11:45:29 +0000
  • 9c28c8e0df Update CHANGELOG.md Fábio C. Barrionuevo da Luz 2015-11-16 08:36:51 -0300
  • 61fed1a0b8 Merge pull request #408 from burhan/docs-cleanup Fábio C. Barrionuevo da Luz 2015-11-16 08:27:40 -0300
  • 9920c6d5b9 upstream merge Burhan Khalid 2015-11-16 14:20:19 +0300
  • 8f5d61324d Update common.py thisismsreddy 2015-11-16 14:17:03 +0530
  • 5079db3a4a Merge pull request #381 from ad-m/patch-2 Audrey Roy Greenfeld 2015-11-14 20:05:10 -0800
  • c86d5c928c Fix typo & import in UserFactory Adam Dobrawy 2015-11-14 14:15:00 +0100
  • c1469c9549 Merge pull request #406 from pydanny/luzfcb-patch-1 Fábio C. Barrionuevo da Luz 2015-11-12 17:44:07 -0300
  • da956975e7 Update CHANGELOG.md Fábio C. Barrionuevo da Luz 2015-11-12 17:42:34 -0300
  • 782f93c68e add Cristian Vargas in CONTRIBUTORS list Fábio C. Barrionuevo da Luz 2015-11-12 17:39:30 -0300
  • ff0177f614 Merge pull request #375 from swappsco/readme-update Fábio C. Barrionuevo da Luz 2015-11-12 17:38:03 -0300
  • 5214d6ca65 Update CHANGELOG.md Fábio C. Barrionuevo da Luz 2015-11-12 17:33:42 -0300
  • cb9480437b Merge pull request #405 from yunti/load-url-tags Fábio C. Barrionuevo da Luz 2015-11-12 17:32:28 -0300