Audrey Roy Greenfeld
b9623c64a8
Merge pull request #593 from pydanny/requires-io-master
...
[requires.io] dependency update on master branch
2016-06-05 18:24:49 -07:00
Daniel Roy Greenfeld
203afd5c19
Fix borked Americanese to be English
2016-06-05 17:21:59 -07:00
requires.io
faa8eaf32d
[requires.io] dependency update
2016-06-05 16:30:21 -07:00
requires.io
5408ccbef9
[requires.io] dependency update
2016-06-05 16:30:20 -07:00
requires.io
d14be9939b
[requires.io] dependency update
2016-06-05 16:30:19 -07:00
requires.io
4f55274503
[requires.io] dependency update
2016-06-05 16:30:18 -07:00
requires.io
df56488f01
[requires.io] dependency update
2016-06-05 16:30:17 -07:00
Daniel Roy Greenfeld
c56e4ef616
Fix the remove file problem
2016-06-05 14:16:02 -07:00
Daniel Roy Greenfeld
a65a750464
Switch use_certbot to the MUCH more explicit use_letsencrypt
2016-06-05 13:17:19 -07:00
Daniel Roy Greenfeld
8e258ee611
Changelog update
2016-06-05 12:33:36 -07:00
Daniel Roy Greenfeld
783e7f644e
Fix #390 #450
2016-06-05 12:32:05 -07:00
Daniel Roy Greenfeld
fd2e7dd0fe
Whitespace fix
2016-06-05 11:04:48 -07:00
Daniel Roy Greenfeld
f40f304457
Use sentry for error reporting
2016-06-05 10:47:07 -07:00
Daniel Roy Greenfeld
b2d0a86344
simplify cookiecutter.json
2016-06-04 17:16:48 -07:00
Daniel Roy Greenfeld
e5b3b85620
Reorder index
2016-06-04 16:11:14 -07:00
Daniel Roy Greenfeld
95724dfbbc
Add @chrisdev to contributors
2016-06-04 10:28:12 -07:00
Daniel Roy Greenfeld
1232477c80
Merge branch 'mjsisley-letsencrypt-docker'
2016-06-04 10:22:47 -07:00
Daniel Roy Greenfeld
94cb04b389
merge @mjsisley #576
2016-06-04 10:21:44 -07:00
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
