cc7c025478
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
marco
2013-08-02 00:57:50 -04:00
0e8c29989c
style cleanup for open ended assessments, cleaning up workflow header, style definitions for rubrics are commented out momentarily, and an open issue for unicode rendering on the show and hide prompt area still remains
marco
2013-08-02 00:57:31 -04:00
741bbb3f92
pylint cleanup
David Baumgold
2013-08-01 13:55:05 -04:00
244e731f5d
Merge pull request #553 from edx/adam/i18n-bug-fixes
Adam
2013-08-01 11:16:21 -07:00
3be155bd88
fix tests, remove zh_CN from config until we have support
Adam Palay
2013-08-01 13:42:39 -04:00
ac1ac2d93d
i18n template fixes
Adam Palay
2013-08-01 13:23:37 -04:00
6ba5d472b3
Fix with sequence switching and more.
Anton Stupak
2013-07-31 15:22:55 +03:00
65aa7d4f2e
Fixes bug with Fullscreen mode and more.
Anton Stupak
2013-07-30 16:47:53 +03:00
bf237b3762
Change naming of private functions and more.
Anton Stupak
2013-07-29 19:52:08 +03:00
a77c386f76
Removes empty bindHandlers function from video_progress_slider
jmclaus
2013-07-26 18:11:31 +02:00
aefb1aa9c8
Hides Error notification when subtitle file is missing
Anton Stupak
2013-07-25 15:00:50 +03:00
7d215e12b7
Fixes InvalidStateError failures in FF and more.
Anton Stupak
2013-07-23 15:33:18 +03:00
53ae177178
Curly quotes around course name
David Baumgold
2013-08-01 13:46:40 -04:00
af0149e52a
Fixes of different issues
jmclaus
2013-07-22 14:18:39 -04:00
47dac695fa
Reduces the number of calls to initialize() in video_caption_spec.
jmclaus
2013-07-18 18:06:47 -04:00
16e2ee8011
Abstract out the unknown error message and i18n
David Baumgold
2013-08-01 13:43:40 -04:00
1eae675952
Create a dedicated CMS.Models.Course Backbone model
David Baumgold
2013-08-01 13:39:45 -04:00
d2194b2211
Notifications for course updates.
Peter Fogg
2013-08-01 13:21:59 -04:00
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.
Valera Rozuvan
2013-07-17 13:27:37 +03:00
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.
jmclaus
2013-07-12 16:52:50 -04:00
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.
Valera Rozuvan
2013-07-05 15:26:53 +03:00
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
Valera Rozuvan
2013-05-16 14:47:45 +03:00
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.
Vasyl Nakvasiuk
2013-04-18 17:11:08 +03:00
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.
Valera Rozuvan
2013-04-01 09:33:41 +03:00
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.
Valera Rozuvan
2013-03-13 17:21:27 +02:00
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
Valera Rozuvan
2013-02-19 15:23:07 +02:00
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.
Valera Rozuvan
2013-02-15 17:42:53 +02:00
e8d07d5377
Carried over old work on video alpha 2 to new branch on top of merged video alpha.
Valera Rozuvan
2013-02-15 10:12:15 +02:00
b93e1985fb
changing default ADMINS to an empty tuple
John Jarvis
2013-08-01 12:50:23 -04:00
76948b52d9
Lettuce: confirm deletion prompts on course team page
David Baumgold
2013-08-01 12:47:19 -04:00
cc6ca29bcc
Merge pull request #550 from edx/peter-fogg/unit-reorder-notification
Peter Fogg
2013-08-01 09:46:22 -07:00
77e57448b3
cleaned up sass document format and added baseline variable throughout capa and combined open ended problems. no style rule changes, simply whitespace, ordering of properties, and the addition of baseline over direct pixels for padding and margins.
marco
2013-08-01 12:42:11 -04:00
ec308e9771
Add lettuce test for transferring ownership of a course using the course team page
David Baumgold
2013-08-01 12:11:49 -04:00
8bd686d63c
Show notification on component reorder.
Peter Fogg
2013-08-01 11:56:16 -04:00
933935a887
Merge pull request #433 from edx/tsinghuax/lms-i18n
Adam
2013-08-01 07:00:00 -07:00
a1f43fa6fd
Studio: revises prompt messages for team roles UI
Brian Talbot
2013-07-31 15:28:10 -04:00
21318d142d
Add confirmation prompt when deleting a user from a course team
David Baumgold
2013-07-31 15:07:54 -04:00
2617b478c0
Add error messaging to course team page
David Baumgold
2013-07-31 13:36:50 -04:00
b78f6f7a3d
Added pylint exceptions to load test settings.
Will Daly
2013-08-01 09:42:31 -04:00
4a77693f4a
Show notification on course outline reorder.
Peter Fogg
2013-07-31 13:39:51 -04:00
9e5d64b8df
Removed check for AUTOMATIC_AUTH_FOR_LOAD_TESTING because it's already implied that you're using load testing settings.
Will Daly
2013-08-01 09:29:58 -04:00
ab1461542d
Moved CSRF override into its own settings file
Will Daly
2013-08-01 09:23:39 -04:00
ef75f9bb2c
adding migrate env for cms
e0d
2013-07-31 14:32:34 -04:00
39030c6683
Remove CSRF middleware/processor in aws and dev settings, not common. This ensures that we load the MITX_FEATURES token BEFORE deciding to disable CSRF.
Will Daly
2013-07-31 16:40:54 -04:00
69ffb6a87b
replace edx with variable substitution
Adam Palay
2013-07-23 18:00:28 -04:00
e8ee29786f
Remove news carousel and other unused pages
Calen Pennington
2013-07-19 12:04:12 -04:00
0d3c44996a
LMS i18n from Tsinghua
Calen Pennington
2013-07-18 09:43:22 -04:00
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.)
Brian Wilson
2013-07-23 18:13:43 -04:00
Miles Steele