Commit Graph

7180 Commits

Author SHA1 Message Date
John Eskew
f0c52e3244 Merge pull request #7948 from edx/jeskew/PLAT_618_elemental_publish_tests
Add tests for publishing operations and OLX export.
2015-05-22 19:14:32 -04:00
John Eskew
4219086d40 Add framework for testing the effects of modulestore operations on OLX.
Add tests for all course-changing operations from the
ModuleStoreDraftAndPublished interface.
Enforce the OLX format of draft and published items for those ops.
2015-05-22 16:21:00 -04:00
John Eskew
25a4fec7d1 boostrapper -> bootstrapper 2015-05-22 11:51:42 -04:00
Calen Pennington
83962d6497 Allow CourseAboutFactory to be used without django by explicitly passing in a modulestore 2015-05-22 11:51:42 -04:00
Awais Qureshi
f5d08b2ea1 Merge pull request #8085 from edx/awais786/ECOM-1590-new-field-minimum-grade-studio
ECOM-1590 adding new field in advance_settings.
2015-05-21 17:57:51 +05:00
Calen Pennington
a2cbd16680 Merge pull request #7789 from cpennington/wrap-csm
Wrap access to CSM (inside FieldDataCache) to use the new interface
2015-05-20 16:11:07 -04:00
Calen Pennington
bd1e9aa129 Record valid scopes when raising InvalidScopeError 2015-05-20 15:33:30 -04:00
Awais
3da312b224 ECOM-1590 adding new field in advance_settings. 2015-05-21 00:29:00 +05:00
Ahsan Ulhaq
c75526ea5e changes for failing label test 2015-05-19 13:17:17 +05:00
Ahsan Ulhaq
16a248b997 Fieldset and legend solution is lost when edit Problem
when user try to update a problem the fieldset and legend solution for that
problem is lost because legend and fieldset are not added in the markdownToXml.
So added new markups where fieldset is to be added and used ```>><<``` markup for
legend.

AC-103
2015-05-19 11:46:28 +05:00
Sarina Canelake
ca64c665cc Default course license to All Rights Reserved
Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.

Add ARIA attributes to license for a11y

Gracefully handle re-selecting of selected license
2015-05-18 14:37:32 -04:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
David Baumgold
37ab2fc16a Wrap block with license info in LMS only 2015-05-18 14:35:08 -04:00
David Baumgold
ca2fee1259 Move LicenseMixin into VideoFields class 2015-05-18 14:35:07 -04:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
David Baumgold
8a4503b3f4 Display Scope.content fields in Studio editor
But mark `data` as non-editable metadata, so that it doesn't appear
2015-05-18 14:09:38 -04:00
Sarina Canelake
3f739b05b1 Merge pull request #7997 from openfun/rmoch/i18n_problem_explanation_title
i18n lon-capa problem explanation title
2015-05-18 10:11:01 -04:00
Richard Moch
3e0342cbb3 i18n lon-capa problem explanation title 2015-05-18 13:16:59 +00:00
Marco Morales
b6164b5702 Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup
Complete Printing Cleanup
2015-05-15 15:42:36 -04:00
Andy Armstrong
358aa7754b Add "Teams Configuration" advanced setting 2015-05-15 14:13:41 -04:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
2015-05-14 18:14:21 -04:00
Jolyon Bloomfield
1021151efd Complete printing cleanup, rebased into one 2015-05-13 18:31:38 -04:00
Diana Huang
ac8b75ca7f Merge pull request #7804 from edx/diana/progress-summary-refactor
Implement the Weighted Problem Grade Report
2015-05-13 09:10:02 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report.
* Handle grading errors
2015-05-13 06:58:02 -04:00
Diana Huang
7df9ab9c14 Extend the Score namedtuple to know about module locations. 2015-05-12 16:32:00 -04:00
Calen Pennington
1eb040f4ff Add MetricsMixin back into DescriptorSystem and ModuleSystem 2015-05-12 10:23:31 -04:00
Adam Palay
8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master
Conflicts:
	common/test/acceptance/tests/video/test_video_times.py
2015-05-08 10:23:04 -04:00
Shrhawk
7b53584653 Merge pull request #7621 from edx/shr/bug/TNL-1858-Unable-to-delete-studio-page
Delete static_tab for split courses raises 500 error
2015-05-08 15:06:03 +05:00
Syed Hassan Raza
e7aeb92182 update the attrib using dict-->update() function 2015-05-07 14:05:27 -04:00
Adam Palay
afec81b662 prevent overly nesting _field_data (TNL-2050) 2015-05-07 14:05:27 -04:00
Syed Hassan Raza
b7955fab77 Static tab as orphan 2015-05-06 16:18:14 +05:00
Feanil Patel
aa6565959d Merge branch 'release'
Conflict in import because someone had added an import in master that
was not in the release.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py
2015-05-05 16:27:45 -04:00
Calen Pennington
73bbb89297 Merge pull request #7839 from cpennington/fix-plat-541
Move entry_point down into XModule/XModuleDescriptor so that 'xmodule.v1...
2015-05-05 11:08:08 -04:00
Shrhawk
d60b4eed13 Merge pull request #7871 from edx/shr/bug/TNL-2094-6.00.x-export-issue
update the attrib using dict-->update() function
2015-05-05 12:08:29 +05:00
John Eskew
8ca57f83d3 Separate draft/published import into two separate bulk operations.
Add import_drafts abstract method in addition to import_children.
2015-05-04 14:54:54 -04:00
John Eskew
b290b305df Reorganize code, change method name, & fix comments.
Change xml file reading code when importing a course.
2015-05-04 14:54:50 -04:00
John Eskew
1c6ab4cc6a Add has_changes check for draft modules before exporting them.
Only export draft modules that have changes w.r.t. the published branch
should be exported to the /drafts directory in the course export.
2015-05-04 14:54:12 -04:00
John Eskew
062ad95f79 Change str to repr and change formatting. 2015-05-04 14:54:11 -04:00
John Eskew
61aa3c2789 If BlockKey already, then return. 2015-05-04 14:54:11 -04:00
John Eskew
45ad00ae38 Add tests for more draft/published import/export.
Include tests that mimic behavior in PLAT-452.
2015-05-04 14:54:11 -04:00
John Eskew
c21cf66569 Only include published items in course export. 2015-05-04 14:54:11 -04:00
Syed Hassan Raza
1175047d12 update the attrib using dict-->update() function 2015-05-04 21:07:40 +05:00
Awais Jibran
1ec7dc813f Merge pull request #7797 from edx/aj/tnl2008-stop-video-event-not-emitted-correctly
Videos should emit `stop_video` event once the video segment is compelte...
2015-05-04 12:08:45 +05:00
Ahsan Ulhaq
918afe64fd Numerical Input assessment has multiple accessibilty issues
TNL-1677
2015-05-01 23:15:33 +05:00
E. Kolpakov
6db974c8ee Fixes for course import-export:
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
2015-05-01 18:36:14 +03:00
Adam
af3519ce15 Merge pull request #7835 from edx/release
Release (DO NOT MERGE)
2015-04-30 16:24:47 -04:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
Daniel Friedman
9e90ec5c0a Correct "shure" to "sure" in a comment 2015-04-29 16:05:43 +00:00
David Baumgold
28c898c395 Correct spelling in a comment 2015-04-29 11:27:07 -04:00
Adam Palay
41a66b521b fix typo in captions js (TNL-2076) 2015-04-29 11:02:26 -04:00