Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9300 Commits

Author SHA1 Message Date
ichuang
6ce2ab6025 fix for py2.6 compatbility 2012-07-19 11:19:42 -04:00
ichuang
0903ba9c1f fix optioninput to preserve author's ordering of options 2012-07-19 11:15:14 -04:00
kimth
ff4716ef76 Further simplification after restricting to one answer field 2012-07-19 10:57:14 -04:00
kimth
bff86c32ca CodeResponse restricted to only one answer field 2012-07-19 10:47:12 -04:00
Calen Pennington
49ee12963f Merge pull request #185 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-19 06:29:48 -07:00
David Ormsbee
16eeb43a04 Add University Profile page with images and text blurbs 2012-07-18 16:17:12 -04:00
kimth
cc9f9a9df8 queuekey generated from LoncapaProblem seed + system time 2012-07-18 14:10:41 -04:00
Bridger Maxwell
f25dbc0854 Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses. 2012-07-18 13:48:20 -04:00
David Ormsbee
588f115b33 Add support for optional end_date, effort, and prerequisites info on course_about 2012-07-18 13:17:31 -04:00
kimth
84eb3efa8a Implemented 'initial_display' for CodeResponse 2012-07-18 11:08:17 -04:00
kimth
bb0601ff7a Further tests of CorrectMap in CodeResponse unit testing 2012-07-18 08:54:54 -04:00
David Ormsbee
8768189db1 Video slot only appears in course about page if there is a video (note: url is still fixed). 2012-07-18 01:29:00 -04:00
David Ormsbee
a12e628fb1 Display real course start date in course about page 2012-07-17 22:52:19 -04:00
kimth
1ddc3b560b Deep copy of CorrectMap was implied by code. Made it actually the case 2012-07-17 18:33:56 -04:00
kimth
15b42b68eb Unit tests for CodeResponse update_score 2012-07-17 18:20:03 -04:00
kimth
631517ccdd Queue callback consumes queuekey 2012-07-17 17:01:28 -04:00
Rocky Duan
ef2a8467e8 fix potential <script> tag escape bug 2012-07-17 17:00:36 -04:00
kimth
0b538fdac8 Fixed bug in answer prefetching in LoncapaProblem._preprocess_problem 2012-07-17 16:58:55 -04:00
kimth
d9432a15ba Drop immediate seed prior to queuekey generation 2012-07-17 15:26:40 -04:00
kimth
9b0e00efa2 Log both grading and queueing 2012-07-17 14:41:52 -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
kimth
934b37c195 Remove json import from capa_problem -- needed for debug 2012-07-17 11:12:23 -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
kimth
269468ba6e CorrectMap.is_queued and .is_right_queuekey defaults to False if answer_id not found 2012-07-17 10:47:10 -04:00
kimth
0958485b46 update_score: edit existing CorrectMap rather than starting with empty CorrectMap 2012-07-17 10:31:21 -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
kimth
093ac9d101 CorrectMap in LMS keeps track of problems as being queued 2012-07-16 16:19:35 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
kimth
838a8624c9 Add docstring to 'score_update' path 2012-07-16 11:28:26 -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