Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,026 Commits 1 Branch 0 Tags
0e9cf17b82cb4816e6404011555ec7434f2bd1dd
Commit Graph

1525 Commits

Author SHA1 Message Date
cahrens
9ec658cf7d Skip tests that aren't passing. This is a few capa test points, all of sequence, and all video tests. 2013-01-07 10:25:42 -05:00
cahrens
534c294e08 Merge branch 'feature/cale/cms-master' into feature/christina/misc 2013-01-07 09:59:42 -05:00
cahrens
ab1173cfdc Merge with cms-master. 2013-01-07 09:59:08 -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
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Chris Dodge
c0f12e69f7 fixes on the export. There's some attributes not being handled correctly 2012-12-27 16:15:52 -05:00
Chris Dodge
625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export 
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
 2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da Merge pull request #1208 from MITx/feature/cdodge/clone-course 
fix up some thumbnail issues. Also we need to manage the user permission...
 2012-12-27 09:26:51 -08:00
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
Don Mitchell
83bc9d7bf8 Grader unit tests (partial) 2012-12-26 15:48:37 -05:00
Don Mitchell
b65775c300 Merge pull request #1195 from MITx/feature/christina/misc 
Fix typo in Formula Response name (Studio #101).
 2012-12-20 14:15:01 -08:00
cahrens
37b83c1ecf Fix typo in Formula Response name (Studio #101). 2012-12-20 17:06:12 -05:00
Chris Dodge
b40a8a3e9e implement course clone and delete functionality from the command line 2012-12-20 13:55:15 -05:00
chrisndodge
c407012f2d Merge pull request #1168 from MITx/bug/dhm/dec12 
Import default grading_policy was setting it to a unicode empty string
 2012-12-17 10:17:23 -08:00
Calen Pennington
c546c36858 Merge pull request #1147 from MITx/fix/zoldak/cms-jasmine 
Do not copy already compiled coffee to js files from xmodule video and a...
 2012-12-17 09:39:43 -08:00
Don Mitchell
e2526a37d3 Import default grading_policy was setting it to a unicode empty string 
rather than an empty dict and thus screwing up later updates.
 2012-12-17 11:50:40 -05:00
Chris Dodge
d18f42224c fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store 2012-12-17 10:41:54 -05:00
cahrens
dd7ed956dd Bug fix for Studio #55. 2012-12-14 11:37:45 -05:00
Jay Zoldak
c485e441a9 Do not copy already compiled coffee to js files from xmodule video and also do not save them in git 2012-12-13 14:26:27 -05:00
Chris Dodge
10b417c85e initial checkin of export 2012-12-13 11:53:52 -05:00
chrisndodge
6ab97b6fd9 Merge pull request #1125 from MITx/feature/dhm/cms-settings 
Feature/dhm/cms settings
 2012-12-13 06:52:49 -08:00
Christina Roberts
c87eb08b1e Bug fix for Lighthouse #22. 
html names are automatically converted to the symbols they describe.
 2012-12-12 12:57:31 -05:00
Chris Dodge
95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from 2012-12-12 10:57:06 -05:00
Chris Dodge
0e3a022086 fix broken tests from master -> CMS-master merge. Namely the change to unicode strings when reading files off disk. Also there was some work collisions on course_loads which removed Mongo testing. Make it so that explicitly test both XMLFilestores as well as Mongo 2012-12-11 11:21:08 -05:00
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00
Christina Roberts
6acae5b440 Show error if organization name has invalid characters 2012-12-10 15:19:34 -05:00
Christina Roberts
495b58241c Remove 'name' property if it exists in an AssignmentFormatGrader. Don and I decided to do this instead of throwing an xlint warning and forcing authors to delete the name property. 2012-12-10 11:50:21 -05:00
chrisndodge
a4ed3a7ba9 Merge pull request #1088 from MITx/feature/dhm/course-info 
Course info style and implementation
 2012-12-10 05:59:59 -08:00
Calen Pennington
b4793b3277 Add an implementation of get_items to xml module store 2012-12-07 12:02:29 -05:00
Calen Pennington
3e568667fc Fix merge badness 2012-12-07 11:24:25 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
David Ormsbee
61c17cabfa Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule 
Fix/brian/nonascii html xmodule
 2012-12-06 15:33:21 -08:00
David Ormsbee
cee0781a20 Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit. 2012-12-04 15:51:36 -05:00
Brian Wilson
c2d5c04d9d Merge branch 'master' into fix/brian/nonascii-html-xmodule 2012-12-04 13:26:37 -05:00
Brian Wilson
dfb9913100 clean up lms tests, and fix export/import 2012-12-04 11:52:35 -05:00
Brian Wilson
4ebd70dcc4 add support for utf8 in sequences, verticals and custom modules. 2012-12-04 03:54:36 -05:00
Brian Wilson
1d44ebb10c Add more non-ascii characters to full dataset, and make fixes in xmodule code. 2012-12-03 16:22:25 -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
Don Mitchell
0b7bff4c3f Everything tested and ready for Tom to fix 2012-11-30 10:40:19 -05:00
Chris Dodge
2aceb2e44a make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter 2012-11-29 15:56:03 -05:00
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
Chris Dodge
050cb89cf7 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:41 -05:00
Chris Dodge
021ed3bca6 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:07 -05:00
Brian Wilson
6a24ecebe7 decode utf-8 when reading html, and encode when writing. 2012-11-28 17:54:18 -05:00
Victor Shnayder
4b58cb9560 Fix attempt tracking, fix test 
- increments attempts on any transition to DONE state
 2012-11-28 15:04:07 -05:00
Victor Shnayder
0a1b731dbc properly reset answer area on module reset 2012-11-28 14:18:44 -05:00
Victor Shnayder
b41b459712 update docstring on x_module.get_score to match reality 2012-11-28 14:09:32 -05:00
Victor Shnayder
4fd1a2fa1a Fix state tracking for self-assessment. 
now keep each set of responses in a separate dictionary
 2012-11-28 14:09:09 -05:00
Victor Shnayder
e3b9238eef reorder imports 2012-11-28 14:08:18 -05:00