Commit Graph

5605 Commits

Author SHA1 Message Date
Alexander Kryklia
16cee198b1 Merge pull request #386 from edx/alex/editor-tabs-for-videoalpha
adds TabsEditingDescriptor, pluggen in VideoAlphaDescriptor
2013-08-05 08:57:53 -07:00
Valera Rozuvan
a0aa652df4 Fixed typo of function call. Added comment why it is necessary. 2013-08-05 15:00:18 +03:00
Alexander Kryklia
6225c2a532 Fixes 2013-08-05 13:38:32 +03:00
Alexander Kryklia
da4f295d00 Add TabsEditingDescriptor for VideoAlpha
Updates comment
Make Model descriptor class property.
Fix tests
2013-08-05 13:38:32 +03:00
chrisndodge
85267e6a73 Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum
add display_coursenumber and display_organization fields on the CourseModule
2013-08-04 18:00:29 -07:00
Chris Dodge
192d51bf7a touch-ups per review feedback 2013-08-02 21:37:27 -04:00
Diana Huang
4005b3bd79 Merge pull request #554 from edx/diana/django-ratelimit
Limit the rate of logins
2013-08-02 11:02:04 -07:00
Miles Steele
3d44c83fa7 Merge pull request #322 from edx/feature/msteele/instrdash
Instructor Dashboard v2 (disabled)
2013-08-02 10:03:06 -07:00
Adam
eb9f03479a Merge pull request #558 from edx/fix/adam/mrev-rounding
change int to float for student progress display
2013-08-02 09:00:23 -07:00
Adam Palay
1a463962b9 change int to float for student progress display 2013-08-02 11:34:12 -04:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
Chris Dodge
ebbeeb16a2 add some unit tests for the new fields 2013-08-02 09:56:19 -04:00
Miles Steele
5d4a5fcdb0 add slickgrid assets 2013-08-02 09:52:12 -04:00
Chris Dodge
3a2bb7ba01 add escaping 2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
Christina Roberts
23efbf74fd Merge pull request #557 from edx/christina/html-latex
Fix missing source_code in LaTeX  HTML.
2013-08-02 06:11:36 -07:00
polesye
042b7d5f60 Merge pull request #428 from edx/valera/video_alpha2_refactor
Valera/video alpha2 refactor
2013-08-02 01:04:13 -07:00
cahrens
d63813b4aa Fix missing source_code in LaTeX HTML.
STUD-565
2013-08-01 17:27:34 -04:00
brianhw
a628b62d1e Merge pull request #511 from edx/feature/brian/audit-log
Use audit logger for logging of logins in external_auth...
2013-08-01 14:08:08 -07:00
Anton Stupak
6ba5d472b3 Fix with sequence switching and more.
Studio: adds in new Sass file for Studio-specific
xmodule presentation and removes full screen control
from video alpha display UI.
Adds jasmine test for subtitles scroll.
Adds tests for caption change height functionality.
Uses gettext wrapper.
Fixes caption change height functionality.
Removes IS_CMS, isCms flags.
2013-08-01 20:50:32 +03:00
Anton Stupak
65aa7d4f2e Fixes bug with Fullscreen mode and more.
Fixes subtitles hiding on slidermove and their height.
2013-08-01 20:50:16 +03:00
Anton Stupak
bf237b3762 Change naming of private functions and more.
Disables tests.
Refactors creation of video element.
Renames renderElements to initialize.
Fixes bug on slider move, subtitles are hidden.
2013-08-01 20:49:49 +03:00
jmclaus
a77c386f76 Removes empty bindHandlers function from video_progress_slider
Refactors trigger function.
Fixes Ui bugs: captions.
Fixes bug with Youtube on page load.
Hotfixes html5 video streaming bug.
Adds test video files to the project.
2013-08-01 20:49:08 +03:00
Anton Stupak
aefb1aa9c8 Hides Error notification when subtitle file is missing
Refactors bind and indexOf.
Adds error message when specify the wrong selector.
Adds some of the requested documentation.
Refactors 01_initialize.js.
Fixes to 03_video_player.js
2013-08-01 20:48:24 +03:00
Anton Stupak
7d215e12b7 Fixes InvalidStateError failures in FF and more.
Fixes HD button
Disables Fullscreen mode in the Studio
Fixes ui controls bug
2013-08-01 20:47:55 +03:00
jmclaus
af0149e52a Fixes of different issues
Video_player_spec wouldn't run because of a syntax error.
All test would fail when error() was called
on an undefined JQuery object.
Tidy up spy on onTouchBaseDevice.
Fix dependecies between RequireJs modules
2013-08-01 20:46:33 +03:00
jmclaus
47dac695fa Reduces the number of calls to initialize() in video_caption_spec.
All the tests run and pass when enabled.
Only video_player has issues left
Adds error logging to console if captions not found
Fix problems with memory leaks
2013-08-01 20:45:31 +03:00
Valera Rozuvan
4778c535ac Restructuring Video Alpha Jasmine tests.
Fixing more tests.
Turned on all Video Alpha tests.
More tests fixing.
Turned on all tests.
Fixing more tests.
Worked on tests at the beginning of video_player_spec.js. Not finished
All Video Alpha tests completed and can be run individually. When run individually - they all pass.
Added jasmine_test_runner.html to gitignore.
2013-08-01 20:08:45 +03:00
jmclaus
8c3f4388d6 video_speed_control passes all tests except 1
Mocked loading of captions.
Fixed remaining tests in captions.
Fixed failing tests in speed control, and quality control. Turned off all VideoAlpha tests because browser crashes when all are run at once. To check that they are passing, go through each file one by one, replacing xdescribe with describe. Dont forget to change back to xdescribe when the test was run and turns out to be OK.
Some tests at the end of video_player_spec.js pass
Further fixing tests in video_player_spec file.
transfers changes to test_logic from master to __init__ and other files
Fixing more tests.
2013-08-01 20:08:45 +03:00
Valera Rozuvan
c49ad095d5 Broken initialize.js. First try at making all submodules functions public (available via state object).
More work on making modules completely visible via state object.
All tests pass in video_volume_control_spec.js
Cleanup of initial CoffeeScript generated video_speed_control_spec.js
Some cleaning up in volume_control. Most tests pass in speed_control
Cleanup of CoffeeScript generated video_progress_slider_spec.js
Most tests in video_progress_slider_spec.js pass (except for those having an issue with subtitles). progressSlider functions again in Chrome
Cleanup of CoffeeScript generated video_control_spec.js
All tests pass in video_control_spec.js
Cleanup of CoffeeScript generated video_caption_spec.js
Some progress in video_caption_spec.js
Fix bug with video progress slider. Now browser doesnt freeze any more. ^_^
Some cleaning up.
2013-08-01 20:08:45 +03:00
Valera Rozuvan
52fa6591c2 Corrected all isues found during refactoring #2.
Added missing file.~
Undid a mistake.
Copied Python tests from video_alpha1.
moves TestLogic to __init__.py
reorginizes xmodule logic tests
adds docstrings for poll tests
adds docstring for word cloud and conditional tests
adds docstrings for video alpha tests
adds videoalphafactory for tests, not finished
adds imports
Bug fixing.
fix video/videoalpha tests
Updated lettuce test. Now it is aware of the fact that Video and Video Alpha players have different base CSS classes.
Removed REFACTOR comments.
Turn off autoplay for Video Alpha in Studio.
Carry over fix for bug where in Firefox changing to speed 1.0 has no effect.
Carry over JavaScript Jasmine tests from jmclaus/videoalpha2_js branch.
Exporting state object from main function of Video Alpha.
More stuff from jmclaus/videoalpha2_js branch.
Specs in html5_video.js all pass except ten of them. Cleaned code a bit and moved it out of display_spec.js
One more spec passes
Fixed remaning tests in spec/../html5_video.js test suite. Removed test video files.
Added JavaScript Jasmine tests for main of Video Alpha 2.
adds test for volume control and updates helper file for videoalpha
2013-08-01 20:08:45 +03:00
Vasyl Nakvasiuk
7c59947ac0 refactoring JS -> HTML
second part of refactoring: JS -> Python HTML
Updated JS code to reflect the change that some HTML generation was moved to python side.
Fixed fullscreen bug - now controls are shown properly below the video. Made the transparency a bit more faded for captions in normal mode.
Fixed bug with captions. Now the attribute show_captions correctly removes them when set to true.
Work in progress.
2013-08-01 20:08:45 +03:00
Valera Rozuvan
0e24ff14f3 Added fade in/fade out for controls in HTML5 videos.
Making video in the center and not stretched when captions are shown.
Added auto hide/show for captions.
Removed old styling and debug info.
Added missing initalizations for captions auto show/hide.
Fixing bugs. Adding black backgorund to video for when it has not yet loaded. Making sure that the captions are not shown when in YouTube mode.
Added back missing styles for captions when in YouTube mode.
Code review 1 comments
Minor refactoring.
Documenting. Part 1.
2013-08-01 20:08:44 +03:00
Valera Rozuvan
9d2eec07b9 Refactoring of events system.
Minor fix.
Minor fix. Now state of captions is properly set from cookies.
Fix for hiding-showing subs based on cookie when subs are not found.
Partial feature - hide show controls on mouse.
Removed debugging messages. Changed trigger() method - now it has a better interface.
Better function rewrite. Now .trigger() is more readable and understandable.
In between.
2013-08-01 20:08:44 +03:00
Valera Rozuvan
74ad637e27 Basic functionality implemented. Core video module can handle HTML5 sources and YoTube video IDs. Play-pause control works.
Added quality change control. Added qtip usage. Removed unnecessary coffee files.
Slight changes.
Added position slider. Enabled several events related to time progress. Work in progress.
Added volume, and speed controls.
Added captions.
Added full support for captions.
Added correct resize functionality to captions.
Petite work in progress.
add autoplay attr for videoalpha tag
2013-08-01 20:08:43 +03:00
Valera Rozuvan
009b8475dc Tracing bug in Firefox whereby the HTML5 native video freezes. Turns out that setting currentTime property tiggers a canplay event. And this becomes cyclic because the callback for canplay event updates the currentTime property.
Video alpha 2. Work in progress.
2013-08-01 20:08:43 +03:00
Valera Rozuvan
e8d07d5377 Carried over old work on video alpha 2 to new branch on top of merged video alpha. 2013-08-01 20:08:42 +03:00
Calen Pennington
e8ee29786f Remove news carousel and other unused pages
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
2013-07-31 19:39:15 -04:00
Don Mitchell
b80aad2308 Merge pull request #528 from edx/dhm/rename_revision
Rename CourseLocator.revision to branch
2013-07-31 13:18:17 -07:00
Brian Wilson
635d36fcf9 Add audit log definition, and use for logging of logins in external_auth and student apps. Move test_login to student app. Improve conditional tests for Shibboleth login logic. (Does not include reconfiguring log settings.) 2013-07-31 13:32:21 -04:00
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -04:00
Calen Pennington
e43dbd29c4 Merge pull request #487 from edx/cale/lms-xblock-student-view
Cale/lms xblock student view
2013-07-31 09:04:38 -07:00
Don Mitchell
68e1bcf42e Remove edu from doc string examples & typos 2013-07-31 11:24:51 -04:00
Peter Fogg
25955a79c4 Merge pull request #492 from edx/peter-fogg/fix-stud-146
Fix word cloud modules not exporting correctly.
2013-07-31 08:19:32 -07:00
Ned Batchelder
15859dd880 Merge pull request #522 from edx/ned/quiet-mongoimport-noise-during-tests
Quiet mongoimport noise during tests
2013-07-31 07:25:57 -07:00
Ned Batchelder
4cb8f58b27 Quiet mongoimport noise during tests 2013-07-31 10:25:09 -04:00
Vasyl Nakvasiuk
1233d73e01 Merge pull request #497 from edx/alex/graphical_slider_tool_for_studio
"Graphical Slider Tool" integration into studio
2013-07-31 06:36:49 -07:00
Don Mitchell
f2977704fe Remove unused tests
which a previous refactoring had replaced. Coverage of locator.py is
100%
2013-07-31 09:35:21 -04:00
Calen Pennington
99f9894f1c Switch LMS over to using XBlock rendering commands
This makes the LMS use an XBlock's student_view, rather than an
XModule's get_html to render for display. However, it does not yet use
wrap_child to handle instructor debug information or url rewriting.

[LMS-219]
2013-07-31 09:22:10 -04:00
Vasyl Nakvasiuk
61327bc599 fix python code styles 2013-07-31 10:43:06 +03:00