Audrey Roy Greenfeld
d1a2126613
Merge pull request #587 from xpostudio4/master
...
Include Licensing options from cookiecutter.json in LICENSE template
2016-06-04 01:02:14 -07:00
Leonardo Jimenez
c5e984cf23
Include Licensing on the template
2016-06-03 23:55:51 -07:00
Leonardo Jimenez
1ceb309631
Merge branch 'master' of https://github.com/pydanny/cookiecutter-django
2016-06-03 22:36:05 -07:00
Audrey Roy Greenfeld
fc67ecf174
Remove use_angular option again
2016-06-03 18:12:18 -07:00
Audrey Roy Greenfeld
87e35817cf
Merge branch 'viviangb-master'
2016-06-03 18:07:47 -07:00
Audrey Roy Greenfeld
4eb769f5af
Merge cookiecutter.json
2016-06-03 18:07:32 -07:00
Daniel Roy Greenfeld
38c6fb75ed
Added @viviangb to contributors
2016-06-03 17:39:13 -07:00
Vivian Guillen
cda3cfc641
merge in @@viviangb #585
2016-06-03 17:35:46 -07:00
mjsisley
fd9795992a
sync with master
2016-06-03 17:21:24 -07:00
mjsisley
60bfc7afa1
remove typo /start.sh
2016-06-03 17:07:07 -07:00
Vivian Guillen
8a925db024
Add gulp alternative as a js task runner
2016-06-03 17:05:57 -07:00
Daniel Roy Greenfeld
700ee39be8
Added @suledev to contributors list
2016-06-03 16:49:04 -07:00
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
Leonardo Jimenez
a7eb85208d
Eliminate empty spaces generated on Jinja on
...
config/settings/production.py
2016-06-03 15:50:34 -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
Vivian Guillen
7610a7978a
Add gulp with autoprefixing and minification for sass
2016-06-03 15:04:04 -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
Jeremy Carbaugh
54575f02de
Add settings required by SecurityMiddleware
...
also remove django-secure in prod settings
2016-06-03 12:32:05 -07:00
Leonardo Jimenez
0fa5261f4a
Include secure defaults for django security middleware
2016-06-03 12:24:11 -07:00
Vivian Guillen
97ddd3da1b
Fix navbar right top corner issue
2016-06-03 12:22:57 -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
Leonardo Jimenez
0efd49203b
Eliminate django-secure from requirements and settings files
2016-06-03 11:51:28 -07:00
mjsisley
4b05499d49
swap COPY to ADD in nginx Dockerfile
2016-06-03 08:39:45 -07:00
mjsisley
b8e02d2189
Add certbot(letsencrypt) support for docker
2016-06-03 08:07:39 -07:00
mjsisley
329ff57551
Adding documentation for debugging with Docker
2016-06-03 06:04:16 -07:00
Vivian Guillen
0328032cbf
Add bigger comments to better section the css
2016-06-02 18:57:01 -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
