Commit Graph

2939 Commits

Author SHA1 Message Date
Frances Botsford
883e9061b2 fix verification widget layout on dashboard 2015-05-26 13:00:41 -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
marjev
f5b166f120 (SOL-837) Added RTL support to payment page 2015-05-22 16:42:01 +02: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
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
Marco Morales
b6164b5702 Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup
Complete Printing Cleanup
2015-05-15 15:42:36 -04: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
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
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
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
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
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
Will Daly
05baddb2a6 Add remember me checkbox back to the combined login/registration page 2015-04-30 17:13:03 -04:00
Jim Abramson
70d837ab62 Merge pull request #7777 from edx/jsa/baskets
use commerce api v2.
2015-04-27 22:30:37 -04:00
jsa
efde11d552 Use ecommerce api v2.
XCOM-213 XCOM-214
2015-04-27 16:57:17 -04:00
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search
Feature/dashboard search
2015-04-27 09:46:35 -04:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
Chris Rodriguez
dda656aeea RTL-ifying the due icon 2015-04-24 08:42:33 -04:00
cahrens
6e47664cfd Merge branch 'release' 2015-04-22 12:27:52 -04:00
Brian Talbot
ded6c4dbb0 fix: resolving edx.org and Open edX breakpoint clash
* simplifying edx.org breakpoints to use min-width
* creating -bp-* centric Sass variables
* converting all existing edx.org centric media queries to use new Sass variables

ECOM-1457
2015-04-21 16:44:32 -04:00
Chris Rodriguez
f1d2231146 RTL-ifying the sidebar title in Handouts 2015-04-21 15:39:41 -04:00
Usman Khalid
a14e6f0a7e Accessibility tweaks for account settings and profile pages.
TNL-1660
2015-04-21 19:42:50 +05:00
muhammad-ammar
e50a641673 Accessibility changes for Account Settings and Learner Profile pages 2015-04-17 17:23:17 -04:00