Commit Graph

927 Commits

Author SHA1 Message Date
Audrey Roy Greenfeld
fdedd151ab Fix formatting in Detached Mode section. 2015-10-04 11:47:58 -07:00
Daniel Roy Greenfeld
d68146e289 changelog change 2015-10-04 11:44:51 -07:00
Daniel Greenfeld
d537ffa6ec Merge pull request #359 from pydanny/docker-docs-cleanup
Docker docs cleanup
2015-10-04 11:42:48 -07:00
Audrey Roy Greenfeld
7b2b12983b Add #363, #364 to changelog. Add @hairychris to contributors. 2015-10-04 10:53:12 -07:00
Audrey Roy Greenfeld
69b220debe Merge pull request #364 from hairychris/patch-2
Fixes #363 - Remove stray closing tags, fix navbar margin
2015-10-04 10:48:31 -07:00
Chris Franklin
694bbb2e81 Fixes #363 - Remove stray closing tags, fix navbar margin
Removes stray </ul> tags that don't seem like they should be there. Reduces topbar bottom margin because it looked bad.
2015-10-04 15:44:06 +01:00
Amjith Ramanujam
c35d759b74 Fix the template syntax error. 2015-10-04 05:51:09 -07:00
Amjith Ramanujam
c0c0bc6ca3 Add newrelic for monitoring. 2015-10-04 05:06:20 -07:00
Jay
faa534b3c1 Enhances #360 2015-10-04 12:13:42 +02:00
Audrey Roy Greenfeld
e23e9ceb7e Multiple Dockerfiles. Implementation of #360. 2015-10-03 20:06:33 -07:00
Daniel Roy Greenfeld
a6e10f6600 Correct production name 2015-10-03 17:08:11 -07:00
Audrey Roy Greenfeld
d19ddbcf1e Explain Docker Toolbox better. 2015-10-03 16:59:52 -07:00
Audrey Roy Greenfeld
d09abc8d86 More simplification. 2015-10-03 16:56:53 -07:00
Audrey Roy Greenfeld
2d609432b9 Add @jayfk's note from #356. 2015-10-03 16:54:01 -07:00
Audrey Roy Greenfeld
c9b4d1f16e Unify docker-compose run sections. 2015-10-03 16:44:43 -07:00
Audrey Roy Greenfeld
765bb32fbe Simplify redundant parts of docker-compose instructions. 2015-10-03 16:35:48 -07:00
Audrey Roy Greenfeld
606b026a8c Simplify docs and un-deprecate the part that's still valid. 2015-10-03 16:21:08 -07:00
Audrey Roy Greenfeld
6258583fb1 Docker Toolbox includes Virtualbox. No need to repeat. 2015-10-03 16:15:02 -07:00
Daniel Roy Greenfeld
4781c2baa2 Flake8 fix 2015-10-03 15:58:49 -07:00
Daniel Roy Greenfeld
0c9dfd8de6 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-10-03 15:42:40 -07:00
Daniel Roy Greenfeld
9b34bf16ec Fixing the build 2015-10-03 15:42:33 -07:00
Daniel Greenfeld
af1c377d19 Merge pull request #358 from pydanny/luzfcb-escape-jinja
escape admin url usage example in comment
2015-10-03 15:40:07 -07:00
Fábio C. Barrionuevo da Luz
606e1de157 escape admin url usage example in comment 2015-10-03 19:35:27 -03:00
Daniel Roy Greenfeld
6dbf4e88d6 Add the DJANGO_ADMIN_URL to app.json 2015-10-03 15:01:35 -07:00
Daniel Roy Greenfeld
ab62fdb4ac Obfuscating the Django admin URL on Heroku 2015-10-03 14:58:09 -07:00
Daniel Roy Greenfeld
58ec2fe113 URL to django.contrib.admin is now configurable 2015-10-03 14:54:29 -07:00
Daniel Roy Greenfeld
bf98d7340b Support this projecy 2015-10-03 14:12:58 -07:00
Daniel Roy Greenfeld
25e0fe1baa Spread the word about twoscoops.academy 2015-10-03 14:09:43 -07:00
Fabio C. Barrioneuvo da Luz
8a7ecb0ca7 update CHANGELOG.md 2015-09-30 15:13:20 -03:00
Fabio C. Barrioneuvo da Luz
a1fff49481 Update the usage example 2015-09-30 15:12:38 -03:00
Fabio C. Barrioneuvo da Luz
376cf9382a Update 'now' date in cookiecutter.json 2015-09-30 15:11:42 -03:00
Fabio C. Barrioneuvo da Luz
0fb5f5d854 Update version of requirements
cookiecutter, coverage, django-environ, django-extensions, hitchpython, hitchselenium, hitchserve, pytest, pytz, whitenoise
2015-09-30 15:10:12 -03:00
Fábio C. Barrionuevo da Luz
50ff5810be Update CHANGELOG.md 2015-09-30 12:59:51 -03:00
Fábio C. Barrionuevo da Luz
09b61bab1a Merge pull request #354 from siauPatrick/master
String view arguments to url() is deprecated in django 1.9
2015-09-30 12:44:19 -03:00
Roman Afanaskin
5150f0ec2d String view arguments to url() is deprecated in django 1.9 2015-09-30 18:13:16 +03:00
Jannis Gebauer
b75bdf5faa fixed sentry logging, added testing requirements 2015-09-30 10:40:09 +02:00
Jannis Gebauer
b465ccc9b2 fix sentry logging in conjunction with celery 2015-09-30 10:39:25 +02:00
Jannis Gebauer
25326d5560 added pyflakes and pep8 to requirements (used for testing) 2015-09-30 10:37:46 +02:00
Audrey Roy Greenfeld
8b38a1229e Add @andor-pierdelacabeza to contributors. Add #350 to changelog. 2015-09-29 11:13:13 -07:00
Audrey Roy Greenfeld
6f4cd7f0ce Merge pull request #350 from andor-pierdelacabeza/patch-1
Fixed reStructuredText (RST) format
2015-09-29 11:08:19 -07:00
Jannis Gebauer
2b5e8c1a1b Added recent changes to contributors & boot2docker 2015-09-28 09:43:20 +02:00
Jannis Gebauer
ba85552732 Removed duplicate 2015-09-28 09:42:35 +02:00
Jannis Gebauer
d8a7081d4c Added advice on how to persist changes with boot2docker 2015-09-28 09:42:13 +02:00
Alvaro [Andor]
bdd916835e Fixed reStructuredText (RST) format
The lack of a space between the '::' tag and the text did that the block around the code didn't appear.
2015-09-27 19:42:21 +02:00
Audrey Roy Greenfeld
86d9c848ca Merge pull request #349 from hackebrot/fix-contributors-file-format
Fix contributors file format
2015-09-27 10:24:11 -07:00
Raphael Pierzina
17b3814193 Add @hackebrot to contributors 2015-09-26 11:07:49 +02:00
Raphael Pierzina
8187842971 Add a blank before core committer mark to be consistent 2015-09-26 11:01:56 +02:00
Raphael Pierzina
900385c0da Add rst bullet points to CONTRIBUTORS.rst 2015-09-26 10:47:21 +02:00
Raphael Pierzina
73c19f6046 Rename CONTRIBUTORS.txt to rst 2015-09-26 10:36:16 +02:00
Audrey Roy Greenfeld
598bf20826 Add @kaidokert to contributors list. 2015-09-26 01:08:04 -07:00