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

543 Commits

Author SHA1 Message Date
Bridger Maxwell
2348f71cc6 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 
Conflicts:
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/views.py
 2012-08-06 11:48:42 -04:00
Rocky Duan
7c58fd27a1 Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/templates/profile.html
 2012-08-04 18:07:27 -04:00
ichuang
7fe75030cc fix staff edit link in module content display (goes to github) 2012-08-04 17:52:14 -04:00
kimth
af22761778 modx_dispatch doesn't need xqueue_interface 2012-08-03 15:27:39 -04:00
Victor Shnayder
94e24c1626 Leftover name->url_name fixes 2012-08-03 14:45:43 -04:00
Bridger Maxwell
854508b006 Removed the unnecessary creation of StudentModules when calling module_render's get_module. 2012-08-03 14:30:45 -04:00
kimth
7a9489a9b8 modx_dispatch combines file and non-file submission into single answer dict 2012-08-03 13:53:31 -04:00
kimth
3d8ee671b3 Adjust comments 2012-08-03 09:34:47 -04:00
kimth
3b3482b394 Skeleton for S3 upload by LMS 2012-08-02 20:43:09 -04:00
kimth
35a461d917 Empty file inputs insert empty string as their submission in ajax; LMS reacts accordingly 2012-08-02 20:22:33 -04:00
kimth
ea36eef6e0 modx_dispatch uses copied variable rather than source 2012-08-02 19:38:33 -04:00
kimth
236c3dc576 modx_dispatch handles new/old problem_check ajax 2012-08-02 19:34:33 -04:00
kimth
541f5ecdd2 Filesubmission frontend 2012-08-02 14:32:40 -04:00
Victor Shnayder
987b9c11a9 Use url_name for chapters and sections in lms views 
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
 2012-08-02 14:28:44 -04:00
Rocky Duan
5d3b187540 Merge branch 'master' of github.com:MITx/mitx 2012-08-01 16:45:21 -04:00
Rocky Duan
75c478771e fixed histogram bug under staff view 2012-08-01 12:42:57 -04:00
Victor Shnayder
463b758434 fixed args in call to add_histogram 2012-08-01 11:48:18 -04:00
Victor Shnayder
c0cdff7071 Rename MalformedDescriptor to ErrorDescriptor 
* change references and tests
* add staff/non-staff display
* added is_staff to ModuleSystem
 2012-08-01 11:42:39 -04:00
Brittany Cheng
f637ca5120 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-01 09:44:45 -04:00
kimth
2e3c5de1a5 Remove hardcoding of LMS callback URL and default queuename 2012-07-31 14:08:02 -04:00
Rocky Duan
c39b2db678 retrieve inline discussion by ajax 2012-07-31 13:22:25 -04:00
kimth
0879f3e0a8 Use build_absolute_uri rather than hardcoded sandbox URL 2012-07-31 13:21:45 -04:00
kimth
27e142dd2f Extra empty line 2012-07-31 12:58:32 -04:00
kimth
3968e117e1 Simplify dict load in xqueue_callback 2012-07-31 10:42:32 -04:00
kimth
22af531b0b Hardcoded URL moved to LMS for now 2012-07-31 10:09:47 -04:00
kimth
e2f4995bc9 LMS provides fully qualified callback URL 2012-07-31 08:57:28 -04:00
Rocky Duan
8228bebc2a Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
 2012-07-30 17:41:19 -04:00
Victor Shnayder
59defd33b6 Formatting and little bugfixes 
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
 2012-07-27 16:09:25 -04:00
Rocky Duan
7a53bc52ae Merge branch 'master' of github.com:MITx/mitx 2012-07-27 12:30:54 -04:00
David Ormsbee
72341569f9 Remove sections from ever getting appended in the first place if hide_from_toc is true 2012-07-27 01:22:07 -04:00
David Ormsbee
2671801f93 Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation). 2012-07-26 14:55:42 -04:00
Rocky Duan
aab9f8dc1c make course id available in xmodule 2012-07-25 18:15:52 -04:00
Rocky Duan
b2da6eef9f provide user_id for xmodules 2012-07-25 18:15:52 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
0fcaa01484 Allow anonymous users to check problems, but don't save any instance state for them 2012-07-24 16:14:04 -04:00
Victor Shnayder
a8c70d3531 add todo 2012-07-24 16:14:02 -04:00
Calen Pennington
19a3c14ab9 Split out code to replace /static urls in get_html into a separate module so that it can be used in CMS previews 2012-07-24 16:14:01 -04:00
Calen Pennington
a81015a91b Move I4xSystem into xmodule so that the definition is available to the CMS 2012-07-24 15:05:07 -04:00
Calen Pennington
1d1a9173a4 Cleaning up pep8 violations 2012-07-23 14:44:40 -04:00
kimth
8c327eb07f Moved imports to top of file 2012-07-17 14:44:20 -04:00
kimth
803b0c4fd0 Callback uses userid rather than username 2012-07-17 10:59:27 -04:00
kimth
093ac9d101 CorrectMap in LMS keeps track of problems as being queued 2012-07-16 16:19:35 -04:00
kimth
6d3516a754 CodeResponse for queued code checking 2012-07-13 13:45:38 -04:00
Calen Pennington
c468d47aa2 Minor change in comment about module type/category 2012-07-11 22:19:34 -04:00
Calen Pennington
e39e454ff2 Correct comments for get_module 2012-07-11 22:19:34 -04:00
Calen Pennington
920c397292 Be more specific about what the random number generator seed is 2012-07-11 22:19:34 -04:00
Calen Pennington
6dd141247d Fixing github_sync to work with multiple course data directories 2012-07-10 14:58:27 -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
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Matthew Mongeau
1fcc02579d Pass a course to get_section 2012-07-09 17:49:49 -04:00