Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,917 Commits 1 Branch 0 Tags
04fcebaf4740586c67fdbebf0c8a31db26d95f83
Commit Graph

1792 Commits

Author SHA1 Message Date
Andy Armstrong
04fcebaf47 Allow xblocks to be added as advanced problem types 2014-06-14 08:06:51 -04:00
Brian Talbot
1209daa7f3 making system status notifications flexible based on content 2014-06-09 14:08:20 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00
benmcmorran
5dd7ffe7e3 Merge pull request #3979 from edx/benmcmorran/delete-page-confirmation 
Fixes delete page confirmation text.
 2014-06-04 11:39:47 -04:00
Ben McMorran
b55736035a Fixes delete page confirmation text. 2014-06-04 09:39:17 -04:00
zubair-arbi
dbd9e56c6c prevent caching of GET requests for xblock student view 
STUD-1691
 2014-06-04 16:14:13 +05:00
Andy Armstrong
5792e7e06a Fix the title of edit modals from the unit page. 2014-05-29 17:10:33 -04:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -04:00
David Baumgold
0f580a7e46 Merge pull request #3892 from louyihua/ie-fix 
Fix exception on Internet Explorer when adding first transcript language
 2014-05-29 09:09:05 -04:00
louyihua
551301a7ac Fix exception on Internet Explorer when adding first transcript language 
Internet Explorer throws an "Invalid argument" exception when uses an empty string as the parameter in ```namedItem``` method.
Change empty string into null value can maintain browser consistency.
 2014-05-28 23:44:50 +08:00
Waheed Ahmed
6ad6f77ca2 Cheatsheet visibility code refactored. 2014-05-28 12:07:59 +05:00
Andy Armstrong
6b64b157a8 Merge pull request #3877 from louyihua/translation-fix-cms 
i18n: Make XBlock buttons & components have localizable display names
 2014-05-27 09:06:37 -04:00
polesye
db213bf325 BLD-967: Fix regExp. 2014-05-27 13:31:18 +03:00
louyihua
559a2c8888 i18n: Make XBlock buttons & components have localizable display names 
1. Current code uses type name as the display names for XBlock buttons, so the name of these five buttons can't be localized. This fix contains code that adds a 'display_name' field for the buttons, and makes their names localizable.
2. The display names of components in advanced, html and problem types can be localized now.
 2014-05-27 11:16:54 +08:00
Calen Pennington
ecb05e6b03 Merge pull request #2905 from edx/opaque-keys 
(WIP) Make course ids and Locations/Locators opaque to LMS/Studio
 2014-05-23 12:58:20 -04:00
Jay Zoldak
bb4f9148e0 Skip intermittently failing js video tests 2014-05-23 11:21:57 -04:00
Nimisha Asthagiri
21ddc7db00 Fixed DeleteComponent on Container Page. 2014-05-23 11:05:37 -04:00
Calen Pennington
29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master 2014-05-23 10:05:56 -04:00
zubair-arbi
0054b79d5a Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton 
move upload asset code for assets to AssetsView
 2014-05-23 18:24:24 +05:00
Calen Pennington
240fcc1d5a Fix merge conflicts 2014-05-22 16:24:02 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Andy Armstrong
541d20ef83 Allow creation of components on container page 
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
 2014-05-21 15:40:31 -04:00
zubiar-arbi
08f313f9b4 move upload code for assets to AssetsView 
STUD-1523
 2014-05-21 17:15:04 +05:00
Frances Botsford
f2d8894118 fix for modal appearing off-screen 2014-05-20 14:13:51 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
 2014-05-13 15:30:56 -04:00
Brian Wilson
d6a74a644d Merge branch 'master' into release 
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
 2014-05-13 11:10:48 -04:00
Calen Pennington
19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
 2014-05-12 11:35:03 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Andy Armstrong
e75f273329 Apply Sarina's code review suggestions 2014-05-09 13:39:17 -04:00
Andy Armstrong
6d08a0b47b Improve the translatability of the paging header 2014-05-09 12:07:49 -04:00
Adam
efcd13e836 Merge pull request #3511 from edx/adam/wiki-hide-fix-firefox 
fix wiki hide button not working in firefox (STUD-1581)
 2014-05-09 07:04:03 -05:00
Calen Pennington
0d88379eeb Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit adds all of cms.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-07 12:56:43 -04:00
Waheed Ahmed
998af82baa Fixed cheatsheet for open ended editor. 
STUD-1583
 2014-05-07 12:58:35 +05:00
marcotuts
b0781cdd4a Merge pull request #3614 from edx/waheed/fix-simple-problem-editor 
Fixed simple problem editor text showing up in advanced editor
 2014-05-06 12:17:37 -04:00
frances botsford
3530721671 Merge pull request #3577 from edx/frances/fix/404-and-500-page-layout 
Fix for Studio 404 and 500 page layouts
STUD-864
 2014-05-06 11:44:51 -04:00
Waheed Ahmed
b873cfc26d Fixed simple editor text showing in advanced editor. 2014-05-06 20:35:38 +05:00
Christina Roberts
df262d4fc7 Merge pull request #3229 from edx/christina/container-dnd 
Drag and drop on container page
 2014-05-06 11:09:29 -04:00
Frances Botsford
5890bc842c removing larger size for CodeMirror for funky visual behavior on Checkbox problems in release 2014-05-06 10:47:59 -04:00
cahrens
acd9d7d904 These files are not being used. 2014-05-05 11:36:04 -04:00
Andy Armstrong
7693659e48 Address Christina's review comments 2014-05-05 11:34:55 -04:00
Andy Armstrong
de80f892e2 Clean up coverage and code quality issues 2014-05-02 16:20:17 -04:00
Andy Armstrong
e20a7fc53c Fix Jasmine tests 
Also, rewrite them to be easier to comprehend, and to not use magic constants (or to use fewer, at least).
 2014-05-02 16:20:17 -04:00
Andy Armstrong
f3a23f3973 Only show drag handles in draft mode 2014-05-02 16:20:12 -04:00
Frances Botsford
fb4cab435e fix for Studio 404 and 500 page layouts 
STUD-864
 2014-05-02 16:19:59 -04:00
cahrens
37da399997 Update unit test based on changes in master. 2014-05-02 15:09:25 -04:00
Andy Armstrong
c1fd0ca34e Switch the container page to use the new view 2014-05-02 15:09:23 -04:00
Frances Botsford
fd7142bcde dnd container page styling 2014-05-02 15:09:23 -04:00
cahrens
fb150bcf64 Drag and drop on container page. 
STUD-1309
 2014-05-02 15:09:15 -04:00
Adam Palay
7c13ba0c3b Disable draft and edit links during ajax calls 
STUD-1485
STUD-1499
 2014-05-02 09:11:46 -04:00