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
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
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
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
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
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
Marco Morales
b6164b5702
Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup
...
Complete Printing Cleanup
2015-05-15 15:42:36 -04:00
muzaffaryousaf
378cf9bb7a
Sending preferences and accounts data to template.
...
Fixing the pencil icon issue.
TNL-2047
2015-05-15 17:06:04 +05:00
muzaffaryousaf
2d08d669ca
Learner Profile page tweaks.
...
TNL-2047
2015-05-15 17:06:02 +05:00
Brian Talbot
c043e8dcf7
LMS: removing now unnecessary IE-specific _ie.scss Sass partial
...
* since IE9 and below are formally not supported any longer
* since most of the CSS rules are for UI that has been removed or that is supported by modern browsers
2015-05-14 14:04:53 -04:00
Brian Talbot
2899885711
LMS: renaming Sass/CSS files for consistency and clarity
2015-05-14 13:14:54 -04:00
Ben McMorran
6ed752e5de
Enable HTML in note tags and support highlighting
2015-05-14 17:04:42 +00:00
Christina Roberts
161d89a723
Merge pull request #8045 from edx/clrux/new-extend-for-outline
...
Moving no-outline use to be more global
2015-05-14 12:54:43 -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
Brian Talbot
4f9c50e226
Merge pull request #8047 from edx/talbs/fix-lms-dupe-sass-base
...
LMS: removing redundant Sass base/base partial call in build compile
2015-05-14 12:30:12 -04:00
David Baumgold
930b4f6a7a
Remove outdated comment referencing IE9 rule limit
2015-05-14 11:56:14 -04:00
Chris Rodriguez
d5d7fbf786
Moving no-outline use to be more global
2015-05-14 11:48:37 -04:00
cahrens
abd25b8b45
Add a "tags" view in student notes.
...
TNL-1926
2015-05-14 11:36:48 -04:00
Brian Talbot
8ad01535b5
LMS: removing redundant Sass base/base partial call in build compile
2015-05-14 10:47:05 -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
Awais
f31746e76c
ECOM-1471 Hiding the text.
2015-05-13 13:44:55 +05:00
Brian Talbot
220b8d1cdb
LMS: removing conditional search Sass logic + simplifying _build-*.scss files
2015-05-12 22:13:31 -04:00
Brian Talbot
24673aa128
LMS: moving shared/redundant Sass partial calls to _build-*.scss partials
2015-05-12 22:03:43 -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
Daniel Friedman
9269ec3b00
Add new instructor task for weighted problems
2015-05-12 16:32:00 -04:00
Brian Talbot
898012518b
LMS: removing manual Sass/CSS extend files needed for IE9 and below
2015-05-12 10:36:32 -04:00
Chris Rodriguez
709f86c11b
Addressing RTL inconsistencies on Verification process
2015-05-12 07:20:32 -04:00
Clinton Blackburn
6577bb3bd6
Merge pull request #7950 from edx/clintonb/update-verify-now
...
Updated Take Photo page to include verification requirements
2015-05-07 22:46:28 -04:00
Clinton Blackburn
fc61c292b9
Updated Take Photo page to include verification requirements
...
As part of the unification of verify later/now, the take photo page needs to list the verification requirements.
XCOM-254
2015-05-07 18:14:33 -04:00
Martyn James
2f398559ae
Merge pull request #7845 from edx/mjevtic/SOL-776
...
(SOL-776)(SOL-740)(SOL-532) Prerequisites for course discovery feature
2015-05-07 14:05:38 -04:00
Jim Abramson
56d380c812
Merge pull request #7954 from edx/jsa/xcom-270
...
add custom PayPal payment button and js tests for buttons.
2015-05-07 08:15:34 -04:00
Clinton Blackburn
19d0eda60c
Merge pull request #7952 from edx/clintonb/paypal-receipt
...
Hiding Billing Address for Orders without Billing Addresses
2015-05-07 08:07:09 -04:00
marjev
8107073c58
(SOL-776)(SOL-740)(SOL-532) Added setting flags for COURSE DISCOVERY feature; Exposed course search input as well as the course result page; Added flag for limiting the number of course cards on the homepage;
2015-05-07 08:57:04 +02:00
zubair-arbi
ede1c70ed8
Merge pull request #7944 from edx/zub/bugfix/ecom-1470-photo-verification-heading
...
change photo reverification page heading from h3 to h1
2015-05-07 11:52:54 +05:00
jsa
a5c9d0b0f3
add custom PayPal payment button and js tests for buttons.
...
XCOM-270
2015-05-06 19:01:56 -04:00
Clinton Blackburn
7c75b34baf
Hiding Billing Address for Orders without Billing Addresses
...
Some orders, specifically those paid for with PayPal, do not have a billing address. This information will not be rendered in such cases.
2015-05-06 15:43:44 -04:00
zubair-arbi
b393f167fe
change photo reverification page heading from h3 to h1
...
ECOM-1470
2015-05-06 17:47:00 +05:00
Muzaffar yousaf
77d445c962
Merge pull request #7787 from edx/muzaffar/tnl2051-profile-image-hover
...
Adding hover state to image profile for accessibility.
2015-05-06 14:11:04 +05:00
Marco Morales
6426e28846
Merge pull request #7591 from jolyonb/jbloomfield/printing-links
...
Print CSS: Fixing Links
2015-05-05 13:35:25 -04:00
muzaffaryousaf
0d2e2660e2
Adding hover state to image profile for accessibility.
...
TNL-2051
2015-05-05 21:01:47 +05:00
Jolyon Bloomfield
bf4a1d47a9
Fixing page size print CSS (rebase commit).
2015-05-05 11:45:56 -04:00
Jolyon Bloomfield
d4a5bf7490
Fixing links in print media (combined commit for rebase).
2015-05-05 11:39:37 -04:00
Christina Roberts
31a19c0f63
Merge pull request #7823 from edx/christina/notes-tagging
...
Add tags plugin.
2015-05-04 20:56:52 -04:00
cahrens
8e636677ff
Display tags in note template.
2015-05-04 16:00:23 -04:00
cahrens
5fe384ca2b
Add tags plugin.
...
TNL-1924
2015-05-04 16:00:18 -04:00
Marco Morales
095a1b617b
lightened harshness of dashboard modal styling
2015-05-04 14:46:14 -04:00
Clinton Blackburn
1a1fe56b29
Added Oscar-Compatible Receipt Page
2015-05-02 00:18:05 -04:00
Will Daly
f6e8ce24af
Merge pull request #7879 from edx/will/restore-remember-me
...
Add remember me checkbox back to the combined login/registration page
2015-05-01 09:57:45 -04:00
