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
|
7dcc6b38ae
|
Moving sass compilation to django-pipeline
|
2012-04-20 14:20:09 -04:00 |
|
Bridger Maxwell
|
812810a670
|
Converted gradebook to refactored grading format.
|
2012-04-13 16:32:39 -04:00 |
|
Piotr Mitros
|
e2e9f8904e
|
Gradebook bug. Maybe fixed? Maybe not? Deploy debugging.
|
2012-04-03 15:59:58 -04:00 |
|
Bridger Maxwell
|
2f15424acc
|
Merged in master branch
|
2012-03-25 15:05:37 -04:00 |
|
Bridger Maxwell
|
2aca626440
|
Changed gradebook to be a table.
|
2012-03-24 15:32:11 -04:00 |
|
Calen Pennington
|
fdc5cd94a9
|
Move to subdirectory in prepartion for merge
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
98dd48f9da
|
Move to subdirectory in prepartion for merge
|
2012-03-19 11:10:44 -04:00 |
|