Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,619 Commits 1 Branch 0 Tags
b9e5e9f0ee61ba5635a4c352be66eab05a66918e
Commit Graph

487 Commits

Author SHA1 Message Date
kimth
b9e5e9f0ee Read XML for queuename 2012-07-30 20:18:25 -04:00
kimth
6244412c28 Simplify default linenumbers behavior 2012-07-30 18:59:11 -04:00
kimth
bd66a28d32 Add TODO note 2012-07-30 15:23:14 -04:00
kimth
bd0b20bb60 xqueue_callback uses 'xqueue_body' tag rather than 'response' tag for main message 2012-07-30 13:35:13 -04:00
kimth
4e43b662fa CodeResponse admits only one student response 2012-07-30 13:10:24 -04:00
kimth
80b62bf026 Serialize xqueue payload 2012-07-30 12:30:08 -04:00
kimth
6631848b53 CodeMirror fix in the new scss org 2012-07-26 10:49:10 -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
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
Calen Pennington
cb6c7640c8 Get the video module pointing to the correct static files directory, without relying on get_html replacement 2012-07-24 16:14:01 -04:00
Calen Pennington
19a3c14ab9 Split out code to replace /static urls in get_html into a separate module so that it can be used in CMS previews 2012-07-24 16:14:01 -04:00
Calen Pennington
4c82f35e2d Put data_dir into metadata for all XModuleDescriptors loaded from xml 2012-07-24 16:14:01 -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
987fe17358 Load js fragments in order, so that Subview is loaded before the classes that use it 2012-07-24 16:14:00 -04:00
Calen Pennington
5026d6e9fb Give all XModuleDescriptors a module_class, and make it inheritance of js_module_names work 2012-07-24 16:14:00 -04:00
Calen Pennington
3cdceab16c Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms 2012-07-24 16:13:59 -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
Calen Pennington
1395e5d55c Empty Locations are now legal 2012-07-24 16:13:59 -04:00
Calen Pennington
9458e53988 Adding stripped down 6002x course for testing, along with CMS test for edit pages for same 2012-07-24 16:13:51 -04:00
Calen Pennington
6bf0e093bc Add tests for the edit page for the toy course, and make sure that exporting to github sets up the git repo properly 2012-07-24 15:05:07 -04:00
Calen Pennington
45144ec4ce Remove the live preview code from the html and raw modules, in preparation for updating the preview on save 2012-07-24 15:05:07 -04:00
Calen Pennington
15ac476781 Display preview html on the module edit page. Javascript for previews doesn't yet function 2012-07-24 15:05:07 -04:00
Calen Pennington
a81015a91b Move I4xSystem into xmodule so that the definition is available to the CMS 2012-07-24 15:05:07 -04:00
Calen Pennington
97cdb67b49 Log error messages when failing to parse xml from a string that contain context of where the error occurred in the string (in definition_to_xml) 2012-07-24 15:05:07 -04:00
Calen Pennington
d8f8d8c656 Merge branch 'release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py
 2012-07-24 08:52:50 -04:00
David Ormsbee
f22810524d Use settings.SITE_NAME instead of hardcoded edx.org 2012-07-23 23:54:35 -04:00
David Ormsbee
614f4540d0 Place a domain_override to force Django to use edx.org instead of example.com. 
Django hardcodes the subject line for password reset emails. You're supposed
to be able to override it with a properly named template, but that didn't
make it into 1.3.1 (which is what we're deploying on now). We're not using
the Sites framework at this time, so this was the "fix".
 2012-07-23 23:41:45 -04:00
Bridger Maxwell
cfe1255432 Updated error messages for missing signup fields. 2012-07-23 20:03:38 -04:00