Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,248 Commits 1 Branch 0 Tags
c597d91fbd9a94de881173848cfe754830eab0cf
Commit Graph

96 Commits

Author SHA1 Message Date
Matthew Piatetsky
62b9bb89c8 Change content_type_gating enabled_for_enrollment to return false if a course has no verified mode or a user is not enrolled in the audit mode 2019-04-14 16:32:13 -04:00
Calen Pennington
446db3ac53 Show complete reason on both content type gating and course duration limits in support form 2019-04-11 12:33:58 -04:00
Matthew Piatetsky
d9096e432e Clarify partially enabled state in the FBE support tool 2019-04-02 15:39:24 -04:00
David Ormsbee
3f82a279c9 Merge pull request #19315 from open-craft/giovanni/bb-548-ospr 
OSPR-2818 - Add Contact Us form customization options (BB-548)
 2019-02-27 20:36:23 -05:00
Giovanni Cimolin da Silva
650aad6ce5 Add Contact Us form customization options 
This commit adds personalization options for the Contact Us links on 
edx-platform's
page.
To allow for this customization, two SiteConfiguration variables were 
added:
* CONTACT_US_ENABLE: Switch to enable/disable the Contact Us page. 
Setting this to
False will disable the contact page and the links on the footer will 
disappear.

* CONTACT_US_CUSTOM_LINK: If the contact page is enabled, this setting 
allows to set
a custom URL for the Contact Us links on edx-platform. If this setting 
is not set,
the platform will use the default contact form.
 2019-02-13 18:17:45 -02:00
Calen Pennington
8c53ce6493 Merge pull request #19743 from edx/unicode7 
fix unicode strings in lms/ part 2
 2019-02-13 14:15:02 -05:00
Matthew Piatetsky
764319d3e0 fix unicode strings in lms/ part 2 2019-02-13 10:35:56 -05:00
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
Bill Filler
6606ddefff Add feature-based enrollment search to support form 2018-12-11 09:53:19 -05:00
Ned Batchelder
3353e7425e Remove unused imports 2018-11-03 16:07:05 -04:00
Bill DeRusha
b43b174fdd Set usable password when canceling user retirement 2018-09-21 14:18:57 -04:00
Jeremy Bowman
1a5bf35357 TE-2689 Remove useless pylint suppressions part 2 2018-08-14 17:39:02 -04:00
Jeremy Bowman
4e8668d3be TE-2524 Stop using nose.plugins - LMS 2 2018-08-01 13:54:06 -04:00
Kshitij Sobti
fcff921fdb Linting fixes to improve quality report 2018-07-18 00:37:31 +05:30
Tasawer Nawaz
8868f07394 inactive enrollments in support tool 
LEARNER-4744
 2018-07-02 19:02:43 +05:00
Albert St. Aubin
06af818322 Update the entitlement fulfilment logic to work with enrollment end 
[LEARNER-5275]

Update the endtitlement fulfillment logic to work for users who have
enrolled, enrollment window has closed, but upgrade window is still
open. These users should be able to use that enrollment on their course
run that they are enrolled in.
 2018-06-22 07:48:35 -04:00
Robert Raposa
92283a33b9 Remove unused imports. 2018-06-21 08:55:23 -04:00
Brian Mesick
832f6a7157 Merge pull request #18320 from edx/bmedx/remove_111_test_marks 
Remove unused pytest markers for Django 1.11 upgrade
 2018-06-06 11:15:26 -04:00
bmedx
c125ff6a57 Remove unused pytest markers for Django 1.11 upgrade 2018-06-06 09:58:38 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
J Eskew
edbdae9fb8 Merge pull request #18124 from edx/jeskew/fix_some_django20_deprecation_warnings 
Fix more Django 2.0 deprecation warnings around URLconfs.
 2018-05-08 16:29:12 -04:00
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -04:00
John Eskew
ffb1f9fe2a Fix more Django 2.0 deprecation warnings around URLconfs. 2018-05-03 13:50:08 -04:00
Stu Young
7b76ab8a4d Merge pull request #18023 from edx/estute/TE-2427-reshard-lms4 
Reshard python unittests
 2018-05-03 11:53:32 -04:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
Michael Terry
f8b009fecc Fix extracting i18n from jsx code 
React code (in jsx files) was not being extracted at all. Fixed this
by updating to edx-i18n-tools 0.4.5.

Also, template literals (feature of es2015) don't work well with
gettext at all. So convert those instances to HtmlUtils or
StringUtils interpolation calls.

FEDX-505
 2018-05-02 15:21:45 -04:00
Eric Fischer
e18448e27d Silence deprecation warnings 
https://docs.djangoproject.com/en/1.11/releases/1.10/#using-user-is-authenticated-and-user-is-anonymous-as-methods
 2018-05-02 10:03:50 -04:00
Waheed Ahmed
c16cbd7a54 Fix course selection on single support form. 
Use defaultValue instead of value attribute.

LEARNER-5126
 2018-04-27 15:17:59 -04:00
Michael LoTurco
62ae6d4555 retrap focus for seat unenroll survey a11y 
learner-4715
 2018-04-25 14:51:35 -04:00
Waheed Ahmed
2c09ebb208 Update support form to make course required. 
Update support form to auto select course and make course
selection required to submit form.

LEARNER-4254
 2018-04-24 14:29:49 +05:00
Uman Shahzad
87919f4d53 Add Enterprise middleware that injects customer data. 2018-04-21 08:14:52 +05:00
Feanil Patel
aa46a245b0 Merge pull request #17967 from edx/gbabey/revert-ENT-924 
Revert "Show Enterprise display name if we should hide sensitive user…
 2018-04-17 12:58:57 -04:00
George Babey
a155aad01c Revert "Show Enterprise display name if we should hide sensitive username." 
This reverts commit d58bd06928.

This commit caused performance issues due to increased API load from checking the
enterprise association on each page load
 2018-04-17 09:07:17 -04:00
Tasawer Nawaz
048329cf24 Merge pull request #17363 from edx/tasawer/learner-3962/translate-contact-us-form 
translate string on support form
 2018-04-16 11:52:14 +05:00
McKenzie Welter
435c3c6338 mark support (re)issued entitlements as unrefundable 2018-04-12 12:16:37 -04:00
Uman Shahzad
d58bd06928 Show Enterprise display name if we should hide sensitive username. 2018-04-12 19:10:30 +05:00
Waheed Ahmed
ce7e144088 Fix 500 error on new contact us form. 
If learner has enrollments without course overview object server raises
error, fixed using course_overview property of course enrollment.

LEARNER-4426
 2018-04-12 16:10:18 +05:00
McKenzie Welter
300427be3f move Create Entitlement button up and shrink username search bar 2018-04-10 14:54:33 -04:00
Tasawer Nawaz
67962748b2 add note on for logged out users on support form 
LEARNER-3783
 2018-04-04 12:43:07 +05:00
Michael LoTurco
45175494ed adjust bug-causing variable name 2018-03-28 08:42:59 -04:00
Michael LoTurco
537b6652c2 adds entitlment tool to support tool home 2018-03-26 12:53:22 -04:00
Alex Dusenbery
10be8bcd4e add entitlement support creation and reissue 
Learner-3925
 2018-03-23 17:10:46 -04:00
McKenzie Welter
e5d1f04a89 move support actions to existing entitlement api 2018-03-22 16:11:46 -04:00
Michael LoTurco
be1b800475 Add Table to entitlement support app 
Learner-3925
 2018-03-15 13:20:31 -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
Michael LoTurco
3b928e3e99 Adds EntitlementSupportView, Template, and base react element 2018-03-09 14:01:12 -05:00
Michael LoTurco
a117f6fa42 Add client api for entitlement support page 
Learner-3925
Learner-4388
 2018-03-08 12:46:00 -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
McKenzie Welter
3e675c36eb don't link to API endpoint from support page 2018-02-20 15:46:55 -05:00
Michael LoTurco
449c6903a6 Add Support endpoint for Course Entitlements 2018-02-20 13:20:47 -05:00