Calen Pennington
|
c524ee7b88
|
Add enrollment link back to main page for development purposes, until we have the multicourse enrollment stuff worked out
|
2012-05-29 10:46:01 -04:00 |
|
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
|
6b10c0760b
|
Merge branch 'master' into anonymous_user
Conflicts:
djangoapps/student/views.py
|
2012-05-08 13:54:57 -04:00 |
|
Reda Lemeden
|
2fb6b56ca4
|
Added the edx announcement to the MITx marketing page + Other content updates
|
2012-05-01 10:13:01 -04:00 |
|
Calen Pennington
|
0871d95f98
|
Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository
|
2012-04-30 15:18:47 -04:00 |
|
Calen Pennington
|
7dcc6b38ae
|
Moving sass compilation to django-pipeline
|
2012-04-20 14:20:09 -04:00 |
|
Calen Pennington
|
fdc5cd94a9
|
Move to subdirectory in prepartion for merge
|
2012-03-19 11:10:44 -04:00 |
|