Jay Zoldak
dbfc38dfa9
Merge pull request #1370 from edx/zoldak/refactor-cms-acceptance-js
...
refactor studio component creation in acceptance tests
2013-10-16 14:47:29 -07:00
Jay Zoldak
33f6d3b819
Address code review comments
2013-10-16 17:08:32 -04:00
Jay Zoldak
751994b9aa
pep8 and pylint fixes
2013-10-16 15:03:14 -04:00
Jay Zoldak
37933cb5f9
refactor studio component creation in acceptance tests
2013-10-16 15:02:49 -04:00
David Baumgold
e363e5a72d
Merge pull request #1337 from edx/db/fix-video-requirejs
...
fix video module issue with require.js
2013-10-16 09:40:48 -07:00
Christina Roberts
637b66197b
Merge pull request #1331 from edx/christina/index
...
Move index code into index.js.
2013-10-16 07:24:30 -07:00
Will Daly
fd49f09284
Merge pull request #1358 from edx/will/fix-course-overview
...
Wait for non-blank link in course-overview test
2013-10-16 05:24:28 -07:00
David Baumgold
40e540284f
wait to load video module until YT API is ready
2013-10-16 13:28:28 +03:00
Valera Rozuvan
a7f3bb2b00
Added back on hover CC button functionality.
...
Fixing falling test. Added fix for RequireJS & XModule loader video race condition.
Removed unnecessary comments from SCSS and JS files.
Added entry to Change Log.
2013-10-16 12:02:19 +03:00
Will Daly
adc46716b6
Wait for non-blank link in course-overview test
2013-10-15 21:21:09 -04:00
Christina Roberts
ccd692dd86
Merge pull request #1133 from edx/jkarni/fix/customtag-error
...
Jkarni/fix/customtag error
2013-10-15 14:23:45 -07:00
Will Daly
52a475885c
Merge pull request #1350 from edx/db/enable-tender
...
re-enable tender
2013-10-15 14:10:43 -07:00
Julian Arni
d9ba410388
Review fixes
2013-10-15 16:52:35 -04:00
Julian Arni
9798da413d
Review fixes
2013-10-15 16:16:10 -04:00
Frances Botsford
de1ee17323
fixing alignment error on studio component error message, i18n error message
2013-10-15 16:16:09 -04:00
Julian Arni
b7485fd812
Review fixes
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
Julian Arni
2721966d76
Added acceptance tests for get_html exception handling
...
Make tests conform to new import UI
2013-10-15 16:16:09 -04:00
Frances Botsford
faadc33fcc
leveraging some of the existing notification styling for component errors in studio
2013-10-15 16:16:09 -04:00
Julian Arni
62a8c420ed
Check for exceptions when rendering studio and students views.
...
Otherwise it's possible to reach stuck states.
2013-10-15 16:16:09 -04:00
Ned Batchelder
25a027475d
Rename contentstore/views/requests to helpers
...
This has caused confusion, since this file gets imported when trying to
import the requests library. And besides, how was this file about
requests in the first place? Helpers is a much better name.
2013-10-15 15:53:48 -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
David Baumgold
eec7118f2b
enable tender
...
This reverts commit 96485694d3
2013-10-15 14:19:26 -04:00
cahrens
00ebcf7fe7
Move index code into index.js.
2013-10-15 14:14:55 -04: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
Carlos Andrés Rocha
fae5a5ff20
Merge pull request #1289 from rocha/dump-course-command
...
Export course command
2013-10-15 10:26:48 -07: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
David Baumgold
e7f9243c95
Merge pull request #1346 from edx/db/disable-tender
...
disable tender
2013-10-15 08:49:04 -07:00
David Baumgold
ab45ce1991
Merge pull request #1335 from edx/db/requirejs-use-domReady
...
use domReady rather than $.ready()
2013-10-15 07:57:07 -07:00
Carlos Andrés Rocha
f7ff8f8b6a
Delete dump_course_structure django command on cms
...
Replaced by dump_course_structure on lms
2013-10-15 10:48:59 -04:00
Carlos Andrés Rocha
15852cd816
Modify export_to_xml to take an optional contentstore and work with xml courses
2013-10-15 10:48:59 -04:00
David Baumgold
96485694d3
disable tender
...
because their Javascript breaks our page
2013-10-15 10:25:48 -04:00
Frances Botsford
2877345b79
styling for LTI in a new window block
2013-10-14 13:58:18 +03:00
David Baumgold
061e046e2d
use domReady rather than $.ready()
2013-10-12 13:24:30 -04:00
David Baumgold
b6281cb0a6
Define CMS.URL.UPLOAD_ASSET immediately
2013-10-11 17:12:00 -04:00
David Baumgold
fb01d8fa81
Fixes to avoid CSRF error in acceptance tests
2013-10-11 17:11:59 -04:00
David Baumgold
1007f5aeb4
load gettext on every page
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
David Baumgold
cf66d0a52a
Merge pull request #1303 from edx/db/source-edit-leanModal
...
source-edit.html depends on leanModal
2013-10-10 11:26:55 -07:00
John Jarvis
92a7d75b5d
Merge pull request #1305 from edx/jarv/revert-1240
...
Revert "Merge pull request #1240 from edx/dhm/config_separation"
2013-10-10 10:27:58 -07:00
