Chris Dodge
fcaf3e6329
give some debug message regarding why export might fail
2013-08-08 21:01:38 -04:00
Vik Paruchuri
e39abe11db
Fix rubric with staff grading
2013-08-08 19:50:55 -04:00
Vik Paruchuri
e4bcfa5c21
Fix indents and copy behavior
2013-08-08 19:31:34 -04:00
Vik Paruchuri
687ab3ddae
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
common/lib/xmodule/xmodule/peer_grading_module.py
lms/templates/combinedopenended/combined_open_ended.html
lms/templates/combinedopenended/combined_open_ended_status.html
lms/templates/combinedopenended/openended/open_ended.html
lms/templates/combinedopenended/openended/open_ended_rubric.html
lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
2013-08-08 19:03:46 -04:00
Vik Paruchuri
a9926f0460
Display message to student when they cannot see their peer grading feedback yet.
2013-08-08 18:43:54 -04:00
Vik Paruchuri
900377e4ee
Return written feedback
2013-08-08 17:53:29 -04:00
Vik Paruchuri
d44b2e62a0
Proper partial credit checks
2013-08-08 17:19:06 -04:00
Vik Paruchuri
f59045c3f9
Scope rubrics locally, make them into classes
2013-08-08 16:54:39 -04:00
Vik Paruchuri
803b7eb2af
Fix peer grading rubric issue. Redo peer grading JS to scope locally
2013-08-08 16:31:36 -04:00
Vik Paruchuri
15b0e12068
Remove progress indicators, make rubric display properly
2013-08-08 14:02:33 -04:00
Vik Paruchuri
fd38223244
Fix grading submitted messages
2013-08-08 13:31:43 -04:00
Vik Paruchuri
bd9097596c
Remove annoying rubric parsing error, redo how notifications work
2013-08-08 13:16:32 -04:00
Vik Paruchuri
45d94c17f7
Add in next button, get rid of error with deleted peer grading module
2013-08-08 12:46:43 -04:00
Vik Paruchuri
203b1176cd
Don't check for ETA, or check peer grading data in self assessment
2013-08-08 12:14:57 -04:00
Christina Roberts
36b889349d
Merge pull request #610 from edx/christina/popup-css
...
Workaround for popup CSS path being wrong (tinymce).
2013-08-08 07:40:16 -07:00
Vik Paruchuri
17c77dd157
Merge pull request #392 from edx/fix/vik/answer-unknown
...
Simplify save_grade and pass through answer_unknown
2013-08-08 07:28:03 -07:00
Vik Paruchuri
4b5aba29ca
Fix defaults
2013-08-08 09:52:13 -04:00
cahrens
1bb29e5414
Workaround for popup CSS path being wrong (tinymce).
...
STUD-178
2013-08-08 09:50:54 -04:00
David Baumgold
be103dfa0d
improving code style
2013-08-08 09:46:15 -04:00
chrisndodge
ece4ec3f57
Merge pull request #533 from edx/fix/cdodge/use-static-shorthand-for-asset-urls
...
To increase portability of courses, have the Asset Index page display the classic /static/... URL shorthand.
2013-08-08 06:32:35 -07:00
Vik Paruchuri
c9ddcd7868
Fix some pep8 violations
2013-08-08 08:34:40 -04:00
Vik Paruchuri
62c7255ac4
Use getlist
2013-08-08 08:34:40 -04:00
Vik Paruchuri
8b228dd64b
Fix bad key naming
2013-08-08 08:34:39 -04:00
Vik Paruchuri
018601777b
Simplify peer grading service calibration
2013-08-08 08:34:39 -04:00
Vik Paruchuri
dadb128bf8
Simplify save_grade and pass through answer_unknown
2013-08-08 08:34:39 -04:00
Vik Paruchuri
1be6ce3ee3
Add in and route control options
2013-08-08 08:34:08 -04:00
Sef Kloninger
fcb215a6df
Merge pull request #547 from edx/sef/peer-eval-xmodule-date-error-master
...
fix crash in peer eval xmodule
2013-08-07 20:51:37 -07:00
Chris Dodge
c1e037918c
add docstring on StaticContent utility method
2013-08-07 21:07:51 -04:00
Chris Dodge
bffec584f7
add docstring
2013-08-07 21:01:14 -04:00
marco
3667fe8bd0
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-07 16:35:32 -04:00
marco
56dee21142
partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss
2013-08-07 16:35:14 -04:00
Sarina Canelake
3a34529958
Need to call .save when modifying descriptor
2013-08-07 13:14:30 -04:00
Alexander Kryklia
495b5a366f
Fix videoalpha import from xml
...
VideoAlphaDescriptor inherits from EmptyDataRawDescriptor.
EmptyDataRawDescriptor is used for modules which might not have any
XML data, but require XmlDescriptor's functionality for
export/import. Without it, VideoAlphaModule would cause a crash on
export if any modules had an empty `self.data` field.
Don't use default video if HTML5 sources are given.
2013-08-07 18:00:59 +03:00
Adam
147f7ed959
Merge pull request #573 from edx/fix/adam/ORA-load-image
...
tz fix in openendedchild
2013-08-06 12:15:54 -07:00
Peter Fogg
ae517fee01
Merge pull request #455 from edx/peter-fogg/remove-videoalpha-xml
...
Peter fogg/remove videoalpha xml
2013-08-06 11:06:46 -07:00
chrisndodge
c4d6102af6
Merge pull request #584 from edx/fix/cdodge/allow-courseware-links-in-capa-module
...
tie in the normal courseware link url rewriting in capa module since tha...
2013-08-06 10:55:46 -07:00
Chris Dodge
6db1be6e00
add jasmine tests to verify link rewriting in HTML editor
2013-08-06 13:38:14 -04:00
Peter Fogg
9c84440501
PR comment cleanup.
2013-08-06 13:23:33 -04:00
Peter Fogg
08c5f955aa
Unstyled prototype for new list editor design.
2013-08-06 13:23:33 -04:00
Peter Fogg
f317244ac4
Convert Video Alpha to metadata-only.
2013-08-06 13:23:33 -04:00
Peter Fogg
74b815274f
Add a list view for metadata editor.
...
This is to be used with VideoAlpha's functionality allowing a choice
of multiple HTML5 video sources.
2013-08-06 13:23:33 -04:00
Adam Palay
402d50bbf1
tz fix in openendedchild
2013-08-06 11:17:39 -04:00
Chris Dodge
7a180c290b
handle cases where the 'base-asset-url' is undefined, e.g. in Jasmine tests
2013-08-06 11:16:37 -04:00
Alexander Kryklia
f3a4d49591
Adds RawDescriptro for VideoAlpha
2013-08-06 11:29:51 +03:00
Chris Dodge
dff3312178
refactor the coffeescript a bit more. Hopefully to resolve Jasmine failures
2013-08-05 21:50:55 -04:00
Chris Dodge
d2f911211e
fix cut/paste comment confusion
2013-08-05 16:15:04 -04:00
Chris Dodge
da9a4b5d4f
alter the HTML editor so that it can do the /static/ <--> /c4x/ substitutions when toggling back and forth between the visual and advanced editors
2013-08-05 16:15:03 -04:00
Chris Dodge
d329e3c833
don't attempt to do URL rewriting in the import step, let the LMS/CMS runtimes do it on the fly on reference
2013-08-05 16:15:03 -04:00
Chris Dodge
6200b2903f
have the Files and Upload pages surface a 'portable_url' which uses the /static/ shorthand which is more portable across course runs
2013-08-05 16:15:03 -04:00
Chris Dodge
9e96b9525b
tie in the normal courseware link url rewriting in capa module since that presents HTML via an Ajax callbacks and not via module_render.py
2013-08-05 15:24:19 -04:00
