Commit Graph

2941 Commits

Author SHA1 Message Date
Vik Paruchuri
932bbd2592 Fix text issue 2013-08-02 13:23:03 -04:00
Vik Paruchuri
a939c152c8 Add in support for multiple rubrics 2013-08-02 12:56:31 -04:00
Adam Palay
d4a526906e template errors 2013-08-02 12:54:46 -04:00
Vik Paruchuri
e2c4b5016a Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui 2013-08-02 12:13:02 -04:00
Vik Paruchuri
30e506777e Render multiple rubrics, collapse rubrics 2013-08-02 12:12:38 -04:00
Chris Dodge
c20ca2bf5e fix more rebase conflicts 2013-08-02 11:25:05 -04:00
Chris Dodge
f041ab1ccc fix rebase conflicts 2013-08-02 11:22:25 -04:00
Chris Dodge
0937cdcbe6 one more escaping 2013-08-02 09:56:19 -04:00
Miles Steele
f7989cb2ab move to instructor template directory 2013-08-02 09:53:21 -04:00
Miles Steele
f88b266c2b add member list widget, add segment.io call for section view 2013-08-02 09:53:21 -04:00
Miles Steele
8e923deca0 fix unicode comparisons, fix 404 access exception, fix initial link handling, fix forum access modification permissions 2013-08-02 09:53:20 -04:00
Miles Steele
7392a888ce cleanup, fix permissions, rename functions, add more api tests 2013-08-02 09:53:20 -04:00
Miles Steele
1e8cb7df25 clean & comment coffeescript, add util.coffee 2013-08-02 09:53:20 -04:00
Miles Steele
e05d0f97d8 fix permissions, fix ENABLE_INSTRUCTOR_BACKGROUND_TASKS usage, fix csv download 2013-08-02 09:53:19 -04:00
Miles Steele
63d07b7e47 rename enrolled_students_profiles -> enrolled_students_features 2013-08-02 09:52:17 -04:00
Miles Steele
96fb19d28e add hover hint for auto-enroll 2013-08-02 09:52:16 -04:00
Miles Steele
5704b42407 add danger buttons 2013-08-02 09:52:16 -04:00
Miles Steele
fd1cfab020 add course info toggle arrow 2013-08-02 09:52:16 -04:00
Miles Steele
a727959d18 add feature switch for beta dashboard 2013-08-02 09:52:15 -04:00
Miles Steele
23c961d9e4 visual cleanup, page error presentation cleanup, factor out common exceptions 2013-08-02 09:52:14 -04:00
Miles Steele
dd43d6635f add instructor tasks 2013-08-02 09:52:14 -04:00
Miles Steele
9bdff7485a cleanup
- rename list copy
- add beta list
- fix forum and admin API's to be more similar
- add auto-enroll checkbox
- fix list reload
- remove extra js logging
- add course errors visibility toggle
- add underscore.js check
2013-08-02 09:52:13 -04:00
Miles Steele
0a657befdb add forum list management 2013-08-02 09:52:13 -04:00
Miles Steele
bc9cce5733 add instructor dash version switch 2013-08-02 09:52:13 -04:00
Miles Steele
5cdf3fb86a add staff management subsection, add student_admin subsection, refactor sections 2013-08-02 09:52:12 -04:00
Miles Steele
cc737cb1b2 rename enrollment section to membership 2013-08-02 09:52:12 -04:00
Miles Steele
02432e05cc integrate slickgrid, add instructor.enrollment, add instructor.access, refactor & clean 2013-08-02 09:52:12 -04:00
Miles Steele
6ff568ce9d remove pid and version 2013-08-02 09:52:12 -04:00
Miles Steele
daeabb06bf add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints) 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
polesye
042b7d5f60 Merge pull request #428 from edx/valera/video_alpha2_refactor
Valera/video alpha2 refactor
2013-08-02 01:04:13 -07:00
marco
cc7c025478 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui 2013-08-02 00:57:50 -04:00
marco
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 2013-08-02 00:57:31 -04:00
Vik Paruchuri
178be44333 Remove legend, start to edit rubric 2013-08-01 16:25:21 -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
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
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
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
Adam Palay
69ffb6a87b replace edx with variable substitution
fixes template errors

keep tos untranslated

formatting fixes
2013-07-31 19:39:15 -04: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
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Carlos Andrés Rocha
5b30c06b75 Merge pull request #480 from edx/rocha/show-dates-in-instructor-analytics
Show dates when the data was collected in the instructor dashboard panel
2013-07-30 09:11:58 -07:00
Carlos Andrés Rocha
b8d1a138ae Show dates when the data was collected in the instructor dashboard panel 2013-07-30 11:16:27 -04:00
Your Name
56c8057ed0 fix for underscore template issue for xmodules 2013-07-30 10:34:36 -04:00
Jim Abramson
77a796e2c7 Merge pull request #520 from edx/feature/kevin/email_notifications_panel
Feature/kevin/email notifications panel
2013-07-30 05:30:56 -07:00