Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,272 Commits 1 Branch 0 Tags
e124fb0643d2b95dca4156e490c2f1e193d4e458
Commit Graph

4426 Commits

Author SHA1 Message Date
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
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
David Baumgold
8a7c2d66d8 Merge pull request #8068 from edx/db/remove-mathplayer-message 
Remove MathPlayer message
 2015-05-15 15:30:24 -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
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
David Baumgold
85839b5801 Reorganize imports in main HTML templates for Studio and LMS 2015-05-15 12:34:04 -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
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
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
muzaffaryousaf
2d08d669ca Learner Profile page tweaks. 
TNL-2047
 2015-05-15 17:06:02 +05:00
Ahsan Ulhaq
7922858526 No role inside of courseware 
AC-108
 2015-05-15 11:23:34 +05:00
Brian Talbot
aad7c52f41 LMS: updating use of IE-conditional comments 
* to reflect support for IE10 and above
* to only flag IE9 (for emergency's sake) with specific html class attrs
* to remove HTML5 shiv that's not needed for IE10 and above
 2015-05-14 23:34:20 -04:00
Brian Talbot
2899885711 LMS: renaming Sass/CSS files for consistency and clarity 2015-05-14 13:14:54 -04:00
cahrens
abd25b8b45 Add a "tags" view in student notes. 
TNL-1926
 2015-05-14 11:36:48 -04:00
AlasdairSwan
8d0ac31e38 ECOM-986 updated class being used by JS for carats to use classes being loaded on the page via lms-style-course-vendor.css 2015-05-13 13:38:29 -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 Qureshi
b8efb5423a Merge pull request #7951 from edx/awais786/ECOM-1531-fake-page-ssecure 
ECOM-1531 adding the fake-page for softwar secure.
 2015-05-13 12:02:32 +05: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
Awais
58b7e7fb33 ECOM-1531 adding the fake-page for softwar secure. 2015-05-12 14:21:49 +05:00
Aamir
17222bfa7c Merge pull request #7864 from edx/aamir-khan/ECOM-1476-send-email-on-reverification 
ECOM-1476: sending email on software secure response initial work
 2015-05-08 11:22:49 +05: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
aamir-khan
a975b8384c ECOM-1476: sending email on software secure response initial work 2015-05-07 18:56:49 +05: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
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
Clinton Blackburn
5e68753101 Deprecated Verify Later Page 
We are moving toward a single workflow for verification.
 2015-05-05 16:42:27 -04:00
muzaffaryousaf
0d2e2660e2 Adding hover state to image profile for accessibility. 
TNL-2051
 2015-05-05 21:01:47 +05:00
Ahsan Ulhaq
702663d978 Merge pull request #7889 from edx/ahsan/AC-102-forums-vote-tracking-missing-spaces-awkward-reading 
Forums vote tracking missing spaces causes awkward reading
 2015-05-05 05:48:59 -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
Ahsan Ulhaq
95b2b82896 Forums vote tracking missing spaces causes awkward reading 
AC-102
 2015-05-02 19:52:20 +05:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Ahsan Ulhaq
1e5cbbefe1 Merge pull request #7844 from edx/ahsan/AC-97-aria-describedby-broken-id-ref-sign-in-page 
aria-describedby has broken IDref on Sign in email form
 2015-04-30 11:04:49 -04:00
Ahsan Ulhaq
6d451ccd47 change three line structure to one line 2015-04-30 18:13:27 +05:00
Ahsan Ulhaq
3ec676e61b change indentaion and add new line 2015-04-30 18:13:27 +05:00
Ahsan Ulhaq
734ce5e2fb aria-describedby has broken IDref on Sign in email form 
AC-97
 2015-04-30 18:13:27 +05:00
Awais
19ab698f4c ECOM-1284 enabling re-generate certs. 2015-04-30 14:15:33 +05:00
Will Daly
50e9b43512 Merge pull request #7826 from edx/will/update-reverification-flow-copy 
Update copy on reverification flow.
 2015-04-29 10:38:54 -04:00
Sarina Canelake
aed9ba8a38 Merge pull request #7818 from mcgachey/mcgachey-lti-render 
[LTI Provider] Wiring up LTI views to the courseware template
 2015-04-29 10:34:09 -04:00