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
Carlos Andrés Rocha
264e3b246b
Change console logging stream from stdout to stderr
2013-08-08 17:39:23 -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
JonahStanley
4d6984e3e2
Fixed some of the ui-helpers and made the course-team test faster
2013-08-08 13:24:27 -04:00
JonahStanley
46d0e5ed05
Fixed display-name bug and added in a function to trigger events on firefox as well as check if it is firefox
2013-08-08 13:24:26 -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
Jay Zoldak
006b90af9f
Modify cms acceptance tests to use auto_auth workflow.
2013-08-08 12:08:25 -04:00
Jay Zoldak
8414ef022f
Modify lms acceptance test to use auto_auth.
2013-08-08 12:08:25 -04:00
Jay Zoldak
e78edf8ef9
Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also.
2013-08-08 12:08:25 -04:00
Jay Zoldak
385e9de1fd
Modify auto_auth to accept parameters for overriding created user attributes.
2013-08-08 12:08:24 -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
Miles Steele
090f8d812f
add migration to remove index
2013-08-08 10:39:51 -04:00
Miles Steele
aaceb288a7
fix mysql indexing validity in migrations
2013-08-08 10:39:51 -04: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
David Baumgold
82ac56068e
Assign isExternal JS function to window object
...
When JS functions are defined with names, they are local variables, and inaccessible
if defined inside a closure. Django-Pipeline concatenates all of our JS into one
big closure. This function explicitly assings the function to a property of the
`window` object, so that it is accessible to other JS functions.
2013-08-06 16:39:04 -04:00
Christina Roberts
4c95078eb0
Merge pull request #578 from edx/christina/autoenroll
...
Auto-enroll course staff to fix "View Live".
2013-08-06 12:33:56 -07: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
