Calen Pennington
|
24f85bf202
|
Merge pull request #340 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
|
2012-08-06 12:17:15 -07:00 |
|
ichuang
|
9805ed8962
|
cleanup syntax, split long if into two lines
|
2012-08-06 14:37:17 -04:00 |
|
kimth
|
6c875206bc
|
Simplify file submission front end
|
2012-08-06 12:44:19 -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 |
|
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 |
|
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 |
|
kimth
|
2e3c5de1a5
|
Remove hardcoding of LMS callback URL and default queuename
|
2012-07-31 14:08:02 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Calen Pennington
|
9d1dc37b44
|
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
cms/djangoapps/contentstore/management/commands/import.py
cms/djangoapps/contentstore/views.py
cms/envs/common.py
cms/envs/dev.py
cms/envs/test.py
cms/static/sass/README.txt
cms/static/sass/_base.scss
cms/static/sass/_calendar.scss
cms/static/sass/base-style.scss
cms/templates/base.html
cms/templates/index.html
cms/templates/widgets/header.html
cms/templates/widgets/module-dropdown.html
cms/templates/widgets/navigation.html
cms/templates/widgets/problem-edit.html
cms/urls.py
common/djangoapps/pipeline_mako/__init__.py
common/djangoapps/util/views.py
common/lib/capa/capa_problem.py
common/lib/capa/templates/textinput_dynamath.html
common/lib/mitxmako/middleware.py
common/lib/mitxmako/shortcuts.py
common/lib/mitxmako/template.py
common/lib/xmodule/capa_module.py
common/lib/xmodule/seq_module.py
common/lib/xmodule/setup.py
common/lib/xmodule/test_files/symbolicresponse.xml
common/lib/xmodule/test_files/test_files/symbolicresponse.xml
common/lib/xmodule/tests/__init__.py
common/lib/xmodule/tests/test_files/symbolicresponse.xml
common/lib/xmodule/vertical_module.py
common/lib/xmodule/video_module.py
common/lib/xmodule/x_module.py
lms/djangoapps/courseware/content_parser.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/static/coffee/spec/helper.coffee
lms/static/coffee/spec/modules/video/video_player_spec.coffee
lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
lms/static/coffee/src/modules/problem.coffee
lms/static/coffee/src/modules/sequence.coffee
lms/static/coffee/src/modules/video/video_player.coffee
lms/static/coffee/src/modules/video/video_volume_control.coffee
lms/static/js/vendor/jquery-1.6.2.min.js
lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
lms/static/sass/application.scss
lms/static/sass/courseware/_sequence-nav.scss
lms/static/sass/courseware/_video.scss
lms/templates/main.html
lms/urls.py
rakefile
requirements.txt
|
2012-07-05 16:22:50 -04:00 |
|
Matthew Mongeau
|
3ae48d19b4
|
Passes course around for courseware. Fix static assets.
|
2012-07-03 12:13:15 -04:00 |
|
Calen Pennington
|
6612beab46
|
Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again
|
2012-07-02 11:15:37 -04:00 |
|
Calen Pennington
|
79987666df
|
Lazily load module definition and metadata as needed, rather than immediately
|
2012-07-02 10:50:27 -04:00 |
|
Calen Pennington
|
3cf29af8fe
|
Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content
|
2012-07-02 10:17:59 -04:00 |
|
Calen Pennington
|
7ac8fecb38
|
Rename XModule[Descriptor].type to .category to be parallel to Location
|
2012-07-02 09:01:08 -04:00 |
|
Calen Pennington
|
87d80835c0
|
Initialize StudentModule with the max_score
|
2012-06-29 12:45:46 -04:00 |
|