Calen Pennington
|
bc823d3bfe
|
Merge branch 'master' into asset-pipeline
Conflicts:
djangoapps/multicourse/__init__.py
requirements.txt
sass/_info.scss
sass/_textbook.scss
sass/courseware/_sequence-nav.scss
sass/courseware/_video.scss
sass/index/_base.scss
sass/index/_extends.scss
sass/index/_footer.scss
sass/index/_header.scss
sass/index/_index.scss
sass/index/_variables.scss
sass/layout/_calculator.scss
sass/print.scss
static/css
static/css/application.css
static/css/marketing.css
templates/main.html
templates/marketing.html
templates/sass/index/_base.scss
templates/sass/index/_extends.scss
templates/sass/index/_footer.scss
templates/sass/index/_header.scss
templates/sass/index/_index.scss
templates/sass/index/_variables.scss
templates/sass/marketing/_base.scss
templates/sass/marketing/_extends.scss
templates/sass/marketing/_footer.scss
templates/sass/marketing/_header.scss
templates/sass/marketing/_index.scss
templates/sass/marketing/_variables.scss
|
2012-05-17 16:32:39 -04:00 |
|
Calen Pennington
|
cc6e0c55c4
|
Cleaning up the envs/* files so that they will work with gunicorn_django
|
2012-05-17 11:18:32 -04:00 |
|
Calen Pennington
|
2b7b9ada60
|
Make local file uploads work in dev environment
|
2012-05-04 14:44:50 -04:00 |
|
Calen Pennington
|
7dcc6b38ae
|
Moving sass compilation to django-pipeline
|
2012-04-20 14:20:09 -04:00 |
|
David Ormsbee
|
3a95e3f79f
|
Moving settings2/ folder to envs/
|
2012-04-02 14:15:44 -04:00 |
|