Calen Pennington
|
c917725ff0
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/static/sass/course.scss
requirements.txt
|
2012-12-07 11:17:41 -05:00 |
|
David Ormsbee
|
3b326048f9
|
Don't log errors to console if there is no console (like IE8 and below).
|
2012-12-01 12:16:10 -05:00 |
|
Calen Pennington
|
ce3638538c
|
Make inline editing save to mongo and then update the preview
|
2012-10-01 15:17:41 -04:00 |
|
ichuang
|
56951e9961
|
put try-catch around histogram coffeescript code
|
2012-09-06 11:18:00 -04:00 |
|
Calen Pennington
|
408726e678
|
Standardize how JS XModules are instantiated
|
2012-07-24 16:14:04 -04:00 |
|
Calen Pennington
|
5f86fcfbff
|
Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane
|
2012-07-24 16:14:00 -04:00 |
|
Calen Pennington
|
3fa636e060
|
Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory
|
2012-07-24 16:13:59 -04:00 |
|
Prem Sichanugrist
|
8fb06ce194
|
Update code according to changes in 829e502
|
2012-07-03 14:33:24 -04:00 |
|
Calen Pennington
|
2011861444
|
Get capa problems to display from a keystore
|
2012-06-29 12:42:48 -04:00 |
|
Prem Sichanugrist
|
0f073f70c4
|
Create Calculator and Feedback form on every page
|
2012-06-13 14:56:48 -04:00 |
|
Calen Pennington
|
5ba03130aa
|
Moving LMS code into subdirectory
|
2012-06-06 14:09:01 -04:00 |
|