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

55 Commits

Author SHA1 Message Date
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
Chris Dodge
cff93d324b WIP 2013-08-15 22:58:02 -04:00
ichuang
a5bb971c9b add static_asset_path metadata to course, and honor its use in link rewriting 2013-08-12 20:26:20 +00:00
Chris Dodge
565564a46e add input/output information in doc strings 2013-07-23 12:15:56 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
Don Mitchell
8c904f31a9 Move defaults from yaml templates to field definitions. 
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
 2013-07-16 14:24:41 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
Calen Pennington
4ba26a3a1a Only render a histogram for modules that have scores associated with them 2013-04-22 08:04:16 -04:00
ichuang
f88b5794e4 fix default giturl link 2013-04-07 00:51:07 +00:00
ichuang
d2768c644e not all modules have xml_attributes ; be careful about this in xmodule_modifier 2013-04-07 00:20:46 +00:00
ichuang
8cafadc03b make "edit" links work - fixes giturl (was broken by xblocks migration) 
Conflicts:

	lms/templates/staff_problem_info.html
	lms/xmodule_namespace.py
 2013-04-07 00:03:36 +00:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Diana Huang
120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule 
Feature/vik/peer grading xmodule
 2013-02-05 12:55:48 -08:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Vik Paruchuri
c6c89e4216 Make peer grading xmodule work with notifications 2013-02-04 13:16:05 -05:00
Calen Pennington
0bed19648e Remove filename and giturl references 2013-01-02 15:08:27 -05:00
Calen Pennington
01411ae66e WIP: Trying to get tests working 2012-12-28 14:48:47 -05:00
Calen Pennington
c5e3380b71 WIP: Save student state via StudentModule. Inheritance doesn't work 2012-12-28 14:45:46 -05:00
Calen Pennington
cbfc7b201a WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms 2012-12-28 14:44:31 -05:00
Chris Dodge
b3dcc140b7 made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button 2012-11-26 14:22:13 -05:00
Chris Dodge
34c442a1dc removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering 2012-10-30 16:04:51 -04:00
Chris Dodge
743f2b56dd make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting 2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
Calen Pennington
dc062f5668 Make edit and delete buttons show up on cms unit editing page 2012-10-01 15:17:41 -04:00
Victor Shnayder
27cd9c9f82 Remove unused 'module' parameter from replace_{static,course}_urls 2012-09-20 01:12:33 -04:00
Victor Shnayder
0bbba8b16f Add more tests and replace ':' with '_' in html_id 
* in-progress to fixing support for ':' in url_names
 2012-09-13 09:44:51 -04:00
ichuang
4f8161df84 address two comments in https://github.com/MITx/mitx/pull/615 2012-09-04 11:10:22 -04:00
ichuang
a973c1c21e use module.descriptor.start for start date in xmodule_modifiers 2012-09-03 16:49:55 -04:00
ichuang
4d5ca284b2 add fix to histogram (so 6.00x codemirror is not broken) 2012-09-02 19:10:47 -04:00
ichuang
7664f910b1 add is_released 2012-09-02 19:04:55 -04:00
Victor Shnayder
44ee0200a5 Fix undefined variables if LMS_MIGRATION was off 2012-08-22 20:19:58 -04:00
ike
7c242939f2 fix staff debug view, and also add new source_link 2012-08-22 15:51:08 -04:00
kimth
02d970c31e Map '/course/' urls to the course's root in the multicourse hierarchy 2012-08-15 14:45:12 -04:00
ichuang
2c9652ab74 change xqa server location to suburl 2012-08-12 18:29:48 -04:00
ichuang
656a162aba allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER'] 2012-08-12 12:43:08 -04:00
ichuang
da64c8f0a1 add xqa interface to staff_problem_info, make staff_debug a modal 
window, add xqa modal window, add xqa_key to course metadata
 2012-08-11 20:12:37 -04:00
ichuang
f556e3f7d9 revert double-mangling patch in xmodule_modifiers; cale fixed in 
replace_urls
 2012-08-10 15:25:43 -04:00
ichuang
b6c38d3c59 replace_static_urls should only be run once (currently twice, eg if 
html is in a veritical)
 2012-08-10 15:25:42 -04:00
ichuang
881f07f3c3 revert double-mangling patch in xmodule_modifiers; cale fixed in 
replace_urls
 2012-08-10 15:25:42 -04:00
ichuang
27cd9ef986 minor change to allow github url to be overridden by metadata 2012-08-10 15:25:42 -04:00
ichuang
2e4f21ee3b replace_static_urls should only be run once (currently twice, eg if 
html is in a veritical)
 2012-08-10 15:25:41 -04:00
Victor Shnayder
932a9be747 Make tests pass again 
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
 2012-08-07 11:06:47 -04:00
ichuang
f47ab30c3f small fix to xmodule_modifiers to fix case when filename missing 2012-08-06 18:34:54 -04:00
ichuang
3c23235885 fix for some broken github edit links - avoids symlinks 2012-08-05 11:39:56 -04:00
ichuang
ebe6bf4888 remove some unnecessary debugging lines in xmodule_modifiers 2012-08-04 21:10:50 -04:00
ichuang
7fe75030cc fix staff edit link in module content display (goes to github) 2012-08-04 17:52:14 -04:00