Commit Graph

20682 Commits

Author SHA1 Message Date
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
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
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
Will Daly
bf6aa01421 Merge pull request #2319 from edx/will/enable-i18n-tests
Enable i18n tests in `rake test` command
2014-01-27 10:23:09 -08:00
Adam
dba1e4ddc8 Merge pull request #2300 from edx/adam/fix/stringresponse-no-type-specified
Adam/fix/stringresponse no type specified
2014-01-27 10:11:30 -08:00
Mark Hoeber
babd2e226f Merge pull request #2321 from edx/sylvia/documentation/BLD-618
Sylvia/documentation/bld 618
2014-01-27 10:06:56 -08:00
David Baumgold
05b8665842 Merge pull request #2318 from edx/db/brewfile
Create Brewfile
2014-01-27 09:10:23 -08:00
David Baumgold
62c1bbf5e6 Added comment indicating that running directly on OSX is unsupported 2014-01-27 12:05:25 -05:00
Sylvia Pearce
6f989ac1b1 Update .sjson information and add new Video component image 2014-01-27 12:00:23 -05: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
Sarina Canelake
614da8ee3b Enable i18n tests in rake test command
LMS-1963
2014-01-27 10:59:37 -05:00
David Baumgold
78963565b8 Moved brew-formulas.txt to Brewfile
http://robots.thoughtbot.com/brewfile-a-gemfile-but-for-homebrew
2014-01-27 10:51:31 -05:00
Anton Stupak
ac3cd92b32 Merge pull request #2315 from edx/anton/fix-imageresponse-offset-in-ff
Imageresponse: fix offset in FF.
2014-01-27 07:38:18 -08:00
Ned Batchelder
9d950436d6 Merge pull request #2303 from edx/ned/i18n-tool-fixes
Ned/i18n tool fixes
2014-01-27 07:22:36 -08:00
polesye
2cee94ea14 BLD-711: Fix offest in FF. 2014-01-27 16:22:12 +02:00
Alexander Kryklia
42933739af Merge pull request #2231 from edx/alex/numtolerance_range
Alex/numtolerance range
2014-01-27 04:59:03 -08: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
Anton Stupak
4b6de31cbb Merge pull request #2243 from edx/anton/video-i18n
Internationalize the video player.
2014-01-27 01:29:09 -08:00
polesye
b8eba4192c BLD-699: Fix i18n. 2014-01-27 07:49:22 +02:00
Will Daly
4b56fc2968 Merge pull request #2301 from edx/will/bok-choy-coverage
Collect coverage for bok-choy tests
2014-01-25 08:39:14 -08:00
Sarina Canelake
48a5c76066 Merge pull request #2295 from edx/sarina/i19-xmodules
i18n Sequence XModule
2014-01-24 17:15:08 -08:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08:00
Joe Blaylock
e263b33f17 Merge pull request #2227 from edx/jrbl/fix_cert_whitelist_report
Certs - bugfix cert_whitelist output
2014-01-24 15:11:37 -08:00
Joe Blaylock
6a2fbf7175 Merge pull request #2290 from edx/jrbl/mdx_stop_printing
Eliminate unused import and gratuitous prints
2014-01-24 14:24:24 -08:00
Will Daly
23a1947a62 Collect coverage for bok-choy tests 2014-01-24 16:58:24 -05:00
Calen Pennington
f6c2780cf1 Remove obselete cms startup code 2014-01-24 16:42:38 -05:00
Ned Batchelder
1e8a0cb7e0 Tighten up the extraction I/O
We were writing the main file twice.  No need.
2014-01-24 16:18:43 -05:00
Ned Batchelder
2abd647375 Always add Plural metadata to dummy translations.
When this was conditional, we'd have plural info in some files, not in
others. Then we'd merge them, and msgcat would add wacky markers to
indicate the difference, and the metadata wouldn't parse.
2014-01-24 16:17:46 -05:00