Commit Graph

16194 Commits

Author SHA1 Message Date
Chris Dodge
9da0aa2e85 rename clone.py to a more descriptive clone_course.py 2013-08-02 22:30:31 -04:00
Chris Dodge
9f07507396 add same optimizations to the clone course command 2013-08-02 22:28:53 -04:00
Chris Dodge
f57b02c199 add a metadata cache and re-compute ignore when deleting a course to speed up the whole thing as well as squelching warnings in the console output 2013-08-02 22:19:59 -04: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
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
John Jarvis
3d87dd8c58 Merge pull request #551 from edx/jarv/remove-ADMINS
changing default ADMINS to an empty tuple
2013-08-01 14:02:26 -07:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants
Add error messaging to course team page
2013-08-01 11:58:52 -07:00
Adam
76cf2027e9 Merge pull request #424 from edx/fix/adam/dash-reset
convert user objects to unicode, improve error logging
2013-08-01 11:57:07 -07:00
Adam Palay
0076d6a64d fix error handling
distinguish logged error and instructor-facing error
2013-08-01 14:56:28 -04:00
Adam Palay
bbd52e05a2 converts user objects to unicode, improve error logging 2013-08-01 14:56:27 -04:00
David Baumgold
1b83cfc409 Merge pull request #546 from edx/db/dev-views
Create urls/views/templates for dev-only views
2013-08-01 11:47:39 -07:00
David Baumgold
d8a7901688 Add a lettuce test for removing own admin permission on course team 2013-08-01 14:44:38 -04:00
David Baumgold
741bbb3f92 pylint cleanup 2013-08-01 14:16:55 -04:00
Adam
244e731f5d Merge pull request #553 from edx/adam/i18n-bug-fixes
Adam/i18n bug fixes
2013-08-01 11:16:21 -07:00
Adam Palay
3be155bd88 fix tests, remove zh_CN from config until we have support 2013-08-01 14:13:41 -04:00
Adam Palay
ac1ac2d93d i18n template fixes
syntax fix
2013-08-01 14:13:41 -04: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
David Baumgold
53ae177178 Curly quotes around course name 2013-08-01 13:46:40 -04: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
David Baumgold
16e2ee8011 Abstract out the unknown error message and i18n 2013-08-01 13:43:40 -04:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model
Initialize on every page that has a context_course set
2013-08-01 13:39:47 -04: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
John Jarvis
b93e1985fb changing default ADMINS to an empty tuple
https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-ADMINS
https://docs.djangoproject.com/en/dev/howto/error-reporting/
2013-08-01 12:50:23 -04:00
David Baumgold
76948b52d9 Lettuce: confirm deletion prompts on course team page 2013-08-01 12:47:19 -04:00
Peter Fogg
cc6ca29bcc Merge pull request #550 from edx/peter-fogg/unit-reorder-notification
Show notification on component reorder.
2013-08-01 09:46:22 -07:00
David Baumgold
ec308e9771 Add lettuce test for transferring ownership of a course using the course team page 2013-08-01 12:11:49 -04:00
Peter Fogg
8bd686d63c Show notification on component reorder. 2013-08-01 11:56:16 -04:00
David Baumgold
607c06cba8 Stop using authz functions to change user groups
They contain too much incorrect permission checking
2013-08-01 11:24:42 -04:00
Will Daly
cadb81355e Merge pull request #548 from edx/will/fix-auto-auth-csrf-2
Ensure auto-auth feature flag actually disables CSRF
2013-08-01 08:20:32 -07:00
Peter Fogg
e501a176b1 Merge pull request #540 from edx/peter-fogg/overview-reorder-notification
Show notification on course outline reorder.
2013-08-01 07:17:59 -07:00
e0d
97013d610a Merge pull request #541 from edx/e0d/escalated-priv-migrations
adding migrate env for cms
2013-08-01 07:15:08 -07:00
Adam
933935a887 Merge pull request #433 from edx/tsinghuax/lms-i18n
Tsinghuax/lms i18n
2013-08-01 07:00:00 -07:00
Brian Talbot
a1f43fa6fd Studio: revises prompt messages for team roles UI 2013-08-01 09:58:32 -04:00
David Baumgold
21318d142d Add confirmation prompt when deleting a user from a course team 2013-08-01 09:58:32 -04:00
David Baumgold
2617b478c0 Add error messaging to course team page
Hitting "Add User" with no email address, or trying to add a user to the course
team multiple times
2013-08-01 09:58:32 -04:00