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
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
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
Jolyon Bloomfield
1021151efd
Complete printing cleanup, rebased into one
2015-05-13 18:31:38 -04:00
Diana Huang
362c632ad7
Catch BSON errors as well as PyMongo errors when emitting
...
MongoDB events.
TNL-2035
2015-05-13 12:21:53 -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
Daniel Friedman
84f3c33df7
Address doc review
2015-05-12 16:32:01 -04:00
Andy Armstrong
2fafaec053
Implement grade report analytics
...
TNL-1988
2015-05-12 16:32:01 -04:00
Diana Huang
7df9ab9c14
Extend the Score namedtuple to know about module locations.
2015-05-12 16:32:00 -04:00
Adam Palay
42fb7bd6cb
Merge remote-tracking branch 'origin/release' into merge-release-into-master
...
Conflicts:
requirements/edx/github.txt
2015-05-12 15:13:28 -04:00
Ben Patterson
07c5bbd96d
Look for a consistent css class.
...
The former class, while less-flaky, does not always appear. (For example, if cohorts
are being toggled off.) This css class always appears. Initial findings point to
flakiness being a non-issue if we look for this class.
2015-05-12 13:38:05 -04:00
Calen Pennington
1eb040f4ff
Add MetricsMixin back into DescriptorSystem and ModuleSystem
2015-05-12 10:23:31 -04:00
Ben Patterson
31e56e77ae
Make edxnotes bok-choy tests chrome-friendly.
...
This eliminates some flakiness related to the loading of the notes page. It also
sets the 'no content' version of that page as a separate page object so testing
that case is more explicit.
TE-849
2015-05-11 15:02:00 -04:00
Adam
4a8cd270a1
Merge pull request #7988 from edx/shr/bug/PLAT-612-video-component-missing-tests
...
edx-val-Fix VAL error on re-import
2015-05-11 13:25:43 -04:00
Syed Hassan Raza
103fa38860
edx-val-Fix VAL error on re-import
2015-05-11 20:00:55 +05:00
Adam
58b34e1cc4
Merge pull request #7974 from edx/merge-release-to-master
...
Merge release to master
2015-05-08 14:24:14 -04:00
Ben Patterson
fa2b84d95d
Merge pull request #7968 from edx/benp/fix-cohort-flakiness
...
Ensure cohort management section has loaded.
2015-05-08 13:01: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
Ben Patterson
609feaae71
Ensure cohort management section has loaded.
...
TNL-2120, TE-849
The parent .cohort-management class was loading faster than its children (which makes sense). However,
flakiness existed on these tests because browser actions were depending on child elements that had not
painted yet.
Tested this using chrome with no X11 forwarding for extra speed. That exposed the ajax call
as well as the sub-class rendering issues.
2015-05-08 09:04:42 -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
Adam Palay
2842029a7f
skip failing test
2015-05-07 14:34:44 -04:00
Jesse Zoldak
b4ad9b8cd0
Skip intermittently failing test. TE-871
2015-05-07 14:26:20 -04: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
Adam
e71ee2b566
Merge pull request #7953 from Stanford-Online/kluo/cleanup-keyword-sub
...
Clean up keyword_substitution.py
2015-05-07 13:09:58 -04:00
Gabe Mulley
411df0ae3a
Merge pull request #7802 from edx/gabe/user-track
...
Make user_track use eventtracking
2015-05-07 08:43:21 -04:00
Gabe Mulley
4a8b0c5ef5
Make user_track use eventtracking
2015-05-06 20:57:46 -04:00
Kevin Luo
5c36bd1052
Clean up keyword_substitution.py
...
Update docstring and remove unused import
This is cleanup after edx/edx-platform#7605
2015-05-06 14:22:21 -07:00
Muzaffar yousaf
0ca9f9667a
Merge pull request #7810 from edx/muzaffar/tnl1261-studio-prview
...
Enable unit preview by default.
2015-05-06 21:06:49 +05:00
Ben Patterson
259092696e
Merge pull request #7931 from edx/benp/chrome-add-user-to-team
...
Bok-choy on chrome: fix sequence for adding user to team.
2015-05-06 11:58:08 -04:00
