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

3927 Commits

Author SHA1 Message Date
Christina Roberts
c484dc6cbb Merge pull request #1255 from edx/db/requirejs-load-jquery 
load jquery in requirejs deps
 2013-10-08 09:28:50 -07:00
David Baumgold
eb07e0bd58 Remove unused setup_require.coffee file 2013-10-08 12:06:18 -04:00
Christina Roberts
814a218bfb Merge pull request #1254 from edx/christina/enable-overview-tests 
Re-enable tests that were failing on Jenkins.
 2013-10-08 08:46:09 -07:00
David Baumgold
f1a104754e load jquery in requirejs deps 2013-10-08 11:40:42 -04:00
Ned Batchelder
a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance 
Use assertIsInstance where we can
 2013-10-08 07:47:21 -07:00
Will Daly
560dac6ac5 Merge pull request #1242 from edx/will/disable-broken-tests 
Disable non-deterministic test to get stability on master
 2013-10-08 07:43:35 -07:00
Will Daly
c3bd7d3db8 Merge pull request #1243 from edx/will/fix-course-image-test 
Use wait_for to allow course image time to update
 2013-10-08 07:40:07 -07:00
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
cahrens
9d31924793 Re-enable tests that were failing on Jenkins. 2013-10-08 10:23:47 -04: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
cahrens
1de194aaa4 Use RequireJS for test dependencies, and use domReady. 2013-10-08 09:55:15 -04: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
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
Ned Batchelder
9103fa393c Use assertIsInstance. 2013-10-07 18:17:40 -04:00
Will Daly
9a6f976d69 Disable non-deterministic video caption test to get stability on master 2013-10-07 17:57:51 -04:00
Will Daly
b7856d96bf Use wait_for to allow course image time to update 2013-10-07 17:44:16 -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
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
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
David Baumgold
fd7e8baccb Tie the USE_I18N setting to DEBUG setting 
We want USE_I18N to be on in development, but off in production. Tying
this setting to the DEBUG setting accomplishes that neatly.
 2013-10-07 15:04:15 -04:00
Julian Arni
bb00924917 Use requirejs for import.js 
And fixes for rebase-breakage.
 2013-10-07 14:07:26 -04:00
Brian Talbot
5cfec75ece Studio: adds in instructional copy to user on when it is safe to leave the import view without harming an import process 2013-10-07 09:57:41 -04:00
Julian Arni
57b38969e5 Move import-related js to import.js 2013-10-07 09:57:20 -04:00
Julian Arni
7b3c4945cf Review fixes 
Studio: revises import help/status copy to better reflect/generalize what is done with imported content

Add test cases for import status
 2013-10-07 09:55:46 -04:00
Julian Arni
642bf0e6e6 Clear import status on retry 2013-10-07 09:53:37 -04:00
Brian Talbot
1735a0f41f Studio: copy and styling changes to import view to support new status UI 2013-10-07 09:52:59 -04:00
Brian Talbot
89bba535e1 Studio: adds in action-related elements to the status display UI of the Import view 2013-10-07 09:52:59 -04:00
Julian Arni
4bbacb02db Re-add bar references 2013-10-07 09:52:59 -04:00
Julian Arni
cab7c4ff74 Remove references to old upload progress bar 2013-10-07 09:52:59 -04:00
Brian Talbot
76ee27c22a Studio: revises import view Sass extends to use placeholder syntax 2013-10-07 09:52:59 -04:00
Julian Arni
45ce8d30d9 Use swanky error css for error messages 2013-10-07 09:52:59 -04:00
Julian Arni
abdaeef9d8 Hook up js to css classes 2013-10-07 09:51:52 -04:00
Brian Talbot
59af44574c Studio: revises general layout/styling of import view and adds in detail progress feedback after import (WIP) 
Studio: removes import progress bar HTML and Sass; hides import status by default

Studio: revises import file upload success copy; sets up showing/hiding states for import status and additional messages

Studio: revises iconography and adds in success step in import status feedback

Studio: adds hidden styling back into import status UI
 2013-10-07 09:51:19 -04:00