Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

2457 Commits

Author SHA1 Message Date
Calen Pennington
b48d08b2c5 Minor changes from pull request 170 2012-07-12 11:40:02 -04:00
bridger
28007b280c Merge pull request #168 from MITx/multicourse_wiki 
Multicourse wiki
 2012-07-12 07:35:17 -07:00
Calen Pennington
b29649c49b Allow for more flexible candidates for replacement filepaths 2012-07-11 23:02:33 -04:00
Calen Pennington
379c6d164d Allow importing of courses that still have mako templating in them 2012-07-11 23:02:33 -04:00
Calen Pennington
b3ab9c23f7 Allow importing of courses that don't have the expected path/filename structure for problems and html 2012-07-11 23:02:33 -04:00
ichuang
926fdd010e Merge pull request #173 from MITx/cpennington/pull-155-cleanup 
This cleans up remaining issues w/ https://github.com/MITx/mitx/pull/155
 2012-07-11 19:34:56 -07:00
Calen Pennington
dfad0decc3 Disambiguating name in XMLModuleStore definition 2012-07-11 22:19:34 -04:00
Calen Pennington
f0717570c0 Clean up how mapping from metadata to xml attributes is done 2012-07-11 22:19:34 -04:00
Calen Pennington
a4d2245b44 Add comment about LazyLoadingDict 2012-07-11 22:19:34 -04:00
Calen Pennington
cdd55373c6 Make it clear that the module for backwards compatability is just that 2012-07-11 22:19:34 -04:00
Calen Pennington
8e4c7c878e Add comment about location invalid chars 2012-07-11 22:19:34 -04:00
Calen Pennington
8119e6b939 Adding comment about future of user groups 2012-07-11 22:19:34 -04:00
Calen Pennington
780eb646fc Add note that metadata dictionary is scaffolding 2012-07-11 22:19:34 -04:00
Calen Pennington
77fea77726 Define type of resource_fs in export_to_xml docstring 2012-07-11 22:18:41 -04:00
Calen Pennington
3cef71431e Make mapping from xml attributes to metadata values less manual 2012-07-11 22:18:40 -04:00
Calen Pennington
e7d44a2606 Remove explain attribute in favor of solution stanza as exemplified in edx4edx 2012-07-11 22:18:40 -04:00
Calen Pennington
9fdd5b1134 Don't dump the entire LoncapaProblem text in the unicode string 2012-07-11 22:18:40 -04:00
Calen Pennington
c3964c5447 Clarify CapaModule docstring 2012-07-11 22:18:40 -04:00
Calen Pennington
aeae2e02e2 Add docstrings to abtest with xml and json formats 2012-07-11 22:18:40 -04:00
Calen Pennington
5463f2f348 Log the correct id attribute in capa_problem 2012-07-11 22:18:40 -04:00
Calen Pennington
78f2a1ebe7 Add comments to LoncapaProblem constructor with types 2012-07-11 22:18:40 -04:00
Calen Pennington
35ffa4dc0e Micro optimization of Location initialization from dictionaries 2012-07-11 16:41:25 -04:00
Calen Pennington
f8e9313dad Minimize the number of roundtrips to mongo during cms save by prefetching children 2012-07-11 16:22:24 -04:00
Bridger Maxwell
ae955ec4a5 Now using the course name as the default wiki namespace. 2012-07-11 15:32:59 -04:00
Calen Pennington
9c883420fd Fix typo when reading showanswer out of capa problem metadata 2012-07-11 09:17:30 -04:00
Calen Pennington
853a452699 Use appropriate indexes in mongo modulestore 2012-07-11 08:53:56 -04:00
ichuang
314c572825 fix capa_problem to call each responder's get_answers() just once 2012-07-10 22:30:32 -04:00
Bridger Maxwell
a9eab86aee Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse 2012-07-10 15:47:39 -04:00
Calen Pennington
6dd141247d Fixing github_sync to work with multiple course data directories 2012-07-10 14:58:27 -04:00
Bridger Maxwell
aff904a69d Merge 2012-07-10 14:40:31 -04:00
David Ormsbee
56d873097c add pyparsing to requirements for capa lib 2012-07-10 14:12:32 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
 2012-07-10 13:39:19 -04:00
Calen Pennington
74593d18af Fix url in CapaModule error message 2012-07-10 13:15:40 -04:00
Calen Pennington
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Calen Pennington
dbfcd78c88 Get custom_tag templates using system.filestore so that they work in multicourse 2012-07-10 10:46:18 -04:00
Calen Pennington
ad08df7abd Add logging when info and about sections are missing 2012-07-10 09:32:18 -04:00
Calen Pennington
3011f3f336 Expect the proper error type when about or info sections aren't found 2012-07-10 09:30:14 -04:00
Calen Pennington
332ccb0bef Use course 'display_name' from metadata, and fall back to course id name if display_name is not set 2012-07-10 09:27:05 -04:00
Calen Pennington
115a572fd0 Set defaults for org and course, and log error messages when they are used 2012-07-10 09:23:40 -04:00
Calen Pennington
6d246f0685 Merge remote-tracking branch 'origin/master' into ps-cms-backbone 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html
 2012-07-10 08:55:45 -04:00
Calen Pennington
cfd6890d68 Merge remote-tracking branch 'origin/master' into cpennington/cms-github 
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
 2012-07-10 08:50:54 -04:00
Matthew Mongeau
ff74bc79d4 Undo forced CourseDescriptor 2012-07-09 18:21:06 -04:00
Bridger Maxwell
4aacace056 Fixed exception type when about or info section missing. 2012-07-09 15:54:36 -04:00
Matthew Mongeau
43e6bbb29f Added info page content 2012-07-09 14:16:17 -04:00
Matthew Mongeau
c47cdc7f87 Fix some path problems. 2012-07-09 14:06:44 -04:00
Matthew Mongeau
3053caec7e Get course about page working. 2012-07-09 13:48:18 -04:00
Matthew Mongeau
949efb62e9 Got courses page working... mostly. 2012-07-09 11:27:45 -04:00
ichuang
aedcd9a4c4 change "type" to "category" in xml_module.py 2012-07-08 22:04:54 -04:00
ichuang
0daf7b0497 merging of stable-edx4edx into master - bugfixes and debugging 2012-07-08 19:03:29 -04:00
ichuang
9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx 
Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py
 2012-07-08 16:52:36 -04:00