Commit Graph

20708 Commits

Author SHA1 Message Date
Matt Drayer
40f152ea01 Merge pull request #2374 from edx/hotfix/2014-01-30
Hotfix deployed to Edge Production and Production on 2014-01-31, merging PR to release branch.
2014-01-31 08:45:34 -08:00
Adam
4751322fba Merge pull request #2375 from edx/adam/lms2118-bulk-email-unicode-errors
Adam/lms2118 bulk email unicode errors
2014-01-30 11:09:10 -08:00
Adam Palay
5372bcff51 Detached pages from XML courses are set to appropriate descriptor class (LMS-2094)
Add tests
2014-01-30 13:52:07 -05:00
Usman Khalid
ee24e1062a Use unicode course titles for bulk email tests 2014-01-30 18:38:28 +05:00
Adam Palay
afccb17a3b support unicode course names for bulk email (LMS-2118) 2014-01-30 18:29:58 +05:00
Will Daly
b60487c85c Pin subunit and testtools libraries to prevent test failures after release of these libraries on 1/29/14 2014-01-29 11:01:14 -05:00
daniel cebrian
38798b91c4 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.

Updating Annotator CSS

The change in the css keeps fonts as they were and does not change them
purely based on annotating a section.

Fixed Annotation issue with static_url oversight
2014-01-29 08:52:44 -05:00
Matt Drayer
a410e50940 Merge pull request #2339 from edx/dhm/bug_perf_loc
Dhm/bug perf loc
2014-01-28 11:01:08 -08:00
David Ormsbee
6e6a1d5021 Only create loc_cache CACHE entry if it doesn't exist in ENV_TOKENS config. 2014-01-28 12:30:38 -05:00
Don Mitchell
38a6bf6824 Add set to mocked cache 2014-01-28 12:24:41 -05:00
Mark Hoeber
0f8d6f03f3 Merge pull request #2336 from edx/sylvia/documentation/DOC-corrections
Fix image link and Zooming Image text
2014-01-28 08:04:28 -08:00
David Ormsbee
ee5ee92b37 Create local memory caching entry for location mapping. 2014-01-28 10:57:15 -05:00
Don Mitchell
14be0b6c7a Cache course location translations 2014-01-28 10:34:31 -05:00
Usman Khalid
954cacf670 Merge pull request #2148 from edx/usman/ora197-error-on-xqueue-down
If unable to send submission/feedback to xqueue return an error instead of silently failing
2014-01-28 07:12:24 -08:00
Sylvia Pearce
8e21b6b1d1 Fix image link and Zooming Image text 2014-01-28 09:53:50 -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
a7d3a23f1b Merge pull request #2192 from edx/waheed/ora249-flash-of-text-on-staff-grading
Flash of text appears when instructor goes to staff grading fixed.
2014-01-28 04:11:12 -08: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
Valera Rozuvan
fa6c877047 Merge pull request #2316 from edx/valera/fix_firefox_youtube_start_time
Fix for BLD-708: Firefox YouTube video start time.
2014-01-28 03:22:50 -08:00
Waheed Ahmed
4f1fd229fe Flash of text appears when instructor goes to staff grading fixed.
ORA-249
2014-01-28 16:07:08 +05: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
Christina Roberts
0c7e203624 Merge pull request #2333 from lduarte1991/master
Updating Annotator CSS
2014-01-27 14:15:46 -08:00
lduarte1991
d214cb8778 Updating Annotator CSS
The change in the css keeps fonts as they were and does not change them
purely based on annotating a section.
2014-01-27 17:12:13 -05:00
marcotuts
d5e6c4f0ff Merge pull request #2323 from edx/studio/duplicate/public-visibility
Visual fix hides component action header when unit is in public mode as ...
2014-01-27 13:51:01 -08:00
davestgermain
e0a05012f3 Merge pull request #2329 from edx/dstgermain/devstack/settings
settings for i18n and debug toolbar on devstack (corrected)
2014-01-27 13:42:04 -08:00
Will Daly
9b9cf7fe81 Merge pull request #2327 from edx/will/disable-flakey-ora-tests
Disabled flakey open-ended tests
2014-01-27 13:39:55 -08:00
Giulio Gratta
a5a4347f34 Merge pull request #2310 from edx/giulio/forum-unflag-help
Added help text to tooltip for unflagging
2014-01-27 13:39:35 -08:00
Giulio Gratta
65c76cd6a7 Added help text to tooltips and sr flag spans 2014-01-27 13:27:24 -08:00
Calen Pennington
f234b7430d Merge pull request #2305 from cpennington/remove-obsolete-studio-code
Remove obselete cms startup code
2014-01-27 13:26:26 -08:00
Dave St.Germain
e738cc073d settings for i18n and debug toolbar on devstack 2014-01-27 16:14:18 -05:00
davestgermain
abae00dc03 Merge pull request #2328 from edx/dstgermain/devstack/settings
Enable debug toolbar on devstack
2014-01-27 12:54:24 -08:00
Dave St.Germain
cc31695764 settings for i18n and debug toolbar on devstack 2014-01-27 15:53:26 -05:00
David Baumgold
46c07ccc20 Merge pull request #2326 from edx/db/ignore-jscover-logs
ignore jscover logs
2014-01-27 12:33:33 -08:00
Adam
52d8faf0cb Merge pull request #2187 from edx/adam/i18n-not-graded-2
Internationalize "Not Graded" on front end (STUD-989)
2014-01-27 12:23:07 -08:00
Will Daly
0277cec600 Disabled flakey open-ended tests 2014-01-27 15:21:55 -05:00
David Baumgold
f69b26cd84 ignore jscover logs 2014-01-27 15:08:48 -05:00
Diana Huang
b67a3a8ab6 Merge pull request #2322 from edx/diana/linkedin-type
Fix a typo in the LinkedIn e-mail.
2014-01-27 12:01:32 -08:00
Mark Hoeber
340077d451 Merge pull request #2324 from edx/sylvia/documentation/BLD-544
Update "Problem Written in LaTeX" problem type to reflect changes in set...
2014-01-27 11:28:06 -08:00
Sylvia Pearce
7fdd552db5 Update "Problem Written in LaTeX" problem type to reflect changes in settings and UI 2014-01-27 14:22:59 -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
Adam Palay
e07c80e1e8 Internationalize "Not Graded" on front end (STUD-989)
change code-side "Not Graded" to "notgraded"
2014-01-27 14:16:34 -05:00
Diana Huang
373244b094 Fix a typo in the LinkedIn e-mail. 2014-01-27 14:06:27 -05:00
marco
9a33b3cf3f visual fix hides component action header when unit is in public mode as editing tools should not be acessible 2014-01-27 14:04:47 -05: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