Christine Lytwynec
df758d7917
Add an explicit accessibility test TE-890
2015-05-26 11:55:27 -04:00
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
Jim Abramson
c807a6041b
Merge pull request #8127 from edx/jsa/xcom-306
...
Implement student-initiated refunds for external commerce service.
2015-05-21 11:42:32 -04:00
jsa
3dede202f1
Implement student-initiated refunds for external commerce service.
...
XCOM-306
2015-05-21 11:37:37 -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
47702f1bc3
Merge pull request #7918 from edx/ahsan/AC-103-fieldset-legend-solution-lost-when-editing-problem
...
Fieldset and legend solution is lost when edit Problem
2015-05-19 14:42:05 -04:00
Sarina Canelake
1ca4b3b941
Merge pull request #8102 from rando305/master
...
Create email only when it will be sent
2015-05-19 14:06:35 -04:00
Christina Roberts
cff565060b
Merge pull request #8052 from edx/christina/tag-events
...
Update student notes eventing for tags.
2015-05-19 13:55:57 -04:00
cahrens
0c7af25c79
Update student notes eventing for tags.
...
TNL-2172
2015-05-19 13:14:10 -04:00
Ben Patterson
6d38de1e5a
Merge pull request #8098 from edx/benp/flaky-annotation
...
Skip test. TNL-1590
2015-05-19 12:34:13 -04:00
Renzo Lucioni
7eecfd89f9
Merge pull request #8094 from edx/renzo/enrollment-api-unenrollment
...
Allow enrollment API to deactivate enrollments
2015-05-19 10:51:23 -04:00
Randy Ostler
93e6434e19
Create email message only when it will be sent
2015-05-19 10:01:48 -04:00
Christina Roberts
0dbdbfef20
Merge pull request #8080 from edx/track/ga-label-shim
...
Add course_id as label for Google Analytics events
2015-05-19 09:20:07 -04: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
Renzo Lucioni
960b02cf98
Allow enrollment API to deactivate enrollments
...
Will allow Otto to revoke fulfillment of course seat products. Only server-to-server calls are currently allowed to deactivate or otherwise modify existing enrollments.
2015-05-18 19:44:02 -04:00
Ben Patterson
51ac5f7128
Skip test. TNL-1590
...
Even when using the flaky decorator, it is not reliable.
2015-05-18 17:02:18 -04:00
Sarina Canelake
1775dd5365
Merge pull request #7315 from edx/db/creative-commons
...
Allow custom licensing for course content
2015-05-18 15:36:50 -04: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
648e8a20f7
Creative Commons: Accessibility improvements
2015-05-18 14:35:09 -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
Ben Patterson
41e84a58dd
Skip flaky test. SOL-618.
2015-05-18 14:11:20 -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
Gabe Mulley
63b0378520
Ensure GA events have a course label if available
2015-05-18 13:25:12 -04:00
Martyn James
20a32a7e4f
Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase
...
Dcikatic/sol 487 filter staff view (rebase against master)
2015-05-18 10:40:57 -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
e97b94bde2
Merge pull request #8060 from edx/ned/add-supers
...
Add super() calls to setUp/tearDown that are missing them
2015-05-15 12:29:14 -04:00
Christopher Lee
a57f0d7410
Merge pull request #7794 from edx/clee/gated_content_mobile_api
...
MA-635 Block Mobile Content for unfulfilled milestones
2015-05-15 10:24:04 -04:00
christopher lee
5cef287c5d
MA-635 Block Mobile Content for unfulfilled milestones
...
Previously, the mobile api did not check for pre-requisite courses
or entrance exams. This change checks for these milestones and then
returns course content accordingly.
2015-05-15 09:39:54 -04:00
muzaffaryousaf
cae5623fd9
Updating the django-countries version to support sorting.
...
Adding the pyuca to support sorting in differnet languages.
TNL-2047
2015-05-15 17:07:14 +05: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
Ned Batchelder
b98d85fda0
Merge pull request #7943 from edx/ned/move-xmodule-modifiers
...
Move xmodule_modifiers.py to openedx/xblock
2015-05-14 16:51:46 -04:00
Ned Batchelder
7c704f3959
Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py
2015-05-14 16:03:50 -04:00
Sarina Canelake
25eb6942b6
Merge pull request #8051 from edx/sarina/add-flaky-TNL-2199
...
Add flaky test decorator (TNL-2199)
2015-05-14 15:26:43 -04:00
Davorin Sego
a455d9d50a
SOL-495 Cohort-Aware content search
2015-05-14 14:07:42 -04:00
Christina Roberts
3f2c370d58
Merge pull request #7923 from edx/christina/show-notes
...
Tags Tab in Student Notes
2015-05-14 12:30:38 -04:00
Sarina Canelake
f3f0f08422
Add flaky test decorator (TNL-2199)
2015-05-14 12:10:42 -04:00
cahrens
abd25b8b45
Add a "tags" view in student notes.
...
TNL-1926
2015-05-14 11:36:48 -04:00
