Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,502 Commits 1 Branch 0 Tags
7aa97d2999fb8506c8e00aae63192dc049cc9700
Commit Graph

20 Commits

Author SHA1 Message Date
Calen Pennington
908bfa3c09 Remove the old poll module test case 2013-03-04 09:02:59 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Vik Paruchuri
34dc6e6320 Fix some issues with peer grading service 2013-02-05 13:37:55 -05:00
Calen Pennington
8874d9d7f8 Add a draft implementation of the Poll module for Justice 2013-01-03 12:21:13 -05:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Brian Wilson
0c1ebd8dfb add toylab test data and test changes, including fix to jump_to 2012-11-30 19:05:26 -05:00
Brian Wilson
9bfa800208 add non-ascii data to toy dataset 2012-11-28 18:28:40 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-19 16:00:27 -05:00
Victor Shnayder
739dd8e3f9 fix for multiple url_name hashing bug 2012-09-06 10:12:48 -04:00
Victor Shnayder
79109a6244 Apply attr_map translation to metadata loaded from policy file as well as from xml. 2012-09-03 13:51:20 -04:00
Victor Shnayder
f81f94ec67 Allow location url_names to contain ':', mapping to / on file load 
* New format: {tag}://{org}/{course}/{category}/{name}[@{revision}]
* Updated tests, code
* Added test chapter with : in url_name in toy course
* added test html page with : in url_name
* added a note to docs
 2012-08-27 11:37:22 -04:00
Victor Shnayder
1dc31ceb8b fix toylab html 2012-08-21 16:09:35 -04:00
Victor Shnayder
00d9ecd600 New policy organization: 
* course roots live in roots/{url_name}.xml
   - one is linked from course.xml

* policies live in policies/url_name.json
  - loaded based on course url_name

* Updated to pass policy through into xml parsing, so it takes effect
  before descriptor constructors are called.

* Update toy test course to new structure, fix up tests
 2012-08-16 11:41:19 -04:00
Victor Shnayder
168f76ce5a Add jump_to functionality to lms on mongo 
* More tests for mongo modulestore, including tweaks to test files
* add location_to_id method to CourseDescriptors
* Implement path_to_location method in mongo.py
  - TODO: does not handle position in sequences yet.
* fix bug in jump_to view.
 2012-07-27 16:08:24 -04:00
Victor Shnayder
eb5989aa99 Ready to implement path_to_location 
* Clean up test data for simple, toy courses
* clean up test_mongo.py
* write initial test for path_to_location
* hook up view to use path_to_location

Next: actually implement it :)
 2012-07-27 16:08:24 -04:00
Victor Shnayder
f10c4c06b6 Start adding tests for mongo modulestore 
* fix up toy course to match current format
* fix github sync test that referred to toy course
 2012-07-27 16:08:23 -04:00
Victor Shnayder
a5bacb4696 add now-mandatory metadata to toy course.xml 2012-07-27 16:08:23 -04:00
Calen Pennington
6bf0e093bc Add tests for the edit page for the toy course, and make sure that exporting to github sets up the git repo properly 2012-07-24 15:05:07 -04:00
Calen Pennington
ab851c0b1a Add tests for the core github_sync functionality 2012-07-05 11:54:43 -04:00
Victor Shnayder
f87433e346 folders and a bit of initial test data for xml validation 2012-06-21 15:27:19 -04:00