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

3746 Commits

Author SHA1 Message Date
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
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
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
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware 
add some middleware to determine whether draft modulestore or non-draft ...
 2013-10-10 10:24:51 -07:00
David Baumgold
b80d1572f0 source-edit.html depends on leanModal 2013-10-10 13:16:15 -04:00
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation" 
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
 2013-10-10 13:14:08 -04:00
Christina Roberts
5b1b0fe1e6 Merge pull request #1285 from edx/christina/firefox-test-failure 
Change mocking of height so it passes in Chrome as well as FireFox.
 2013-10-10 09:59:30 -07:00
David Baumgold
7a24188ca6 Merge pull request #1278 from edx/db/increase-requirejs-timeout 
Increase requirejs load timeout to 60 seconds
 2013-10-10 09:37:39 -07: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
Christina Roberts
94ed3c6abb Merge pull request #1275 from edx/christina/delete-static-tabs 
Delete unused static-pages.html.
 2013-10-10 08:28: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
838f4df6b5 Merge pull request #1269 from edx/db/clarify-debug 
Clarify USE_I18N settings
 2013-10-09 13:55:30 -07:00
Don Mitchell
ec01253e30 Merge pull request #1240 from edx/dhm/config_separation 
Segregate the mongo db config from the modulestore config
 2013-10-09 13:24:30 -07:00
David Baumgold
6c2dbce434 grading.js depends on jquery.ui 2013-10-09 15:59:27 -04:00
David Baumgold
cbaa3089ba Updated comment 2013-10-09 15:54:01 -04:00
David Baumgold
ae8c9710e5 Merge pull request #1276 from edx/db/load-common-via-require 
load common libs via require
 2013-10-09 12:17:22 -07:00
cahrens
70cb24a37f Delete unused static-pages.html. 2013-10-09 15:06:58 -04:00
Will Daly
b5f1d99829 Merge pull request #1282 from edx/will/wait-between-component-clicks 
Wait between clicks for new component
 2013-10-09 12:06:02 -07: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