Commit Graph

1329 Commits

Author SHA1 Message Date
Sulé
fa89445f66 Removing unnecessary version check #534 (#584)
* Address issue #534

* missing comma added

* remove unecesssary version check #534
2016-06-03 16:35:10 -07:00
Daniel Roy Greenfeld
6269effbd7 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2016-06-03 16:10:03 -07:00
Daniel Roy Greenfeld
c64027a5cf Add @xpostudio4 as a contributor 2016-06-03 16:09:55 -07:00
Leonardo
907b8ecfbd Remove django-secure (#579)
* Eliminate django-secure from requirements and settings files

* Include secure defaults for django security middleware

* Add settings required by SecurityMiddleware

also remove django-secure in prod settings

* Eliminate empty spaces generated on Jinja on
config/settings/production.py
2016-06-03 16:07:27 -07:00
Audrey Roy Greenfeld
39fe13bea8 Merge pull request #582 from EMCain/my-favorite-cookie
[wip] my-favorite-cookie tutorial
2016-06-03 15:40:36 -07:00
Audrey Roy Greenfeld
87845bd817 Temp quick fixes to improve developing-locally doc 2016-06-03 15:31:50 -07:00
Emily C
ffc83080c7 initial commit 2016-06-03 15:23:00 -07:00
Daniel Roy Greenfeld
ed11e05d09 Finish removing Angular 2016-06-03 14:08:25 -07:00
Daniel Roy Greenfeld
36ac82b1cf Removed angular2 2016-06-03 14:07:25 -07:00
Daniel Roy Greenfeld
1efe3f6caf Tracking more work by @dot2dotseurat 2016-06-03 14:05:08 -07:00
Meghan Heintz
daf98aea42 Adding Apache 2 License option (#578)
* Adding Apache 2 License option

* changed order of liences availble
2016-06-03 14:02:51 -07:00
Daniel Roy Greenfeld
65b3de002c Added @mjsisley to the contributor list 2016-06-03 12:52:52 -07:00
mjsisley
6885547b6a Adding documentation for debugging with Docker (#575)
* Adding documentation for debugging with Docker

* Add -f dev.yml
2016-06-03 12:50:23 -07:00
Audrey Roy Greenfeld
dc5a70f741 Merge pull request #577 from dot2dotseurat/troubleshooting
Adding Troubleshooting Guide to Docs
2016-06-03 12:19:19 -07:00
Meghan Heintz
a751fbcf9f moving warnings from readme to troubleshooting 2016-06-03 12:11:54 -07:00
Meghan Heintz
ecc81134dd Adding troubleshotting to index 2016-06-03 12:04:11 -07:00
Meghan Heintz
4b6707fe7b adding troubleshooting doc 2016-06-03 11:58:37 -07:00
Daniel Roy Greenfeld
6b9c6cbe64 Add @dot2dotseurat to changelog and history 2016-06-02 18:34:09 -07:00
Meghan Heintz
a25c57f0f4 postgres installation guide for mac, windows IP (#571)
* postgres installation guide for mac windows IP

* postgres install guide for mac ip windows
2016-06-02 18:28:50 -07:00
Daniel Roy Greenfeld
05c521dd61 remove errant line 2016-05-29 14:53:26 -07:00
Daniel Roy Greenfeld
e84f0a488d PEP8 fix 2016-05-29 10:08:39 -07:00
Audrey Roy Greenfeld
a658339b99 Switch from django-mailgun to django-anymail. Fix #539. 2016-05-27 11:31:30 -07:00
Daniel Roy Greenfeld
d7ac30a1d7 Tag as 1.9.6b 2016-05-25 19:14:44 -07:00
Audrey Roy Greenfeld
8ab37f9243 Merge pull request #552 from shireenrao/patch-2
Update developing locally docs on how to setup .env file
2016-05-23 23:21:21 -07:00
shireenrao
e8b0baf36c Update developing locally docs on how to setup .env file
Even though a link to the django-environ is there, it may help to see that .env file needs to be present for it to work.
2016-05-23 22:37:47 -04:00
Eman Calso
3717cbb6aa Install python3-dev when not using python2 (#551)
* Install python3-dev if use_python2==n

By default, ubuntu-based distros would install python2-dev if you
install python-dev.
python3-dev should be installed explicitly if we're not using python2.

* Add Emanuel Calso to contributors
2016-05-23 14:46:34 -07:00
Jannis Gebauer
6915c2c89a removed repo_name references 2016-05-22 20:50:07 +02:00
Jannis Gebauer
b21a27c1a5 fixed typo 2016-05-22 20:23:53 +02:00
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