Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,421 Commits 1 Branch 0 Tags
e3c0bb839bad9493a4e12292ef7b94cbc4e0cec7
Commit Graph

18421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valera Rozuvan
e3c0bb839b Merge pull request #1183 from edx/valera/add_option_transcripts_remove_onhover 
Valera/add option transcripts remove onhover
 2013-10-08 07:37:02 -07:00
Christina Roberts
009deb7da8 Merge pull request #1236 from edx/christina/course-updates-bug 
Don't remove course update when clicking outside modal.
 2013-10-08 07:20:10 -07:00
Christina Roberts
c5733015fd Merge pull request #611 from edx/peter-fogg/draggabilly 
Rework drag/drop on overview and subsection pages.
 2013-10-08 07:14:34 -07:00
Adam
6418175a56 Merge pull request #1251 from edx/adam/remove-instr-dash-buttons 
re-enable some buttons on instr dash
 2013-10-08 07:04:25 -07:00
cahrens
1de194aaa4 Use RequireJS for test dependencies, and use domReady. 2013-10-08 09:55:15 -04:00
Valera Rozuvan
2cc25873e9 Fixing Jean Michel access. bug. 2013-10-08 16:52:21 +03:00
Valera Rozuvan
deb0ad492a Enabling showing of captions always when mouse is over CC. 2013-10-08 12:00:08 +03:00
polesye
20c2b3dc71 Clean up the code. 2013-10-08 12:00:08 +03:00
polesye
a667349d85 Fix acceptance tests. 2013-10-08 12:00:08 +03:00
polesye
f57d5a61d3 Tidy up the code. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
92494ccdd4 Fixing minor typo. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
60c528a9be Minor tweak. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
b3a9f63de6 Furthe addressing comments on PR. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
95b74930f6 Fixing JS. 
There were previous merge conflicts in the file.
 2013-10-08 12:00:07 +03:00
Valera Rozuvan
968215dd9f Updated acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
b7e82ed15e Updated acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
de1381dbfc Added acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
fc43a81dbe Updated fixtures for Jasmine tests. 2013-10-08 12:00:06 +03:00
Valera Rozuvan
74cbe11934 Added functionality to show captions on "CC" button mousemove. 
When auto-show/auto-hide is disabled, the captions will be shown when
the user will move the mouse over the "CC" button. They will then
auto-hide after a while if the user doesn't continue to move the
mouse over the "CC" button, or over the captions themselves, or use
the keyboard to select a specific caption. If the mouse pointer is not
over the captions or the "CC" button, they will hide after a while.

This is the key in the fix for bug BLD-355: Transcript hovers over
over videoplayer itself for PKU videos.
 2013-10-08 12:00:06 +03:00
Valera Rozuvan
812b085b84 Added hard-coded flag to video.html that turns on/off autohiding of captions. 
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
 2013-10-08 12:00:06 +03:00
Valera Rozuvan
62c445d001 Updated code fomat in test Jasmine. 2013-10-08 12:00:06 +03:00
Valera Rozuvan
38dfde1296 Work in progress. 2013-10-08 12:00:06 +03:00
Adam Palay
c64399424e re-enable some buttons on instr dash 2013-10-07 18:13:21 -04:00
Will Daly
3af6b90b8a Merge pull request #1239 from edx/will/fix-expand-section-test 
Use css_has_value() to fix failure in course-overview.feature
 2013-10-07 14:20:38 -07:00
cahrens
328640452f Comment out tests that fail in Jenkins. 2013-10-07 17:18:40 -04:00
cahrens
61cfb91218 Cleanup to drag and drop implementation. 
Also includes RequireJS changes.

Fixes bugs:
STUD-755, STUD-152, STUD-700, STUD-699
 2013-10-07 17:18:40 -04:00
Brian Talbot
14b4b6a24e Adds in minimally revised drag and drop styling. 
Add CSS classes and fix drop destination bug.
 2013-10-07 17:17:46 -04:00
Peter Fogg
85be9b4265 Jasmine tests for drag/drop. 2013-10-07 17:17:46 -04:00
Peter Fogg
7640ade481 Fix not being able to expand an empty subsection. 2013-10-07 17:17:46 -04:00
Peter Fogg
cbd066da04 Address PR comments. 
Remove unused variables; some changes to match existing BDD spec for
drag/drop (expand-on-hover timeout and dropping with mouse outside of
element); bugfix for section expand; some code cleanup; update and
re-enable acceptance test.
 2013-10-07 17:17:46 -04:00
Peter Fogg
1c9fbec94b CSS classes for drop targets. 2013-10-07 17:17:46 -04:00
Peter Fogg
a0deac0399 Make all of section/subsection/unit draggable. 2013-10-07 17:17:46 -04:00
Peter Fogg
fd2f720adb Add auto-expand to overview lists. 2013-10-07 17:17:46 -04:00
Peter Fogg
2d3cba06d2 Rework course overview drag and drop. 
Failed drags bring the element back to where it started; elements are
locked to the y-axis, states are represented as CSS classes for
styling, elements can be dragged across section/subsection borders,
and dragging to the top/bottom of a section Just Works™.

Needs some styling love to give visual representation of where the
dragged element will drop, though.

TODO: It'd be good to have auto expand/collapse for subsections.
 2013-10-07 17:17:46 -04:00
David Baumgold
8b03c4abae Merge pull request #1241 from edx/db/base-js-smoothscroll 
base.js requires jquery.smoothScroll
 2013-10-07 13:48:16 -07:00
David Baumgold
d29cc4776e base.js requires jquery.smoothScroll 2013-10-07 16:37:05 -04:00
Will Daly
b749300d43 Use css_has_value() to fix failure in course-overview.feature 2013-10-07 16:08:39 -04:00
Will Daly
c820ca4888 Merge pull request #1200 from edx/will/efficient-diff-quality 
Use pre-generated reports for pep8/pylint when running diff-quality
 2013-10-07 13:05:47 -07:00
David Baumgold
3f7fbfa5b2 Merge pull request #1238 from edx/db/update-docs-readme 
Update docs readme
 2013-10-07 13:03:31 -07:00
David Ormsbee
8ea3e2047c Merge pull request #1231 from edx/ormsbee/verify_tests3 
Model tests for verify_student flow.
 2013-10-07 12:57:24 -07:00
David Ormsbee
02fc6a40db Add model tests to verify_student flow. 2013-10-07 15:56:38 -04:00
David Baumgold
6bd015d321 Update docs readme 2013-10-07 15:40:36 -04:00
cahrens
aa6022d505 Don't remove course update when clicking outside modal. 
Fixes bug STUD-822.
 2013-10-07 15:25:16 -04:00
jkarni
31980150f0 Merge pull request #1043 from edx/jkarni/feature/import-feedback 
Jkarni/feature/import feedback
 2013-10-07 12:13:07 -07:00
Julian Arni
bb00924917 Use requirejs for import.js 
And fixes for rebase-breakage.
 2013-10-07 14:07:26 -04:00
Adam
faf796b574 Merge pull request #1125 from edx/adam/remove-instr-dash-buttons 
disable buttons for legacy and beta instr dash
 2013-10-07 10:36:51 -07:00
Will Daly
a617988cf7 Merge pull request #1232 from edx/will/navigation-grading-test-fixes 
Fix navigation and grading acceptance tests
 2013-10-07 08:34:48 -07:00
Adam Palay
e37584619b add entry to changelog 2013-10-07 10:14:12 -04:00
Brian Talbot
8ec583c355 LMS: abstracts consistent message/copy color styling from Instructor Dashboard view 
LMS: adds message styling to the separate instructor_2 Sass file
 2013-10-07 10:14:10 -04:00
Adam Palay
197f9015aa disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-07 10:11:08 -04:00