Calen Pennington
8a89309338
Merge branch 'master' into asset-pipeline
...
Conflicts:
static/js/application.js
2012-05-21 14:53:16 -04:00
Calen Pennington
03a9be7e78
Add newrelic handler, rather than custom function to log exceptions
2012-05-21 12:12:16 -04:00
Calen Pennington
ed3f081701
Merge branch 'master' into asset-pipeline
2012-05-21 10:22:59 -04:00
Calen Pennington
d0172d5d28
Correctly use the regex replacement function to substitute all urls in a particular chunk of text
2012-05-18 11:26:42 -04:00
ichuang
5e8fbcdc8d
fix multicourse; fix bug in I4xSystem - self.filestore not set when
...
filestore not None. mitxhome.html now properly automatically lists
all courses given in settings.COURSE_SETTINGS. mitxhome now served
from multicourse.views. optioninput.html was missing; fixed. cleaned
up access to request.session for coursename in courseware/views.py
2012-05-17 22:29:45 -04:00
Calen Pennington
1831ab4ea5
Merge remote-tracking branch 'origin/master' into asset-pipeline
...
Conflicts:
envs/dev.py
sass/README
static/css
static/css/application.css
static/css/marketing-ie.css
static/css/marketing.css
2012-05-17 16:48:17 -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
9859e8546d
Move accept header computations out of middleware
2012-05-17 13:23:20 -04:00
Calen Pennington
f30596c499
Merge branch 'master' into specific-error-handling
...
Conflicts:
djangoapps/courseware/views.py
2012-05-17 11:39:21 -04:00
Isaac Chuang
ad44882835
Ike's changes to enable multicourse, new response types, etc.
2012-05-16 21:18:47 -04:00
Calen Pennington
69321b4497
Display the appropriate type of error message depending on the type of the incoming request
2012-05-16 13:45:00 -04:00
Calen Pennington
698d0a167e
Display specific error messages when parts of the courseware break, rather than returning a 500 indicating that the whole site is down
2012-05-16 11:46:09 -04:00
Isaac Chuang
8989605cba
Moving in Ike's new files, touches of multicourse
2012-05-13 20:33:29 -04:00
Isaac Chuang
577d8815a3
Adding sympy check. Needs to be code reviewed before enabling in prod.
2012-05-11 16:55:02 -04:00
ichuang
1494cbbd85
Merged root URL prefix from Ike. Errors should be attributed to pmitros.
2012-05-10 23:17:34 -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
e8c4d1dbef
Replace links to static in problems with links to fingerprinted data
2012-04-23 11:42:42 -04:00
Calen Pennington
7dcc6b38ae
Moving sass compilation to django-pipeline
2012-04-20 14:20:09 -04:00
David Ormsbee
a6fb97affa
Catch Exception instead of ValueError for accessing our general content cache -- exception thrown changed in django 1.4
2012-04-17 13:59:30 -04:00
Piotr Mitros
686b1bf6bd
Moved site, is_secure, etc. into render_to_string shortcut, and fixed bugs in the shortcut. We should test this pretty well, since this touches a lot of templates
2012-03-28 19:44:22 -04:00
Calen Pennington
1bc3835fe6
Splitting files into subdirectories in preparation for merge
2012-03-19 11:10:44 -04:00
