Commit Graph

129 Commits

Author SHA1 Message Date
Eric Fischer
a9a3fabfe8 Bulk Email Multiselect (#12301)
TNL-4356

Allows multiple bulk email targets to be specified at once.

-The previous "All" option has been split into "Staff" and "Learners"
-The backend changes made here lay the groundwork for cohort emailing
-The data migration, 0005, is somewhat large and requires deploy attention
-Tests have been updated
-Numerous safe-commit-linter fixes are included
2016-05-26 14:22:04 -04:00
Chris Rodriguez
96ca09f45c Membership page label additions and fixes 2016-05-09 12:32:46 -04:00
Clinton Blackburn
868d962002 Merge branch 'release' into release-2016-05-03-conflict 2016-05-04 20:01:29 -04:00
Chris Rodriguez
433a9deff6 Overriding display table-cell on instructor dashboard 2016-05-03 11:50:28 -04:00
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled.
TNL-4393
2016-05-02 14:25:25 -04:00
Chris Rodriguez
2a4e141e0e LMS: fixing skip links and adding a11y tests 2016-02-17 07:46:42 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
clrux
d8423a9018 Merge pull request #10914 from edx/clrux/ac-178
LMS: addressing contrast on the Instructor dashboard
2015-12-16 11:08:49 -05:00
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
asadiqbal
9a01078088 SOL-1455 enhancement 2015-12-11 14:56:43 +05:00
Saleem Latif
3134a76118 Revised Generate Certificates Section and added Certificate Generation history UI. 2015-12-10 16:26:19 +05:00
Chris Rodriguez
3eab4482e1 LMS: addressing contrast on the Instructor dashboard 2015-12-09 13:17:15 -05:00
asadiqbal
dfd9b463f0 SOL-1455 2015-12-08 17:51:46 +05:00
asadiqbal
7c68d80c67 SOL-1417 2015-11-30 14:40:08 +05:00
Saleem Latif
764ceb00c8 Cert Exceptions: View and Edit Exception list 2015-11-25 10:02:52 +05:00
Saleem Latif
094ed32176 Added ability to regenerate certificates from Instructor Dashboard 2015-11-10 15:14:55 +05:00
Matt Drayer
fc77a6eae7 Merge pull request #10363 from edx/saleem-latif/SOL-1315
SOL-1315: Add Cert Exception UI on Instructor Dash
2015-11-03 10:09:19 -05:00
Saleem Latif
99bd47e9a8 Add Cert Exception UI on Instructor Dash 2015-11-03 12:52:22 +05:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Brian Talbot
b815a86e8a Comprehensive Theming: re-organizing/minor simplifying of existing LMS Sass variables 2015-09-17 15:40:32 -04:00
Muhammad Shoaib
2ee10a6c1d fixed the allowances table css issue in instructor dashboard 2015-09-09 19:22:41 +05:00
Muhammad Shoaib
3bbd021a73 MAYN-122
added the scrolling for the registration_code_generation modal dialog box.
2015-09-03 18:12:51 +05:00
Muhammad Shoaib
0e9ed196c7 PHX-112 css styling for proctoring tab student attempts in instructor dashboard 2015-08-24 15:43:40 +05:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration
Integration of Proctoring into the LMS
2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Chris Dodge
c1a065247e fix various style regressions on eComm tab of Instructor dashboard 2015-08-13 17:16:01 -04:00
muhammad-ammar
69450fce47 create a new team
TNL-1899
2015-08-05 17:55:26 +05:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00
Muhammad Shoaib
4dff8ecf09 SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes 2015-06-03 14:46:01 -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
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard.
TNL-1256
2015-03-23 14:28:22 +05:00
Muhammad Ammar
70efd28483 Changes after Andy's Review 2015-03-23 09:21:21 +05:00
Muhammad Ammar
3ce494f5c5 Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab
TNL-1268
2015-03-23 09:21:15 +05:00
muhammad-ammar
0ebd8c29b0 Allow Instructor To Rename Cohorts And Set Cohort Assignment Method
TNL-181
2015-03-23 09:10:59 +05:00
Will Daly
940f892290 ECOM-1140: Instructor dashboard example certificates
Allow global staff to generate example certificates
on the instructor dashboard.

Allow global staff to enable/disable self-generated
certificates for a course.
2015-03-06 13:20:48 -05:00
Awais Qureshi
22af2b75af ECOM-890: Update invoice data model.
ECOM-891: Allow tracking of invoice transactions.

Authors: Awais Qureshi and Aamir Khan
2015-02-03 13:27:40 -05:00
stephensanchez
fbbe307f17 Small css changes to the ecommerce tab 2015-01-27 18:47:16 +00:00
Andy Armstrong
ac58ebf7da Rename 'cohort groups' to just 'cohorts' 2015-01-15 10:33:48 -05:00
Chris Rodriguez
e2f7f343bd Fixing padding issues 2015-01-15 10:33:47 -05:00
Chris Rodriguez
54a8a4fccb Addressing items in the latest PR; includes RTL-ifying all SCSS 2015-01-15 10:33:47 -05:00
Andy Armstrong
fc5b94eeeb Address most of Christina's code review comments 2015-01-15 10:33:46 -05:00
Andy Armstrong
b77e65cdc2 Assign cohorts to groups in the instructor dashboard
TNL-653
2015-01-15 10:33:46 -05:00
Chris
9b85ac1f12 UX for associating content groups with cohorts in the instructor dashboard. 2015-01-15 10:33:46 -05:00
Muhammad Shoaib
10f8d8c097 WL-135 added the migration for the expiration_date field in the coupons model
added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart

added expiration date in the coupons list in the ecommerce page

added the unit tests and jasmine tests

fix the quality issues and rebased with master

regenerated the migration file with a different number

i18n and verified te course mode

changes suggested by  stephan
2015-01-09 19:14:48 +08:00
Marco Morales
7d110a86d4 cleanup to PR feedback for shoppingcart and instructor2 scss partials 2015-01-05 18:57:58 -05:00
Marco Morales
38b7e4cc50 SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions. 2015-01-05 17:30:13 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File.
TNL-735
2014-12-10 09:23:04 -05:00
chrisndodge
f7f9bec6ea Merge pull request #5774 from edx/cdodge/shopping-cart-touchups
Cdodge/shopping cart touchups
2014-12-04 14:02:19 -05:00
Waheed Ahmed
c2c40eba1b Fixed instructor dashboard tooltip far away issue.
TNL-558
2014-12-04 12:08:13 +05:00
Muhammad Shoaib
cd30164b5f Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 2014-12-04 01:11:49 -05:00