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
chrisndodge
ea38482946
Merge pull request #1156 from MITx/feature/christina/misc
...
Bug fix for Studio #55 .
2012-12-14 09:00:38 -08:00
cahrens
dd7ed956dd
Bug fix for Studio #55 .
2012-12-14 11:37:45 -05:00
chrisndodge
d965221ec7
Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips
...
debugged tooltip latency/vanishing issue
2012-12-14 06:26:48 -08: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
Brian Talbot
caf143514c
debugged tooltip latency/vanishing issue
2012-12-12 14:11:30 -05: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
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05:00
Diana Huang
3b805fac1a
Merge pull request #1123 from MITx/bugfix/victor/open-ended-parsing
...
Fix for issues in open ended parsing
2012-12-11 10:24:53 -08:00
Vik Paruchuri
b4fffc798c
Fix for issues in open ended parsing
2012-12-11 13:14:34 -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
Vik Paruchuri
ab84042435
Fix raised error
2012-12-10 14:24:00 -05:00
Diana Huang
7279d11cf2
Add a reload button to open-ended input problems
2012-12-10 14:16:00 -05:00
Victor Shnayder
ed1f4bdd85
Check for none.
2012-12-10 14:10:19 -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
Diana Huang
cc72870aac
Make oepn-ended responses and self-assessment answers use
...
the same CSS
2012-12-10 11:00:28 -05:00
chrisndodge
e1c452bc08
Merge pull request #1113 from MITx/feature/dhm/course-info
...
move the underscore tempaltes to /static/client-templates and update the...
2012-12-10 07:17:19 -08:00
Chris Dodge
79e48dde97
move the underscore tempaltes to /static/client-templates and update the references
2012-12-10 10:01:08 -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
Victor Shnayder
7190e484f1
Use a namedtuple for parsing ScoreMessages
2012-12-07 10:35:44 -05:00
Victor Shnayder
bf593c6603
clean up imports
2012-12-07 10:35:44 -05:00
Victor Shnayder
42f8afb083
address minor code review comments
2012-12-07 10:35:44 -05:00
Victor Shnayder
3da727125f
fix feedback formatting
2012-12-07 10:35:43 -05:00
Victor Shnayder
6d2688cb66
unicode fix and cleanup in stringify children
2012-12-07 10:21:46 -05:00
Vik Paruchuri
0bc0657939
Add in support for ordering tags properly in feedback box
2012-12-07 09:21:23 -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
Vik Paruchuri
1eaf424c20
Change some things to use format
2012-12-05 13:17:16 -05:00
Vik Paruchuri
e813dc3514
Address format issue and exception
2012-12-05 12:08:26 -05:00
Victor Shnayder
3795b3a785
Address Dave's comments
...
- factor out some common code
- improve variable names
2012-12-05 10:56:12 -05: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
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
