Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Michael Youngstrom
eea527e896 Merge pull request #17673 from edx/youngstrom/test-improvements 
Bokchoy test fixes for firefox upgrade
 2018-03-14 09:51:53 -04:00
Sylvia Pearce
7185a78dc6 Merge pull request #17679 from edx/sylvia/DOC-3895 
Update message for content with prerequisites
 2018-03-14 09:32:08 -04: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
Sylvia Pearce
9999715ebe Updated message for content with prerequisites 2018-03-12 18:03:02 -04:00
Stuart Young
53fe34615e Test fixes to prepare for firefox upgrade on jenkins 2018-03-12 15:40:25 -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
Troy Sankey
3f1f524953 Revert "PLAT-1957 Better memory leak diagnostic tooling" 
This reverts commit a022461891.

Reverts edx/edx-platform#17486
 2018-03-08 13:16:34 -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
Jeremy Bowman
a30ae80ef8 Merge pull request #17486 from edx/jmbowman/PLAT-1957 
PLAT-1957 Better memory leak diagnostic tooling
 2018-03-07 18:59:29 -05:00
Jeremy Bowman
a022461891 PLAT-1957 Better memory leak diagnostic tooling 2018-03-07 16:31:26 -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
sanfordstudent
b57b813f1c Merge pull request #17467 from edx/yro/EDUCATOR-2296 
Add resume button to LMS header dropdown
 2018-03-07 12:21:27 -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
Gregory Martin
a5d8cbb8e9 Add "last completed block" to dropdown 2018-03-07 10:58:59 -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
Alessandro Roux
fd48e3848e Merge pull request #17418 from edx/resume-button-on-dashboard 
EDUCATOR 2190: Course card resume buttons on the student dashboard.
 2018-03-02 15:59:41 -05:00
sandroroux
3f22ce3031 These changes add a resume button to course cards on the student dashboard. 2018-03-02 14:52:30 -05:00
Michael Terry
c9318c3e51 Convert learner_dashboard to es2015 2018-03-02 08:57:34 -05:00
Ahsan Ulhaq
3c450ce7d9 Update min length of financial assisstance 
LEARNER-2945
 2018-03-02 15:39:04 +05:00
Sofiya Semenova
a20b9f88c8 Merge pull request #17578 from edx/sofiya/course-outline-styling 
Course outline styling
 2018-03-01 15:30:39 -05:00
Sofiya Semenova
8266c640d5 Course outline styling 2018-03-01 12:07:18 -05:00
Tasawer Nawaz
1d41e14574 Merge pull request #17525 from edx/tasawer/learner-4068/make-oauth-authorization-page-responsive 
Fix css issues on oauth authorization page to make it responsive
 2018-03-01 17:58:15 +05:00
Noraiz Anwar
735158ac8c Merge pull request #17570 from edx/noraiz/EDUCATOR-2314-release 
update edx-proctoring package
 2018-03-01 11:47:33 +05:00
noraiz-anwar
0e3af804ec update edx-proctoring package 2018-03-01 01:42:45 +05:00
Jeremy Bowman
b3ac2b1b06 PLAT-1976 Add waffle switch to block auth_user write attempts 2018-02-28 13:13:06 -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
Bill DeRusha
071594392b Merge pull request #17384 from edx/bderusha/zendesk-plugin 
zendesk proxy plugin
 2018-02-26 17:06:56 -05:00
Bill DeRusha
44469a9ba4 Merge pull request #17386 from edx/bderusha/generic-zendesk 
Create generic support ticket interface (remove zendesk specific code)
 2018-02-26 15:21:37 -05:00
Bill DeRusha
9abec119fc Merge pull request #17503 from edx/bderusha/sp-cleanup 
Removed self-paced feature flag from code
 2018-02-26 14:42:53 -05:00
Bill DeRusha
9611284df0 zendesk proxy plugin 2018-02-26 14:20:32 -05:00
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
Bill DeRusha
1aca252e19 Merge pull request #17383 from edx/bderusha/disc-plugin 
Convert discussion to plugin
 2018-02-26 13:18:10 -05:00
Daniel Clemente Laboreo
628892667b Add template block to allow redefining the details section in themes 2018-02-26 11:20:28 +02:00
George Babey
3e840ff268 Merge pull request #17497 from edx/gbabey/move_paginators 
Moved pagination to edx_rest_framework_extensions package
 2018-02-23 15:24:40 -05:00
John Eskew
b292bb43eb Merge pull request #17446 from mitodl/upstream/fix_error_page_themes 
Fixed unthemed error pages in Studio and LMS
 2018-02-23 13:25:08 -05:00
Bill DeRusha
4fba472139 Discssions as a plugin 2018-02-23 09:23:53 -05:00
hamzamunir7300
9d8c1a266f Merge pull request #17528 from edx/LEARNER-4230 
Incorrect position of the label "Receive course emails"
 2018-02-23 15:34:16 +05:00
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -05:00
Hamza Munir
74d3f8a0b8 Incorrect position of the label "Receive course emails" 
Needed to rearrange the label of the checkbox

LEARNER-4230
 2018-02-22 19:41:44 +05:00