Victor Shnayder
00da2b48e9
make sure course "org" and "course" are preserved on export
2012-07-27 16:08:23 -04:00
Victor Shnayder
9461148b6e
make customtag take impl as attribute rather than child
2012-07-27 16:08:22 -04:00
Victor Shnayder
94ac61ffe2
Make decision about export file splitting overrideable
...
* create split_to_file() function
* chapters, html, problems always split
* course never split
* others based on size of subtree for now
2012-07-27 16:08:22 -04:00
Victor Shnayder
e0513f5f24
Fix course tag name on export of definition
2012-07-27 16:08:22 -04:00
Victor Shnayder
5f84e61925
Add hook for error handling during xml import
...
* add error_handler member to DescriptorSystem
* call it where import errors happen
* also includes some refactoring in xml.py
* some more line length and docstring cleanups
2012-07-27 16:08:22 -04:00
Victor Shnayder
63f34f2e70
Line length and doc string cleanups
...
* no functionality changed in this commit.
2012-07-27 16:08:22 -04:00
Rocky Duan
7a53bc52ae
Merge branch 'master' of github.com:MITx/mitx
2012-07-27 12:30:54 -04:00
Calen Pennington
6abd1ec64a
Merge pull request #309 from MITx/feature/tutorials_fix
...
Add optional hide_from_toc attribute to XML elements
2012-07-27 05:38:29 -07:00
Calen Pennington
aa855eec0f
Merge pull request #307 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-07-27 05:37:57 -07:00
Rocky Duan
104e4c9fc8
Merge branch 'master' of github.com:MITx/mitx
2012-07-26 17:35:40 -04:00
Arjun Singh
c4c8bc2fbe
Adding the ability for javascript from problems to execute more intelligently; for example, errors from javascript included in the returned html will show up in the console when using this mechanism.
2012-07-26 16:35:33 -04:00
David Ormsbee
9cd3b013f3
Merge pull request #308 from MITx/feature/halogenandtoast/form-field-errors
...
Add field-error class to field with issues.
2012-07-26 12:54:04 -07:00
Rocky Duan
f0ce33c951
make mathjax working with the editor
2012-07-26 15:34:22 -04:00
David Ormsbee
2671801f93
Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation).
2012-07-26 14:55:42 -04:00
Matthew Mongeau
8e2ced916f
Add field-error class to field with issues.
2012-07-26 14:06:29 -04:00
Calen Pennington
1d554c76a0
Comment out really loud debug messages from xml.py
2012-07-26 12:05:23 -04:00
kimth
6631848b53
CodeMirror fix in the new scss org
2012-07-26 10:49:10 -04:00
Rocky Duan
9d2bccbee7
Merge branch 'master' of github.com:MITx/mitx
2012-07-26 10:43:42 -04:00
kimth
848e4e5801
Pull clean codemirror.css from master
2012-07-26 10:27:59 -04:00
kimth
8e8ac35d46
restored responsetypes.py from master
2012-07-26 10:11:49 -04:00
kimth
07de2d9903
Merging master
2012-07-26 10:08:55 -04:00
kimth
1255ed130f
Adjust comments
2012-07-26 09:15:07 -04:00
Calen Pennington
73d6565fac
Merge remote-tracking branch 'origin/hotfix/1.0.1'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-26 09:05:57 -04:00
Rocky Duan
7103bd0071
moved vendor js files to common
2012-07-25 20:57:38 -04:00
Rocky Duan
aab9f8dc1c
make course id available in xmodule
2012-07-25 18:15:52 -04:00
Rocky Duan
e6d437b66e
get user_id in discussion module
2012-07-25 18:15:52 -04:00
Rocky Duan
d49338c948
integrated search; refactored some frontend code
2012-07-25 18:15:51 -04:00
Rocky Duan
3267aa1737
forum view for discussions
2012-07-25 18:14:58 -04:00
Rocky Duan
846a488ef2
create new post
2012-07-25 18:11:00 -04:00
Rocky Duan
9abc888340
display simple threaded comment
2012-07-25 18:09:34 -04:00
Rocky Duan
0373096c8d
initial setup for the discussion module
2012-07-25 18:09:34 -04:00
Matthew Mongeau
bd9da89fe9
Move press articles to json.
2012-07-25 17:31:34 -04:00
kimth
57810bb564
Consolidate textbox styling into codemirror.css
2012-07-25 16:53:07 -04:00
kimth
31641252e7
Typos in and some additional comments
2012-07-25 13:28:52 -04:00
Calen Pennington
8b1bab75bd
Fixing up comments on xmodule components
2012-07-25 10:10:17 -04:00
Calen Pennington
29cf09763f
Fixing up cms tests to only use data in common/test/data
2012-07-25 10:09:25 -04:00
Calen Pennington
bdf964a305
Modularize video css
2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695
Modularize sequence css
2012-07-24 16:14:04 -04:00
Calen Pennington
8a0270ea2b
Allow for modular css from XModules, and split capa module css out as a test
2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678
Standardize how JS XModules are instantiated
2012-07-24 16:14:04 -04:00
Calen Pennington
ebb737b94a
Add better logging to capa_module during problem checking
2012-07-24 16:14:03 -04:00
Calen Pennington
8481937f59
Move Logger and *withPrefix javascript into a common location
2012-07-24 16:14:03 -04:00
Calen Pennington
87ce82570d
Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware
2012-07-24 16:14:03 -04:00
Calen Pennington
1924609b10
Move schematic.js into capa_module js includes
2012-07-24 16:14:02 -04:00
Calen Pennington
6ea5f6a493
Move imageinput.js to capa_module js includes
2012-07-24 16:14:02 -04:00
Calen Pennington
7e4d3c8b35
Modularize sequence coffeescript in prepration for CMS preview
2012-07-24 16:14:02 -04:00
Victor Shnayder
5988d1f47f
Organize and de-duplicate imports in mongo.py
2012-07-24 16:14:02 -04:00
Victor Shnayder
49e8d08c1e
Add get_courses() to mongo modulestore
...
* Note: This doesn't run yet
* add config file for lms on mongo
* Some comment additions and cleanups
2012-07-24 16:14:01 -04:00
Victor Shnayder
51ae0d5484
improve docstrings and formating in mongo.py
2012-07-24 16:14:01 -04:00
Calen Pennington
61446b0544
Make javascript for video previews work correctly
2012-07-24 16:14:01 -04:00
