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

326 Commits

Author SHA1 Message Date
Rocky Duan
ef2a8467e8 fix potential <script> tag escape bug 2012-07-17 17:00:36 -04:00
Bridger Maxwell
2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-17 12:53:27 -04:00
David Ormsbee
28fc3ec18a Add overview.html, a simple one page place where course staff can control a course about page. 2012-07-17 10:54:21 -04:00
Bridger Maxwell
8ebaf8a761 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py
 2012-07-17 10:52:39 -04:00
David Ormsbee
373db8704d Add number property to CourseDescriptor and switch templates to use it. 2012-07-17 08:22:15 -04:00
David Ormsbee
27ec1b4dcf Change course listing to show course numbers + title 2012-07-17 08:22:15 -04:00
David Ormsbee
d20eb07722 Allow UTF-8 chars in about sections. 2012-07-17 08:22:15 -04:00
Arjun Singh
8365c2fdad Merge branch 'master' into ccp0101/capa_pythonpath 2012-07-16 16:54:51 -04:00
Arjun Singh
0682401841 Allows for additional paths when executing code in a loncapa problem. Adds a default path of data/course/code. 2012-07-16 16:53:38 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
Bridger Maxwell
264e324c50 Changed format of start date parsing to ISO 8601 2012-07-16 11:27:13 -04:00
Mike Chen
412a907a8a allow additional (python) path for scripts in capa problem. 2012-07-16 23:16:39 +08:00
Calen Pennington
fabe1d41d1 Merge pull request #180 from MITx/kimth/lms-coderesponse 
CodeResponse for external/queued grading of student code
 2012-07-16 07:55:54 -07:00
kimth
e7c25c9999 Remove reset button being on all the time (for debug) 2012-07-13 13:57:29 -04:00
kimth
6d3516a754 CodeResponse for queued code checking 2012-07-13 13:45:38 -04:00
Bridger Maxwell
f9de962365 Merge remote-tracking branch 'origin/master' into course_start 2012-07-13 13:40:01 -04:00
Bridger Maxwell
ecc50314f7 Added a decorator that prevents access to course pages until the course has started. 2012-07-13 10:31:36 -04:00
Bridger Maxwell
8d7c4ad8de Added a start date to courses. Created a decorator to retrieve the course and check that it is open. 2012-07-12 16:27:20 -04:00
Calen Pennington
d1d57e81cf Don't crash the system if you can't parse an xml file while loading a definition for a module descriptor 2012-07-12 14:04:09 -04:00
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