Commit Graph

30272 Commits

Author SHA1 Message Date
Greg Price
e124fb0643 Merge pull request #8059 from edx/gprice/discussion-api-thread-list-refactor
Refactor Discussion API thread list
2015-05-18 16:09:27 -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
Ben Patterson
3679396019 Merge pull request #8093 from edx/benp/test-user-mgmt-skip
Skip flaky test. SOL-618.
2015-05-18 14:58:54 -04:00
Christine Lytwynec
081b7ca750 Merge pull request #8031 from edx/clytwynec/clean-up-all-tests-script
clean up all-tests.sh script
2015-05-18 14:58:28 -04:00
AlasdairSwan
d1df7b1556 Merge pull request #7986 from edx/alasdair/ECOM-1547-footer-2015
Alasdair/ecom 1547 footer 2015
2015-05-18 14:55:06 -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
8fbaa66d33 Make courseware licenses show up in Studio XBlock previews 2015-05-18 14:35:40 -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
Greg Price
7309352ef7 Refactor discussion API to use DRF serializer
This will make it easier to add the creation and update interfaces.
2015-05-18 14:03:02 -04:00
Greg Price
565cdb8edf Move Discussion API access control checks
The checks are now within the Python API instead of the DRF view. This
will be necessary for certain operations (like fetching/editing threads)
because the relevant course cannot be known until the thread is fetched
from the comments service. This commit updates the existing endpoints to
fit that pattern.
2015-05-18 14:03:02 -04:00
AlasdairSwan
f81d88e394 ECOM-1547 created new template and Sass file for new footer. Wrapped it in a feature flag and updated previously named footer-edx-new.html to footer-edx-v2.html to better track/name updates to the footer going forward.
ECOM-1547 removed data-updated attributes from body
ECOM-1548 added JS file that inits analytics event listener and makes ajax call to API to get footer and HTML and add it to the DOM
ECOM-1547 code review cleanup
ECOM-1547 rebase and Sass appraoch update after @talbs the IE9 killer slayed the mighty beast.
ECOM-1547 updated file names and added comments in light of @talbs review of PR
ECOM-1547 update to social media link styles and nav link order
ECOM-1547 updated SOCIAL_MEDIA_FOOTER_NAMES if ENABLE_FOOTER_V3 is true
ECOM-1547 added translations to screenreader text
ECOM-1547 fixed test and renamed files in line with @talbs's pending PR
ECOM-1547 cleaned up file naming
2015-05-18 13:43:07 -04:00
chrisndodge
fe3326d8f2 Merge pull request #8083 from edx/muhhshoaib/MAYN-68-total-in-instrucor-dashboard-doesnt-include-multi-seats-purchases
MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases.
2015-05-18 12:05:03 -04:00
David Baumgold
ffd5c1fcd8 Merge pull request #8071 from edx/db/remove-sample-feature-flag
The SAMPLE feature flag is not used anywhere
2015-05-18 11:20:58 -04:00
Brian Talbot
11ca11a411 Merge pull request #8035 from edx/talbs/sass+css-file-names
LMS/Studio: Sync Up Sass/CSS/Pipeline Names
2015-05-18 10:43:17 -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
8ce222ed74 Add Richard Moch to AUTHORS 2015-05-18 13:17:04 +00:00
Richard Moch
3e0342cbb3 i18n lon-capa problem explanation title 2015-05-18 13:16:59 +00:00
Muhammad Shoaib
392937d9e1 MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases. 2015-05-18 15:51:19 +05:00
Awais Qureshi
41363ead93 Merge pull request #8020 from edx/aamir-khan/ECOM-1471-hidden-text-behind-cam-issue
ECOM-1471 Hiding the text.
2015-05-18 11:40:10 +05:00
swdanielli
4f531f6fbc Merge pull request #7750 from edx/danielli/recommender_xml
fix recommender olx parsing
2015-05-15 19:30:08 -04:00
Marco Morales
b6164b5702 Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup
Complete Printing Cleanup
2015-05-15 15:42:36 -04:00
David Baumgold
8a7c2d66d8 Merge pull request #8068 from edx/db/remove-mathplayer-message
Remove MathPlayer message
2015-05-15 15:30:24 -04:00
Christine Lytwynec
8f22b51117 Merge pull request #8056 from edx/clytwynec/TE-868
use mock_open for paver quality tests
2015-05-15 15:12:01 -04:00
David Baumgold
90daffe33d Merge pull request #8057 from edx/db/reorg-main-html-imports
Reorganize imports in main HTML templates for Studio and LMS
2015-05-15 15:00:34 -04:00
Diana Huang
b147117d22 Merge pull request #8055 from edx/diana/team-advanced-setting
New teams advanced setting
2015-05-15 14:55:34 -04:00
Shrhawk
dd20badcf7 Merge pull request #7996 from edx/shr/bug/TNL-2119-Unicode-error-in-templating-bulk-course
bulk_email fix course_image_unicode name
2015-05-15 23:31:01 +05:00
Andy Armstrong
358aa7754b Add "Teams Configuration" advanced setting 2015-05-15 14:13:41 -04:00
swdanielli
09b7fee38e update xml
the xml parsing was out-of-date and we fix it
2015-05-15 14:11:02 -04:00
Ahsan Ulhaq
e7a348d6d9 Merge pull request #8062 from edx/ahsan/AC-108-no-role-inside-courseware-lms
No role inside of courseware
2015-05-15 13:23:30 -04:00
Sarina Canelake
a01e92c2e8 Merge pull request #8072 from edx/sarina/20150515-translations-update
Update translations (autogenerated message)
2015-05-15 13:21:34 -04:00
Sarina Canelake
87954cd1e0 Update translations (autogenerated message) 2015-05-15 13:20:53 -04:00
David Baumgold
2e1534d75a The SAMPLE feature flag is not used anywhere 2015-05-15 12:49:04 -04:00
Brian Talbot
99a3053918 Merge pull request #8067 from edx/talbs/lms-update-browser-links
LMS: Keeping Browser Linkage Fresh to Death
2015-05-15 12:43:06 -04:00
David Baumgold
85839b5801 Reorganize imports in main HTML templates for Studio and LMS 2015-05-15 12:34:04 -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
David Baumgold
c3095235ff Remove MathPlayer message 2015-05-15 11:23:30 -04:00
Brian Talbot
76fa485230 LMS: updating recommended/modern browser links 2015-05-15 11:22:17 -04:00
Christine Lytwynec
4aceb0259b add more detailed comment about exit status 2015-05-15 11:09:55 -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
Brian Talbot
3e247cd63a Merge pull request #8061 from edx/talbs/update-ie-conditionals
LMS/Studio: Update Use of IE Conditional Comments
2015-05-15 10:16:58 -04:00
Muzaffar yousaf
ab912fa811 Merge pull request #7956 from edx/muzaffar/tnl2047-profile-tweaks
Learner Profile page tweaks.
2015-05-15 19:15:20 +05:00
Christine Lytwynec
71bc1476e8 start paver quality tests with clean paver task environment 2015-05-15 10:08:23 -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