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

1533 Commits

Author SHA1 Message Date
Frances Botsford
de1ee17323 fixing alignment error on studio component error message, i18n error message 2013-10-15 16:16:09 -04:00
Frances Botsford
9f188ed20c additional copy and styling for component syntax error in studio 2013-10-15 16:16:09 -04:00
Brian Talbot
e825cfb1db Merge pull request #1311 from edx/talbs/fix-studio-importui 
Studio: FIX - Import Status UI Consistency
 2013-10-15 11:29:48 -07:00
Christina Roberts
8e45668a83 Merge pull request #1329 from edx/christina/import-cleanup 
Remove dead code and move import code into import.js.
 2013-10-15 11:11:30 -07:00
Christina Roberts
54498e15ae Merge pull request #1328 from edx/christina/toggle-sock 
Move sock JS code into its own file.
 2013-10-15 10:55:44 -07:00
Brian Talbot
8769a1a687 Studio: revises layout for success step and actions in import view 2013-10-15 13:44:33 -04:00
cahrens
75071b6b8b Typo. 2013-10-15 13:26:47 -04:00
cahrens
5dd8e49179 Move import code into import.js. 2013-10-15 13:26:47 -04:00
cahrens
c53d86d684 Remove unreferenced code. 2013-10-15 13:26:47 -04:00
cahrens
6a7b88df4d Move sock JS code into its own file. 2013-10-15 12:59:22 -04:00
cahrens
37dcfd7bdd Remove commented out code. 2013-10-15 12:52:58 -04:00
cahrens
32239bb743 Gid rid of toast message. 2013-10-15 12:52:58 -04:00
Frances Botsford
2877345b79 styling for LTI in a new window block 2013-10-14 13:58:18 +03:00
David Baumgold
fb01d8fa81 Fixes to avoid CSRF error in acceptance tests 2013-10-11 17:11:59 -04:00
Christina Roberts
11142c7cbb Merge pull request #1300 from edx/christina/fix-rounding-error 
Grading rounding error.
 2013-10-11 07:33:26 -07:00
Frances Botsford
4fc801f09f fix for forgot password alignment on studio log in page 2013-10-11 09:51:44 -04:00
Brian Talbot
03c9a46d79 Studio: visually hides the tender widget tag UI, again 2013-10-10 16:37:31 -04:00
David Baumgold
3e9c09e097 Ensure that jQuery loads before any other JS dependency 2013-10-10 14:27:29 -04:00
cahrens
8c080b6fb6 Acceptance test for fixing rounding error on weight. 2013-10-10 12:02:21 -04:00
cahrens
3ed2fcbb31 Parse floats to ints in CourseGrader model. 
Fixes STUD-826.
 2013-10-10 12:02:21 -04:00
cahrens
6b5d864885 Change test to pass on Chrome as well as FireFox. 2013-10-10 12:01:11 -04:00
David Baumgold
30dc441807 Merge pull request #1288 from edx/db/grading-deps-ui 
grading.js depends on jquery.ui
 2013-10-10 08:49:24 -07:00
frances botsford
187fc8ea1c Merge pull request #1280 from edx/fix/frances/lms-video-dl-buttons2 
Improving the video and transcript download buttons
 2013-10-10 07:10:38 -07:00
Frances Botsford
5d509c2e08 addressing review feedback on video buttons - switched to use themeable color variables 2013-10-10 10:09:43 -04:00
David Baumgold
6c2dbce434 grading.js depends on jquery.ui 2013-10-09 15:59:27 -04:00
cahrens
28dd142758 Only change the collapse/expand state on the first child. 
There are possibly children nested below that.
 2013-10-09 13:25:36 -04:00
Frances Botsford
5653112f5e ux cleanup of video and transcript download buttons 2013-10-09 12:02:09 -04:00
cahrens
5b58318490 Unfortunately, delete tests are still failing sporadically in Jenkins. 2013-10-09 10:27:54 -04:00
Brian Talbot
bbe906f77f Studio: changes drag and drop container to new .wrapper-dnd on outline/subsection views 2013-10-08 17:24:00 -04:00
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
David Baumgold
f1a104754e load jquery in requirejs deps 2013-10-08 11:40:42 -04: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
cahrens
1de194aaa4 Use RequireJS for test dependencies, and use domReady. 2013-10-08 09:55:15 -04: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
cahrens
aa6022d505 Don't remove course update when clicking outside modal. 
Fixes bug STUD-822.
 2013-10-07 15:25:16 -04:00
Julian Arni
bb00924917 Use requirejs for import.js 
And fixes for rebase-breakage.
 2013-10-07 14:07:26 -04:00
Julian Arni
57b38969e5 Move import-related js to import.js 2013-10-07 09:57:20 -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