Commit Graph

5445 Commits

Author SHA1 Message Date
Jay Zoldak
9cfd649c08 Merge pull request #2137 from abdoosh00/feature/unicode
Unicode changes to support R to L script
2014-01-31 06:48:01 -08:00
Usman Khalid
ef07e1ed15 For capa if weight is 0 don't try to create Progress objects.
LMS-1494
2014-01-31 14:30:51 +05:00
davestgermain
5122c292c7 Merge pull request #2343 from edx/dstgermain/a11y-page-titles
Added more descriptive page titles.
2014-01-30 14:33:48 -08:00
Dave St.Germain
636eab8b9e Added more descriptive page titles. 2014-01-30 17:32:03 -05:00
Jay Zoldak
bc30addfb9 Unicode changes to support QRF
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
2014-01-30 16:20:36 -05:00
Christina Roberts
088a713788 Merge pull request #2330 from edx/christina/export-commands
Export conversion script
2014-01-30 06:59:22 -08:00
David Baumgold
08fb49506a Merge pull request #2302 from edx/db/django-command-migrate-to-split
Django command for migrating courses to split-mongo (and deleting)
2014-01-30 06:51:27 -08:00
cahrens
2ee964345f Convert between export formats.
STUD-1196
2014-01-30 09:22:43 -05:00
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
David Baumgold
dd627edae4 add logging for auditing when split-mongo courses are deleted 2014-01-29 16:57:23 -05:00
David Baumgold
e18507f188 fix pep8/pylint issues 2014-01-29 15:11:04 -05:00
David Baumgold
692502c0fb Don't cache falsy values 2014-01-29 15:11:04 -05:00
David Baumgold
096088cc75 fix test failures: clear loc_mapper cache 2014-01-29 15:11:03 -05:00
David Baumgold
de96a47eac happy path unit test 2014-01-29 15:11:03 -05:00
David Baumgold
9e8be1bbc3 make SplitMigrator take a User object, rather than a user ID 2014-01-29 15:11:02 -05: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