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

1864 Commits

Author SHA1 Message Date
Calen Pennington
ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-23 13:55:20 -04:00
David Ormsbee
f213353613 Change how we display the start date to be internationally unambiguous. 2012-07-21 20:19:12 -04:00
Arjun Singh
d446081748 Added a filestore pointing at the directory of the file being run for xmodule tests 2012-07-20 13:31:11 -07:00
Arjun Singh
c87f9cd523 Added tests for ChoiceResponses. 2012-07-19 13:07:00 -07:00
Arjun Singh
ab11a5f7ed Allowing for form fields to submit more than one value; e.g. checkbox inputs. 2012-07-19 10:25:51 -07:00
ichuang
6ce2ab6025 fix for py2.6 compatbility 2012-07-19 11:19:42 -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
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
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
15b42b68eb Unit tests for CodeResponse update_score 2012-07-17 18:20:03 -04:00
Rocky Duan
ef2a8467e8 fix potential <script> tag escape bug 2012-07-17 17:00:36 -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
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
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
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
c3964c5447 Clarify CapaModule docstring 2012-07-11 22:18:40 -04:00