edx-platform

Files

cahrens fae8fd3841 Merge branch 'master' into feature/christina/unify-fields

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt

2013-06-13 10:55:13 -04:00

about

add end_date.html file

2013-01-14 12:23:36 -05:00

chapter

add support for utf8 in sequences, verticals and custom modules.

2012-12-04 03:54:36 -05:00

course

create test cases to simulate error exporting/importing textbooks

2013-05-10 10:01:10 -04:00

custom_tags

Add more non-ascii characters to full dataset, and make fixes in xmodule code.

2012-12-03 16:22:25 -05:00

html

add support for utf8 in sequences, verticals and custom modules.

2012-12-04 03:54:36 -05:00

info

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

policies

add unit test for tab reordering

2013-01-29 13:44:42 -05:00

problem

Not sure why these had capital-I's in them, since the text just above shows lowercase-i's, and uppercase doesn't work properly.

2013-05-06 10:55:06 -04:00

sequential

struct_time to datetime conversion.

2013-06-10 17:16:34 -04:00

static

Fixing tests that were failing to due static content directory change

2012-09-07 17:02:00 -04:00

subs

Adding stripped down 6002x course for testing, along with CMS test for edit pages for same

2012-07-24 16:13:51 -04:00

tabs

add testing for course info export. Plus DRY things out a bit

2013-01-31 10:51:20 -05:00

vertical

import needs to enumerate through the fields for all content scopes. Also add unit test

2013-03-20 21:37:09 -04:00

video

Add more non-ascii characters to full dataset, and make fixes in xmodule code.

2012-12-03 16:22:25 -05:00

course_settings.json

Adding stripped down 6002x course for testing, along with CMS test for edit pages for same

2012-07-24 16:13:51 -04:00

course.xml

Additional test coverage.

2013-06-07 17:24:07 -04:00

grading_policy.js

add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.

2012-11-01 15:08:26 -04:00

README.md

folders and a bit of initial test data for xml validation

2012-06-21 15:27:19 -04:00

to_delete

Adding stripped down 6002x course for testing, along with CMS test for edit pages for same

2012-07-24 16:13:51 -04:00

README.md

This is a realistic course, with many different module types and a lot of structure. It is based on 6.002x.