Commit Graph

5431 Commits

Author SHA1 Message Date
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Waheed Ahmed
d12e7e8877 Fixed allowing for execution of arbitrary Javascript in student response.
ORA-256
2014-01-30 16:17:48 +05:00
Anton Stupak
a077dc815c Merge pull request #2352 from edx/anton/fix-persist-speed-per-video
Video: Fix speed persistence per video.
2014-01-30 00:04:31 -08:00
jorr-at-google
87aa71c450 Merge pull request #2309 from edx/jorr/feature/use-xblock-publish-api
Use the publish() api from xblock.runtime.Runtime
2014-01-29 09:25:33 -08:00
Alexander Kryklia
4234daeb46 Merge pull request #2353 from edx/alex/no_error_on_empty_answer_to_master
Alex/no error on empty answer to master
2014-01-29 07:05:40 -08:00
polesye
642c239a01 Fix speed persistence per video. 2014-01-29 16:49:39 +02:00
Calen Pennington
8424f610d5 Merge pull request #2171 from cpennington/pylint-cleanup
Fix pylint violations from #2129
2014-01-29 06:38:17 -08:00
Alexander Kryklia
9876c993c5 Fix test for isnan student answer. 2014-01-29 16:07:26 +02:00
Alexander Kryklia
2653e9634a Should not raise exception on empty answer. 2014-01-29 16:07:19 +02:00
jorr
58c76afa9e Use the publish() api from xblock.runtime.Runtime 2014-01-28 14:16:34 -08:00
Don Mitchell
38a6bf6824 Add set to mocked cache 2014-01-28 12:24:41 -05:00
Don Mitchell
14be0b6c7a Cache course location translations 2014-01-28 10:34:31 -05:00
Usman Khalid
1efe74ec53 Refactored tests so that individual fields in the body arg are checked and not the whole serialized body.
ORA-197
2014-01-28 18:44:16 +05:00
Usman Khalid
989a1b6252 If unable to send submission to grader store it instead.
ORA-197
2014-01-28 17:57:16 +05:00
Usman Khalid
d2ede8339a For multistep openended problems after moving to a openendedmodule step keep trying to resend submission to grader until it succeeds.
ORA-197
2014-01-28 17:57:16 +05:00
Usman Khalid
b21d606494 If unable to send submission/feedback to xqueue return an error instead of silently failing.
ORA-197
2014-01-28 17:57:16 +05:00
Waheed Ahmed
d872527603 Merge pull request #2228 from edx/waheed/ora201-large-posts-to-ora-like-peer-grading-feedback
Really large posts to ORA like peer grading feedback fixed.
2014-01-28 03:27:44 -08:00
Waheed Ahmed
800bb96f43 Merge pull request #2059 from edx/waheed/ora202-self-assessment-deadlines-not-apply-on-rubrics
Fixed self assessment deadlines don't apply to the submission of the rubric
2014-01-28 03:25:21 -08:00
Waheed Ahmed
d5cadf0008 Really large posts to ORA like peer grading feedback fixed.
ORA-201
2014-01-28 15:50:16 +05:00
Waheed Ahmed
8e36dfedb9 Fixed self assessment deadlines don't apply to the submission of the rubric.
ORA-202
2014-01-28 15:48:21 +05:00
Valera Rozuvan
d33c4fc81f Fix for BLD-708: Firefox YouTube video start time.
In Firefox YouTube video with start time plays from 00:00:00.
The reason was that seekTo() could not start playing a video from
a point that hasn't been buffered yet. Why this started happening
just now, really is hard to explain.

BLD-708.
2014-01-28 12:24:03 +02:00
Will Daly
0277cec600 Disabled flakey open-ended tests 2014-01-27 15:21:55 -05:00
Christina Roberts
cd7f1d92a1 Merge pull request #2299 from lduarte1991/master
Text and Video Annotation Modules - First Iteration
2014-01-27 11:18:32 -08:00
daniel cebrian
7e2652b5a8 annotation tools
First set of fixes from the pull request

This does not include some of the testing files. The textannotation and
videoannotation test files are not ready. waiting for an answer on the
issue.

Deleted token line in api.py and added test for token generator

Added notes_spec.coffee

remove spec file

fixed minor error with the test

fixes some quality errors

fixed unit test

fixed unit test

added advanced module

Added notes_spec.coffee

remove spec file

Quality and  Testing Coverage

1. in test_textannotation.py I already check for line 75 as it states
in the diff in line 43, same with test_videoanntotation
2. Like you said, exceptions cannot be checked for
firebase_token_generator.py. The version of python that is active on
the edx server is 2.7 or higher, but the code is there for correctness.
Error checking works the same way.
3. I added a test for student/views/.py within tests and deleted the
unused secret assignment.
4. test_token_generator.py is now its own file

Added Secret Token data input

fixed token generator

Annotation Tools in Place

The purpose of this pull request is to install two major modules: (1) a
module to annotate text and (2) a module to annotate video. In either
case an instructor can declare them in advanced settings under
advanced_modules and input content (HTML in text, mp4 or YouTube videos
for video). Students will be able to highlight portions and add their
comments as well as reply to each other. There needs to be a storage
server set up per course as well as a secret token to talk with said
storage.

Changes:
1. Added test to check for the creation of a token in tests.py (along
with the rest of the tests for student/view.py)
2. Removed items in cms pertaining to annotation as this will only be
possible in the lms
3. Added more comments to firebase_token_generator.py, the test files,
students/views.py
4. Added some internationalization stuff to textannotation.html and
videoannotation.html. I need some help with doing it in javascript, but
the html is covered.

incorporated lib for traslate

fixed quality errors

fixed my notes with catch token

Text and Video Annotation Modules - First Iteration

The following code-change is the first iteration of the modules for
text and video annotation.

Installing Modules:
1. Under “Advanced Settings”, add “textannotation” and
“videoannotation” to the list of advanced_modules.
2. Add link to an external storage for annotations under
“annotation_storage_url”
3. Add the secret token for talking with said storage under
“annotation_token_secret”

Using Modules
1. When creating  new unit, you can find Text and Video annotation
modules under “Advanced” component
2. Make sure you have either Text or Video in one unit, but not both.
3. Annotations are only allowed on Live/Public version and not Studio.

Added missing templates and fixed more of the quality errors

Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor

Added a space after # in comments

Fixed issue with an empty Module and token links

Added licenses and fixed vis naming scheme and location.
2014-01-27 13:47:58 -05:00
Giulio Gratta
78c85ea3b2 Merge pull request #2308 from edx/giulio/fix-error-msg-typo
Fixed all instances of "occured" typo
2014-01-27 10:46:13 -08:00
Adam Palay
c305fc386c fix regression for stringresponse problems with unspecified case sensitivity (BLD-710)
write failing tests
2014-01-27 11:40:38 -05:00
polesye
2cee94ea14 BLD-711: Fix offest in FF. 2014-01-27 16:22:12 +02:00
Alexander Kryklia
688d47fb62 Give numerical response tolerance as a range (for example [5,7)) (BLD-25) 2014-01-27 14:58:19 +02:00
polesye
b8eba4192c BLD-699: Fix i18n. 2014-01-27 07:49:22 +02:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08:00
Sarina Canelake
b8b1f6a576 i18n Sequence XModule
LMS-1758
2014-01-24 11:06:57 -05:00
Sarina Canelake
623c985d38 Merge pull request #2286 from edx/sarina/i19-xmodules
i18n xmodule/course_module.py
2014-01-24 03:31:47 -08:00
Anton Stupak
dfc474178e Merge pull request #2230 from edx/anton/store-video-state
Persist speed preferences between videos.
2014-01-23 23:26:54 -08:00
David Baumgold
5d06c8bcd3 Merge pull request #2279 from edx/db/remove-pil-comment
Remove comment for how to install PIL
2014-01-23 12:06:59 -08:00
Sarina Canelake
f88c108527 i18n xmodule/course_module.py
LMS-1747
2014-01-23 15:05:05 -05:00
polesye
1d74838698 BLD-237: Persist speed preferences between videos. 2014-01-23 20:54:40 +02:00
Anton Stupak
5bacfcc32b Merge pull request #2045 from edx/anton/video-merge-fields
Merge "video sources" and "download video" into the same field
2014-01-23 09:31:11 -08:00
David Baumgold
0b0ea51521 Remove comment for how to install PIL
We use Pillow now, which can be installed via PyPI
2014-01-23 11:23:12 -05:00
Valera Rozuvan
f44489ea57 Merge pull request #2272 from edx/valera/make_video_debug_messages_consistent
Make video debug messages consistent.
2014-01-23 07:53:29 -08:00
Ned Batchelder
9069e413fe Merge pull request #2247 from jazkarta/pluggable-problem-types
Make problem types pluggable.
2014-01-23 07:10:48 -08:00
Valera Rozuvan
7a12d3b2fb Merge pull request #2273 from edx/valera/fix_video_progress_slider_method
Fix video progress slider method.
2014-01-23 05:36:33 -08:00
Valera Rozuvan
f0c3916b97 Fix video code duplication.
rangeParams returned from getRangeParams() function is already
an object that contains the left and width properties. It can
be passed directly to the jQuery css() function.
2014-01-23 12:11:50 +02:00
Valera Rozuvan
a673cbd9c6 Fix video progress slider method.
In each Video JavaScript module, methods are either private,
or public. When a method is public, it is made available via
the state variable. It seems that a while ago one method
was made public, but throughout the code it is used as a private
method. This has been corrected.
2014-01-23 12:06:43 +02:00
Valera Rozuvan
0dcd283e6e Make video debug messages consistent.
In the JavaScript console all messages from the Video
player should begin with "[Video info]: ". This way it
is easier to see which console.log() messages are from
the Video player, and which console.log() messages are
temporary, and should be removed before a merge/commit.
2014-01-23 11:56:19 +02:00
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02:00
Chris Rossi
32a5fc0e54 Make problem types pluggable.
This patch adds the ability for arbitrary packages to register
themselves with xmodule.x_module.ResourceTemplates as being providers of
boiler plate templates used for defining the types of problems
instructors can add to a course.  This allows third party add-ons to
define new problem types that can then be available to instructors to
use.

This patch is the result of discussion with Ned Batchelder on the right
way to approach this problem.  The solution provided here is,
admittedly, a little bit of a hack.  But the focus was on making a least
invasive fix to make something work, in anticipation that when problems
get moved into the newere XBlock architecture something a little nicer
will be in place.
2014-01-22 21:33:24 -05:00
Don Mitchell
98eecf1369 Merge pull request #2244 from edx/dhm/role_package_id
Create mapping for previously unmapped locations in order to get
2014-01-22 14:01:42 -08:00
Anton Stupak
2ef095d9b5 Merge pull request #2149 from edx/anton/video-download-transcript
Allows students to download the transcript of the video without timecodes
2014-01-22 12:03:41 -08:00
Don Mitchell
9d6ed66e24 Add loc mapper fn from locn to CourseLocator 2014-01-22 11:49:03 -05:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00