Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

1864 Commits

Author SHA1 Message Date
Diana Huang
728103056d Move rubric into a subset of problem in CSS. 2012-12-19 13:16:35 -05:00
Diana Huang
11d5eea2b9 Add in CSS updates and fixes to the template so that it will work. 2012-12-19 11:52:37 -05:00
Bridger Maxwell
f23bf85199 Added config to grader to hide averages of pset scores. 2012-12-19 11:44:32 -05:00
David Ormsbee
8373ee4bf6 Basic support for freeform advertised_start dates like 'Spring' 2012-12-19 04:01:37 -05:00
Brian Wilson
bc40a7f127 make test-reg dialog non-modal, and pass course_id in URL. Add to course info. 2012-12-18 16:16:55 -05:00
David Ormsbee
0ddea6d0ae Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx 
Feature/alex/video timeframe mitx
 2012-12-17 13:20:47 -08:00
Jay Zoldak
cc54c37359 Exclude settings.py files from coverage reports and configure titles for the reports. 2012-12-17 15:00:11 -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
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
Victor Shnayder
df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling 
Updates to the styling of open ended problems
 2012-12-10 11:36:04 -08:00
Diana Huang
7279d11cf2 Add a reload button to open-ended input problems 2012-12-10 14:16:00 -05:00
Diana Huang
3156c2b393 Add icon to the grading message 2012-12-10 12:29:46 -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
David Ormsbee
e3b4d78d87 IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object. 2012-12-07 16:03:05 -05:00
Calen Pennington
b4793b3277 Add an implementation of get_items to xml module store 2012-12-07 12:02:29 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading 
Feature/victor/instructor grading
 2012-12-07 08:44:58 -08: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
Victor Shnayder
bd94474a50 improve docstring 2012-12-07 10:35:44 -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
Alexander Kryklia
97016d6168 video time frame support for xmodule 2012-12-05 17:18:35 +02:00
Alexander Kryklia
7390015799 parameters in display video 2012-12-05 14:43:35 +02:00
Victor Shnayder
1d87dab3a7 remove queueing spinner and polling logic, change message 
- no polling, since instructors may take a long time to grade
 2012-12-04 17:45:51 -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
Diana Huang
9b1cad90b5 Fix location that gets used for open-ended responses 2012-12-03 16:52:29 -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
Victor Shnayder
32d8a6e922 Pass through course_id, location to openendedresponse 
- set default queue in response type--don't use the default per-course one
 2012-11-30 14:11:11 -05:00
Don Mitchell
0b7bff4c3f Everything tested and ready for Tom to fix 2012-11-30 10:40:19 -05:00
Victor Shnayder
5bf39fef96 Cherry pick the test-cleanup parts of e2826cb. 
- look up test courses by id, not name
 2012-11-30 09:52:34 -05:00
Victor Shnayder
6b5125c4df fix typos, logger configs 2012-11-30 09:51:33 -05:00
Vik Paruchuri
d59681e3aa Alter css tag names, change documentation and answer display settings. 2012-11-29 16:11:49 -05:00
Vik Paruchuri
ce7444780b Add in feedback, work on css to display open ended feedback 2012-11-29 16:11:49 -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