Commit Graph

4446 Commits

Author SHA1 Message Date
AlasdairSwan
cc93dcab32 Merge pull request #8247 from edx/alasdair/ECOM-1547-footer-v3-style-update
ECOM-1339 minor CSS tweaks for the footer. It now extends the full wi…
2015-05-29 09:10:30 -04:00
dino-cikatic
0d975674c2 Merge pull request #8186 from edx/dcikatic/SOL-839
SOL-839 label cursor and receipt internationalization
2015-05-29 14:43:22 +02:00
Dino Cikatic
077ea49b58 SOL-839 confirmation and receipt page internationalization 2015-05-29 13:49:19 +02:00
Ahsan Ulhaq
361d82adbb Merge pull request #8021 from edx/ahsan/AC-107-calculator-incompatible-aria-role-attribute
calculator incompatible aria role attribute
2015-05-29 02:11:37 -04:00
Ned Batchelder
eb3b8c5ce4 TNL-2269 Compute language direction every time.
The old code would compute the language direction once when the template
was loaded.

TNL-2269
2015-05-28 16:13:59 -04:00
AlasdairSwan
0c7abfbe72 ECOM-1339 minor CSS tweaks for the footer. It now extends the full width of the browser and fixes issues with link hover states. 2015-05-28 15:16:03 -04:00
Will Daly
78ea4d55f4 Merge pull request #8175 from edx/will/footer-api-redux
ECOM-1339 Branding API footer
2015-05-28 11:03:06 -04:00
Will Daly
6af5fc1452 ECOM-1339 Branding API footer
Serve branded footer JSON/HTML/CSS/JS from an API endpoint
in the branding app.  Refactor OpenEdX and EdX.org footer templates
to use the Python version of the API, ensuring that the API
values are consistent with the footer included in main.html.

Detailed changes:

* Added footer API end-point to the branding app.
* Footer API allows the language to be set with querystring parameters.
* Footer API allows showing/hiding of the OpenEdX logo using querystring parameters.
* Deprecate ENABLE_FOOTER_V3 in favor of the branding API configuration flag.
* Move no referrer script into main.html from the edx footer template.
* Rename rwd_header_footer.js to rwd_header.js
* Cache API responses.

Authors:
Awais Qureshi, Aamir Khan, Will Daly
2015-05-28 08:30:45 -04:00
Ahsan Ulhaq
9044e48cad Calculator a11y issues
AC-107
2015-05-28 13:23:22 +05:00
Awais
d0df626685 ECOM-1494 removing code from models. 2015-05-27 16:32:26 +05:00
chrisndodge
99de1c8f48 Merge pull request #7992 from edx/muhhshoaib/SOL-794-generate-detailed-enrollment-report
Muhhshoaib/sol 794 generate detailed enrollment report
2015-05-26 15:57:22 -04:00
Jesse Zoldak
e424ce8a1d Merge pull request #8196 from edx/release
Merge hotfix from release to master
2015-05-26 14:15:09 -04:00
Daniel Friedman
09e1f9ed71 Fix XSS vulnerability in User Profile.
TNL-2248
2015-05-26 13:17:54 -04:00
Muhammad Shoaib
b555c869bf SOL-794 Detailed Enrollment Report
- added the abstract and concrete layers of enrollment report provider
- created a celery task.
-added the button in the e-commerce reports section

added the enrollment data backend

added the payment data and start writing the test cases.

updated the code with the feedback suggestions and wrote some test cases.
- all the downloadable reports are now visible in the ecommerce download section.
Pending instructor tasks is also visible in the ecommerce section

added the fields in the user profile information
changed the report store configuration key
added the new http endpoint for financial reports to add more permissions for finance_admin to access.

fix quality issues

added test cases to check csv content data

rebased with master and resolved conflicts

changed the log messages

added the changes as per code clintonb suggestions during code review

updated the test cases for the finance_admin decorator

changes suggested by clinton.

Created and moved Table level filters to the Custom Manager for the CourseEnrollment model.

ecommerce.js file was loaded twice in the instructor_dashboard.js fixed the issues

added the registration code column in the csv

added the full gender in the csv file

Update data sources and add display name translations for the report columns

fix meta name

Make sure the reports section does not appear on non whitelabel courses

pylint fixes

expand out enumerated values
2015-05-22 15:16:57 -04:00
Marko Jevtić
796541af4f Merge pull request #7987 from edx/mjevtic/SOL-837
(SOL-837) Added RTL support to payment page
2015-05-22 18:31:39 +02:00
marjev
f5b166f120 (SOL-837) Added RTL support to payment page 2015-05-22 16:42:01 +02:00
aamir-khan
7395e8ab67 ECOM-1472: fixed the tab issue for taking photo 2015-05-21 16:44:09 +05:00
Sarina Canelake
c7424dd7ae Supply default url for XQA server 2015-05-19 14:19:04 -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
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
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
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