Commit Graph

4355 Commits

Author SHA1 Message Date
Jannis Gebauer
40fac26175 added @phiberjenz 2016-05-22 20:21:58 +02:00
Jannis Gebauer
6c2063759c added changes from @phiberjenz, @noisy 2016-05-22 20:20:57 +02:00
Jannis Gebauer
c35fc6acbe Merge branch 'master' of https://github.com/phiberjenz/cookiecutter-django into phiberjenz-master 2016-05-22 20:19:04 +02:00
Jannis Gebauer
24d75ebe45 resolved merge conflicts 2016-05-22 20:18:08 +02:00
Fábio C. Barrionuevo da Luz
df9dc0f3ee add cookiecutter version warning in README.rst (#547) 2016-05-20 17:37:14 -07:00
phiberjenz
82dae58061 Added instructions on how to copy backups from Docker container to host 2016-05-19 15:30:30 +02:00
phiberjenz
8795dacbb3 Added instructions on how to copy backups from Docker container to host 2016-05-19 15:27:33 +02:00
Audrey Roy Greenfeld
779365c9f0 Clarify how ROOT_DIR is calculated 2016-05-17 16:15:53 -07:00
Daniel Roy Greenfeld
b04e00f140 Added @dezoito's contribution to the changelog 2016-05-15 09:02:24 -07:00
Dezoito
e206276269 Added article to README.rst (#545)
* Added fist version of gitlab ci file

* Added Link to CI Integration in GitLab and name to contributor's list

(Removed .gitlab-ci.yml due to issues building env in gitlab)
2016-05-15 09:01:05 -07:00
Fabio C. Barrioneuvo da Luz
0601795f68 update requirements and changelog 2016-05-13 00:13:42 -03:00
Daniel Roy Greenfeld
c7c1d0bfa1 Remove Raven 404 catch middleware. Fix #367 2016-05-11 21:53:30 -07:00
Daniel Roy Greenfeld
7b24c19ce5 Fix #524 2016-05-09 21:12:34 -07:00
Fabio C. Barrioneuvo da Luz
d79e09d0e2 update version of pyflakes 2016-05-09 17:38:14 -03:00
Fabio C. Barrioneuvo da Luz
2b878fcf36 replace occurrences of readthedocs.org to readthedocs.io 2016-05-09 17:18:58 -03:00
Fabio C. Barrioneuvo da Luz
8c3996439a update changelog 2016-05-09 17:01:51 -03:00
Fábio C. Barrionuevo da Luz
fcb3a8cfc9 Merge pull request #541 from shireenrao/patch-1
Added a comment on how to use mailhog
2016-05-09 16:36:24 -03:00
shireenrao
8cbe97bb9f Added a comment on how to use mailhog
As somebody new to mailhog, I was a confused on how to use it. I first assumed, it was going to be used by the django app itself. After reading more on the internet I found it needed to be executed outside of the django application.
2016-05-09 14:33:21 -04:00
Audrey Roy Greenfeld
bd9e437717 Update name per #524 2016-05-08 21:31:12 -07:00
Audrey Roy Greenfeld
274a724601 Merge pull request #540 from trungdong/master
Updated whitenoise configuration to match changes in version 3.0
2016-05-08 10:11:37 -07:00
Trung Dong Huynh
3c6898b3f6 Updated whitenoise configuration to match changes in version 3.0
(see http://whitenoise.evans.io/en/stable/changelog.html)
2016-05-08 11:55:32 +01:00
Audrey Roy Greenfeld
4d110c8ad9 Merge branch 'raonyguimaraes-master' 2016-05-06 23:54:00 -07:00
Audrey Roy Greenfeld
7897e0f48f Merge 2016-05-06 23:53:58 -07:00
Daniel Roy Greenfeld
d537268b8d Update requirements 2016-05-05 21:53:08 -07:00
Fabio C. Barrioneuvo da Luz
9a2668b4f9 update version of Django, django-extensions and django-mailgun 2016-05-03 21:13:53 -03:00
Audrey Roy Greenfeld
fe49689dee Merge pull request #537 from pydanny/restore-idea-directory
Fix issue #535 - Restore idea directory
2016-05-01 22:15:49 -07:00
Fabio C. Barrioneuvo da Luz
cd3d1dab70 update CHANGELOG.md 2016-05-01 20:35:13 -03:00
Fabio C. Barrioneuvo da Luz
f72e35ea25 restore pycharm project configuration files 2016-05-01 20:28:34 -03:00
Daniel Roy Greenfeld
a524c58d88 Update CHANGELOG.md 2016-04-30 22:27:42 -07:00
Simón Castillo
d7c8531e25 Small fixes to utility scripts (#536)
* Fix python install utility when not using Heroku

Don't try to install `requirements.txt` which doesn't exist unless using Heroku.

* Fix bad absolute paths

* Allow dependency installation from any location
2016-04-30 22:26:33 -07:00
Audrey Roy Greenfeld
b6bf40e973 Update to latest boto in prod 2016-04-29 13:55:29 -07:00
Audrey Roy Greenfeld
145a4bdf5c Update local requirements 2016-04-29 13:54:49 -07:00
Daniel Roy Greenfeld
8ac31962d6 Added PythonAnywhere to the docs index 2016-04-26 21:57:38 -07:00
Daniel Roy Greenfeld
ad0d5b61b3 Recognized @hjwp's contribution for installing on PythonAnywhere 2016-04-26 21:53:27 -07:00
Daniel Roy Greenfeld
da76b4d62e Merge pull request #532 from hjwp/master
Deployment instructions for PythonAnywhere. Fixes #236
2016-04-26 21:50:22 -07:00
Audrey Roy Greenfeld
8b53200b0d Generated readme cleanup 2016-04-26 19:18:31 -07:00
Daniel Roy Greenfeld
7dad5ac667 Removed Hitch per #529 2016-04-25 23:11:17 -07:00
Audrey Roy Greenfeld
5517bdd1bc Update requirements 2016-04-25 22:59:02 -07:00
Audrey Roy Greenfeld
5bd3f03889 Update base requirements 2016-04-25 22:51:28 -07:00
Audrey Roy Greenfeld
7d1fc84301 Revise Community section of README 2016-04-25 15:11:19 -07:00
Daniel Roy Greenfeld
7e89db8b3a Made post_gen_project more robust 2016-04-25 15:05:59 -07:00
Daniel Roy Greenfeld
7a5712c379 Check to confirm that the user has a modern version of Cookiecutter. 2016-04-25 14:10:39 -07:00
Daniel Roy Greenfeld
a783828ce7 Check to confirm that the user has a modern version of Cookiecutter. 2016-04-25 14:09:37 -07:00
Harry
fee825e889 another formatting tweak 2016-04-25 17:38:45 +01:00
Harry
54503562f8 formatting tweak 2016-04-25 17:36:38 +01:00
Harry
1224ae9e5b fix a few typos and syntax errors 2016-04-25 17:33:42 +01:00
Harry
55faf7fd2c Update instructions for latest version of cookiecutter 2016-04-25 17:24:41 +01:00
Harry
0e979f3470 First cut of pythonanywhere deployment instructions. need updating for mailgun. 2016-04-25 15:47:13 +01:00
Audrey Roy Greenfeld
75a9b27a8d Merge pull request #530 from mcoconnor/master
Remove duplicate clickjacking protection
2016-04-22 09:23:20 -07:00
Michael O'Connor
f453e062e1 Remove duplicate clickjacking protection 2016-04-21 09:06:57 -05:00