Commit Graph

3314 Commits

Author SHA1 Message Date
Jannis Gebauer
2ffdffe9c7 Merge branch 'master' of https://github.com/pydanny/cookiecutter-django 2015-10-24 19:18:40 +02:00
Jannis Gebauer
dc67886f64 Merge pull request #385 from pydanny/change-add-to-copy
Use COPY instead of ADD in Dockerfiles
2015-10-24 19:15:53 +02:00
Jannis Gebauer
1f36ed3c8e Merge branch 'master' of https://github.com/pydanny/cookiecutter-django 2015-10-24 18:46:49 +02:00
Jannis Gebauer
a05d1c99e9 Merge branch 'master' of github.com:jayfk/cookiecutter-django 2015-10-24 18:46:29 +02:00
Audrey Roy Greenfeld
e852bfe5b9 Update history. Add TODOs for @pydanny and @theskumar to update for your changes 🔔 2015-10-22 12:42:53 -07:00
Audrey Roy Greenfeld
dcaa3e91c2 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-10-22 12:37:35 -07:00
Audrey Roy Greenfeld
f9f4876e11 Remove unnecessary gitkeep. Already another file in that dir. 2015-10-22 12:37:14 -07:00
Audrey Roy Greenfeld
3d6169c2b9 Use COPY instead of ADD as per https://docs.docker.com/articles/dockerfile_best-practices/#add-or-copy 2015-10-22 12:35:55 -07:00
Daniel Roy Greenfeld
2b550a75d5 removed isort link 2015-10-21 13:19:08 -07:00
Saurabh Kumar
676739332a Update requirement, coverage, factory-boy 2015-10-22 00:25:01 +05:30
Saurabh Kumar
f01cddeae6 fix requirement, update django-autoslug to 1.9.3
Thanks @cdvv7788 / @aniketmaithani
2015-10-22 00:19:24 +05:30
Colm O'Connor
cc98785734 Hitch : Updates to the default framework template - to accomodate new features, rationalized features and bug fixes. 2015-10-20 17:53:03 +08:00
Audrey Roy Greenfeld
c98934d7d5 When developing on Windows, only install psycopg2 in test/prod. 2015-10-19 16:02:42 -07:00
Adam Dobrawy
e1d76ea25e Add factories for users 2015-10-18 13:58:41 +02:00
Audrey Roy Greenfeld
a7c2cf8f56 Set example ALLOWED_HOSTS to be domain and its subdomains. 2015-10-15 14:40:12 -07:00
Daniel Roy Greenfeld
08ab710ea4 Cryptographically secured env.example secret key 2015-10-15 09:29:43 -07:00
Daniel Roy Greenfeld
811e98f4cf Contribution updates 2015-10-14 13:26:01 -07:00
Daniel Roy Greenfeld
ab7e2635ca Merge pull request #376 from MathijsHoogland/patch-1
Removed unnecessary space
2015-10-14 13:08:04 -07:00
Audrey Roy Greenfeld
1a886dc098 Merge pull request #377 from MathijsHoogland/patch-2
Added clarification on building for local or production
2015-10-14 13:04:59 -07:00
Audrey Roy Greenfeld
251e8d1ddd Document the project generation options. 2015-10-14 12:59:14 -07:00
MathijsHoogland
ccc0262c5e Added sudo: true to the travis file
Sudo isn't true for default for some people in travis.
2015-10-14 16:41:28 +02:00
MathijsHoogland
c04883fd52 Added clarification on building for local or production 2015-10-14 15:05:34 +02:00
MathijsHoogland
5a8f1ed4b1 Removed unnecessary space 2015-10-14 14:22:22 +02:00
cdvv7788
5fead42be9 Minor clarification about repo_name on setup 2015-10-13 11:12:24 -05:00
cdvv7788
6e957e4ac0 Minor clarification about repo_name on setup 2015-10-13 11:10:57 -05:00
Saurabh Kumar
4f7e5e5c97 Update requirements to latest stable
- django-autoslug==1.9.2
- django-debug-toolbar==1.4
- gevent==1.0.2
2015-10-13 14:22:36 +05:30
Jannis Gebauer
15f7657565 Fixed #302 (raven on development) 2015-10-11 20:34:55 +02:00
Jannis Gebauer
1a7ef8106c Added Anna Callahan to contributors 2015-10-11 20:29:55 +02:00
Jannis Gebauer
a578c3ba60 Merge pull request #373 from jazztpt/master
Fix for raven not being loaded on development (taskapp)
2015-10-11 20:27:42 +02:00
Anna Callahan
daedd6c4c3 Fix for raven not being loaded on development
related to issue #302
2015-10-11 14:10:39 -04:00
yunti
93592326c1 Update deployment-on-heroku.rst 2015-10-09 15:45:07 +01:00
Amjith Ramanujam
4acd6ad098 Remove blank lines to fix flake8 compliance. 2015-10-08 05:38:05 -07:00
Daniel Roy Greenfeld
d022bc89f0 Update developing-locally.rst 2015-10-07 09:51:18 -07:00
Daniel Roy Greenfeld
e031ed8e6f Fixing database configuration. 2015-10-07 09:50:21 -07:00
Audrey Roy Greenfeld
1027befea1 Merge pull request #361 from pydanny/multiple-dockerfiles
Multiple Dockerfiles. Implementation of #360.
2015-10-06 10:46:18 -07:00
Fabio C. Barrioneuvo da Luz
b22611a1a3 update requirements 2015-10-05 18:09:55 -03:00
Daniel Greenfeld
c1a90af9ad Update developing-locally-docker.rst 2015-10-04 12:09:18 -07:00
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