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
Christina Roberts
7ed8a3b801
Merge pull request #1327 from edx/christina/kill-toast
...
Don't need toast message.
2013-10-15 10:24:14 -07: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
a5aca51ada
Merge pull request #1347 from edx/frances/fix/lti-sass-variable
...
fix for missing sass variable for LTI
2013-10-15 09:27:43 -07: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
7852b10753
Add command to dump a course to stdout as a tar.gz file
2013-10-15 10:48:59 -04:00
Carlos Andrés Rocha
8cc8608276
Add command to dump the structure of a course as a JSON
2013-10-15 10:48:59 -04:00
Carlos Andrés Rocha
956a960c63
Add command to dump the course_ids available to the 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
Frances Botsford
4b49a6514e
fix for missing sass variable for LTI
2013-10-15 10:40:12 -04:00
David Baumgold
96485694d3
disable tender
...
because their Javascript breaks our page
2013-10-15 10:25:48 -04:00
Valera Rozuvan
5592511098
Merge pull request #1185 from edx/alex/lti_new_window
...
New feature for lti module. Open in new window.
2013-10-15 05:07:39 -07:00
polesye
e76e86217c
Fix attribute target.
2013-10-14 14:24:35 +03:00
Valera Rozuvan
06a85e6ef5
Minor styling tweaks. Added Changelog entry.
...
Made it so that the link and the text are on the same level, and in the
center of the block.
2013-10-14 13:59:10 +03:00
Frances Botsford
2877345b79
styling for LTI in a new window block
2013-10-14 13:58:18 +03:00
Valera Rozuvan
068d0ce692
Added back check in JS for empty or default URL.
2013-10-14 13:58:18 +03:00
Valera Rozuvan
e2fb2aec41
Fixing template bug.
2013-10-14 13:58:18 +03:00
Valera Rozuvan
3c6591e065
Addressing comments by auraz and singingwolfboy.
...
Removed JS check for empty url and default url. In template added
i18n support for several strings.
2013-10-14 13:58:18 +03:00
Valera Rozuvan
134eab8c13
Adding fix for failing Python unit test.
2013-10-14 13:58:18 +03:00
Alexander Kryklia
f9b64cad32
Add display_name to lti template
2013-10-14 13:58:18 +03:00
Valera Rozuvan
1fe33a0f11
Updating LTI template.
2013-10-14 13:58:18 +03:00
Valera Rozuvan
a950bb7327
Oops. Forgot to delete one more template.
2013-10-14 13:58:17 +03:00
Valera Rozuvan
67463da059
Updated Jasmine tests as per Anton's and Alex's suggestions.
2013-10-14 13:58:17 +03:00
Alexander Kryklia
a03c5be6de
New feature for lti module.
...
Add ability to display LTI module in a new
window. Iframe will be still supported.
Fix python test
Update acceptance tests
Fix in acceptance tests, they are stable now
Fix Acceptance tests.
Adding Jasmine tests for LTI.
Fixing Jasmine tests. Adding the rest of Jasmine tests.
2013-10-14 13:58:17 +03:00
David Baumgold
061e046e2d
use domReady rather than $.ready()
2013-10-12 13:24:30 -04:00
polesye
aeae35344a
Merge pull request #1294 from edx/anton/fix-multiple-lti-per-page
...
LTI: Add possibility to use multiple LTI tools per page.
2013-10-12 00:59:38 -07:00
polesye
a0417c6b8a
Update CHANGELOG.rst.
2013-10-12 09:39:18 +03:00
polesye
484fff8175
Fix acceptance tests.
2013-10-12 09:39:18 +03:00
polesye
1113411293
Fix multiple LTI tools per page.
2013-10-12 09:39:18 +03:00
David Baumgold
8e9c48c28e
Merge pull request #1310 from edx/db/requirejs-gettext
...
load gettext on every page
2013-10-11 14:50:07 -07:00
Vik Paruchuri
751073895d
Merge pull request #1302 from edx/fix/vik/oe-accessibility
...
Various open ended accessibility fixes
2013-10-11 14:17:23 -07: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
Sarina Canelake
6605f60e9e
Merge pull request #1322 from edx/sarina/bulk-email-admin
...
django-admin command for enabling email per course
2013-10-11 14:10:17 -07:00
Sarina Canelake
c24087a912
django-admin command for enabling email per course
2013-10-11 16:39:12 -04:00
Vik Paruchuri
0accbaee07
Various open ended accessibility fixes
2013-10-11 15:00:55 -04:00
