Commit Graph

12296 Commits

Author SHA1 Message Date
Michael LoTurco
45175494ed adjust bug-causing variable name 2018-03-28 08:42:59 -04:00
Troy Sankey
81ed96bc88 bump django to 1.11.11 2018-03-27 15:55:07 -04:00
hamzamunir7300
e30e12e83d Merge pull request #17797 from edx/LEARNER-4766
Footer Chinese Language Dupluication Issue
2018-03-27 19:34:03 +05:00
Hamza Munir
90f674e358 Footer Chinese Language Dupluication Issue
Removed the duplicate footer ICP LICENSE.

LEARNER-4766
2018-03-27 19:19:37 +05:00
Ahsan Ulhaq
ea9a679c27 small nit 2018-03-27 16:59:07 +05:00
Ahsan Ulhaq
7428b2fe94 Discovery for pdf cert generation
LEARNER-4520
2018-03-27 15:23:46 +05:00
Nimisha Asthagiri
e5b9452e76 Merge pull request #17385 from mitodl/hack18_instructor_django_plugin
Changed 'instructor' django app to follow plugin pattern
2018-03-26 15:20:47 -06:00
Brittney Exline
956b627501 ENT-934 Remove deprecated models in verify_student
These models say they are to be fully removed in Hawthorn, so let's make it happen!
2018-03-26 14:48:34 -04:00
Michael LoTurco
537b6652c2 adds entitlment tool to support tool home 2018-03-26 12:53:22 -04:00
Gavin Sidebottom
7626d4abf0 Changed 'instructor' django app to follow plugin pattern 2018-03-26 10:44:41 -04:00
Albert (AJ) St. Aubin
7c6c2a1664 Merge pull request #16757 from appsembler/omar/search-for-courses-api
Add search for courses API to allow building a mobile native search view
2018-03-26 07:31:36 -04:00
Mike
0e2b667bb4 Added ability to change header and content of static pages in two ways.
1. Using the pageheader and pagecontent block names.
2. Setting SiteConfiguration settings for each individual html page.

Co-authored by: Tomasz Gargas <tomasz@opencraft.com>
2018-03-24 21:37:09 +01:00
Alex Dusenbery
10be8bcd4e add entitlement support creation and reissue
Learner-3925
2018-03-23 17:10:46 -04:00
McKenzie Welter
fa90d6e651 Merge pull request #17640 from edx/McKenzieW/learner-4400
Move support actions to existing entitlement api
2018-03-23 10:37:52 -04:00
hamzamunir7300
e9d6c8537c Merge pull request #16395 from edx/footer-design-non-bootstrap
Footer Design Implementation without using bootstrap WIP
2018-03-23 08:35:49 +05:00
Hamza Munir
a69ecd83d5 Footer Design Implementation without using bootstrap WIP
The New footer design implementation without using bootstrap. Using flexbox
creating new classes to assign different widths in different screen breakpoints.

LEARNER-2312
2018-03-23 02:37:59 +05:00
McKenzie Welter
e5d1f04a89 move support actions to existing entitlement api 2018-03-22 16:11:46 -04:00
Rabia Iftikhar
32863e4463 Merge pull request #17730 from edx/ri/EDUCATOR-2428-certificate-delivered-column
EDUCATOR-2428 add acceptance criteria for certificate delivered column in grade report
2018-03-23 00:26:44 +05:00
Bill Filler
305bd7dd4b Merge pull request #17650 from edx/ibrahimahmed443/WL-1473-add-fields-instructor-dashboard
Ibrahimahmed443/wl 1473 add fields instructor dashboard
2018-03-22 09:56:43 -04:00
rabiaiftikhar
0f63a2727e EDUCATOR-2428 add acceptance criteria for certificate delivered column in grade report 2018-03-21 21:31:07 +05:00
Michael Terry
a576d682ff Improve password complexity messaging
Send password form instructions that include password complexity and
also send error messages back that include all parts of the
complexity instead of single parts at a time.

And clean up phrasing to be more consistent.
2018-03-21 10:29:53 -04:00
Giulio Gratta
0ffe133f68 Encodes staff profile names as they can be unicode 2018-03-20 14:28:16 -07:00
Eric Fischer
f1fa7b8e06 pass title/label to LTI consumers 2018-03-20 12:51:39 -04:00
Michael Terry
a0c6f66252 Check policy during pw live validation
The password live validation was not considering the full password
complexity settings. This branch hooks that up and refactors the
various ways to validate a password to all go through the same code
path.

LEARNER-4502
LEARNER-4504
2018-03-16 09:23:43 -04:00
Ibrahim
2bb790680a add role and expose reason field to Instructor Dashboard Manual Enrollment
WL-1473
2018-03-16 15:47:53 +05:00
Robert Raposa
0d60d85e2f Merge pull request #17688 from edx/robrap/update-waffle-docs
Add docs for handling default values.
2018-03-15 17:26:02 -04:00
Michael LoTurco
2bebb88cb3 Merge pull request #17665 from edx/MLoTurco/learner-3925-table
Add entitlement table to support app

Learner-3925
2018-03-15 14:12:12 -04:00
Michael LoTurco
be1b800475 Add Table to entitlement support app
Learner-3925
2018-03-15 13:20:31 -04:00
Robert Raposa
c7268f2293 Remove flaky test and commented-out tests.
Presumably the commented-out tests were also flaky at one point, and
the current process is to remove flaky tests.

EDUCATOR-2512
2018-03-15 09:59:06 -04:00
attiyaishaque
b239d7b8d7 Allow staff to see all units when viewing the course outline. 2018-03-15 15:02:36 +05:00
Tasawer Nawaz
4912888168 stop using deprecated single item basket view
LEARNER-4428
2018-03-14 20:29:51 +05:00
Michael LoTurco
3e94c7573b Add Store and Search Component
Add search component to entitlement support app,
requires the addition of a Provider and store to
the EntitlementSupportPage componenet and wraps search
in a Main component to contain additional pieces of the
page as added

Learner-3925
2018-03-13 11:03:18 -04:00
Michael LoTurco
d4df1ad75a Merge pull request #17582 from edx/MLoTurco/learner-3925-feature-view-and-template
Add EntitlementSupportView, Template, and base react element
2018-03-12 11:00:42 -04:00
Awais Jibran
e73513f99b Merge pull request #17660 from edx/aj/do-not-include-currency-in-audit-emails
Do not show Currencies: usd in bulk email task history Sent To:
2018-03-12 15:55:11 +05:00
Michael LoTurco
3b928e3e99 Adds EntitlementSupportView, Template, and base react element 2018-03-09 14:01:12 -05:00
Awais Jibran
5eb176039c Do not show Currencies: usd in bulk email task history Sent To:
This is a bad course team experience that when they send email to Audit track learners, `send to` includes currency (usd) which is set default. This PR fixes the bug and will not include currency with `audit` or `honor` enrollment tracks.
EDUCATOR-2489
2018-03-09 21:06:50 +05:00
Michael LoTurco
0d07a89b78 Merge pull request #17583 from edx/MLoTurco/learner-3925-feature-client-api
Add Client API

Learner-3925
Learner-4388
2018-03-08 14:17:14 -05:00
Feanil Patel
9bddcf5546 Merge pull request #17652 from edx/feanil/remove_flaky_lti_tests
Feanil/remove flaky lti tests
2018-03-08 13:17:43 -05:00
Michael LoTurco
a117f6fa42 Add client api for entitlement support page
Learner-3925
Learner-4388
2018-03-08 12:46:00 -05:00
Feanil Patel
d76ad8eb4b Remove LTI tests that build on top of flaky permission alert tests. 2018-03-08 11:24:33 -05:00
Feanil Patel
00ccc879bd Remove flaky lti scenario. 2018-03-08 11:24:33 -05:00
Matt Tuchfarber
4c7dc0b250 Add bundle key to program purchase button
In order for a program to be tracked as a bundle in ecommerce and GA
a bundle key must be added to the basket URL. This adds that key to
the purchase button on the program marketing page.
2018-03-07 15:40:51 -05:00
Bill DeRusha
e213d84c5a Merge pull request #16267 from open-craft/haikuginger/allowed-enrollment-signal
Switch to using a signal to manage pending enrollments when a user is activated or changes their email address
2018-03-07 11:58:11 -05:00
Michael LoTurco
335bf4b035 Merge pull request #17575 from edx/MLoTurco/learner-3925-feature-utils
Add utils for EntitlementSupportApp
2018-03-07 10:37:10 -05:00
Jose Antonio Gonzalez
99f6d78def customize course info title 2018-03-07 10:12:08 +02:00
Michael LoTurco
a4f294b441 Add convenience functions for Entitlement Support Tool
Adds getter for ecommerce order dashboard url and for getting
the entitlement support details reasons.

Learner-3925
2018-03-06 17:49:08 -05:00
Jesse Shapiro
1f5c94d9b6 Process pending enrollments when a user is activated or changes their email address 2018-03-06 16:38:00 +02:00
Mushtaq Ali
36483f938d Export video transcripts - EDUCATOR-1789 2018-03-06 15:25:46 +05:00
noraiz-anwar
0e3af804ec update edx-proctoring package 2018-03-01 01:42:45 +05:00
David Ormsbee
f5a4ad20aa Merge pull request #17451 from mitodl/fix_outline_aq_course_structure_api
Fixed edX block structure api to load override data
2018-02-28 09:39:09 -05:00