Commit Graph

30287 Commits

Author SHA1 Message Date
jsa
3dede202f1 Implement student-initiated refunds for external commerce service.
XCOM-306
2015-05-21 11:37:37 -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
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
Tyler Nickerson
df80a8d6e4 Merge pull request #8075 from edx/tyler-jwt-fullname
LMS now passes the full name of users to the ecommerce api client
2015-05-19 09:15:04 -04:00
Ben Patterson
e9164a72ec Merge branch 'release' 2015-05-19 07:33:32 -04: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
Sarina Canelake
b1227c1dd2 Merge pull request #8095 from edx/sarina/cleanup-styles
Remove unused css
2015-05-18 19:29:27 -04:00
Sarina Canelake
9eb565ec2f Remove unused css 2015-05-18 16:58:10 -04:00
Marco Morales
28072773a9 Merge pull request #8092 from edx/marco/dashboard/rebase-cleanup
BUG - remove username label from dashboard sidebar #UX-2153
2015-05-18 16:53:50 -04:00
Nickersoft
5359ff9d71 Passing full name to E-Commerce API 2015-05-18 16:12:10 -04:00
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
Marco Morales
e121aa4783 updated dashboard html to remove rebase bug which displayed the username to learners 2015-05-18 13:55:56 -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
Gabe Mulley
63b0378520 Ensure GA events have a course label if available 2015-05-18 13:25:12 -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
Renzo Lucioni
2ba5d483fc Merge pull request #8078 from edx/release
Merging hotfix into the RC
2015-05-15 17:40:05 -04:00
Renzo Lucioni
85e8fa5dbc Merge pull request #8074 from edx/hotfix/2015-05-15
Refine error page regexes such that they only match 404 and 500
2015-05-15 16:28:34 -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
Renzo Lucioni
c940b61531 Refine error page regexes such that they only match 404 and 500 2015-05-15 14:05:11 -04:00