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

18028 Commits

Author SHA1 Message Date
Waheed Ahmed
d82ecad681 Merge pull request #17985 from edx/waheed/LEARNER-4254-update-support-form 
Update support form.
 2018-04-24 22:02:26 +05:00
Gregory Martin
809921f417 Merge pull request #17953 from edx/yro/EDUCATOR-2644 
Yro/EDUCATOR 2644
 2018-04-24 10:27:49 -04:00
Brittney Exline
60f46d5a92 Merge pull request #17930 from edx/bexline/sso_id_verification2 
ENT-945 Apply logic for taking into account SSOVerifications
 2018-04-24 07:40:52 -06:00
Asad Iqbal
6cc13f7f2e Merge pull request #17935 from edx/asadiqbal08/ENT-645 
[ENT-645]- Updated the messages when a learner leave an organization.
 2018-04-24 15:59:55 +05:00
hamzamunir7300
2c3ff72bf1 Merge pull request #17922 from edx/LEARNER-4873/fix-contact-us-link 
Changing the contact-us link
 2018-04-24 14:59:14 +05: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
Hamza Munir
0fc0f82256 Changing the contact-us link 
Redirection to the newly created support form. If the server is production
it will take to production support form otherwise it will be forwarded to
Stage server support form.

LEARNER-4873
 2018-04-24 14:13:23 +05:00
Uman Shahzad
db5042f084 Merge pull request #18018 from edx/revert-17967-gbabey/revert-ENT-924 
[ENT-924] Revert "Revert "Show Enterprise display name if we should hide sensit…
 2018-04-24 05:43:49 +05:00
Ned Batchelder
a8e0d81f0f Merge pull request #18001 from edx/nedbat/release-line-meta-tag 
Report the RELEASE_LINE in a meta tag
 2018-04-23 17:43:06 -04:00
Gregory Martin
93c211a0b6 Add Notes Delete User API endpoint 2018-04-23 15:45:26 -04:00
Brittney Exline
ee1c3a4548 ENT-945 Update IDVerification interfaces to accountfor SSOVerification 2018-04-23 10:48:12 -04:00
Brittney Exline
f41bf2f409 ENT-944 Create SSOVerifications for users in tpa pipeline based on provider's settings 2018-04-23 10:10:26 -04:00
Uman Shahzad
5746729895 Revert "Revert "Show Enterprise display name if we should hide sensitive user…" 2018-04-23 18:27:36 +05:00
Nimisha Asthagiri
022850d293 Merge pull request #17983 from edx/arch/remove-course-structure-api 
Remove Course Structure API
 2018-04-21 09:04:39 -04:00
Uman Shahzad
7d34099c09 Merge pull request #17969 from edx/uman/enterprise-middleware 
[ENT-962] Add Enterprise middleware that injects customer data.
 2018-04-21 09:55:46 +05:00
Uman Shahzad
87919f4d53 Add Enterprise middleware that injects customer data. 2018-04-21 08:14:52 +05:00
Nimisha Asthagiri
3d8bce9dc8 Remove Course Structure API 2018-04-20 22:19:57 -04:00
Uzair Rasheed
faef86636d Merge pull request #18002 from edx/LEARNER-1488/send_email_on_failed_verification 
Send email for the failed verification status
 2018-04-20 22:44:14 +05:00
Brian Mesick
fc1f18aa14 Merge pull request #17919 from edx/bmedx/retirement_status 
Add a model and associated API to help control the user retirement flow
 2018-04-20 12:35:16 -04:00
asadiqbal
2e8444e674 Updated the messages when a learner leave an organization. 2018-04-20 15:36:54 +05:00
Daniel Clemente Laboreo
00c339d091 Implement iter_all_for_block and iter_all_for_course for DjangoUserStateClient 2018-04-20 11:26:16 +03:00
uzairr
c6a951796a Send email for the failed verification status 
Support Team need to handle bulk of tickets every month
about the verification status of learners.To avoid it,
suitable changes have done to send verification email
to the learner.

LEARNER-1488
 2018-04-20 13:12:56 +05:00
Ned Batchelder
55d823da15 Report the RELEASE_LINE in a meta tag 2018-04-19 17:36:42 -04:00
Ned Batchelder
1642eeabaa Merge pull request #14128 from edx/jbarciauskas/PLAT-1109-ignore-integrity-error 
[PLAT-1109] Suppress IntegrityErrors caused by race condition
 2018-04-19 16:22:05 -04:00
bmedx
4390773f4b Clean up some warnings to get enough headroom to pass tests 2018-04-19 15:04:39 -04:00
Michael LoTurco
919264f56d Add entitlement unenrollment survey 
Updates behavior post unenrollment, also refactors accessible_modal
to enable the unenrollment survey to remain accessible after the
content in the modal changes (to the survey).

mloturco/learner-3524
 2018-04-19 10:19:11 -04:00
Eric Fischer
9b093ff17f Add passthrough for context_title and context_label LTI parameters 2018-04-18 13:39:53 -04:00
Eric Fischer
38f5358541 Revert "pass title/label to LTI consumers" 
This reverts commit f1fa7b8e06.
 2018-04-18 12:59:15 -04:00
Attiya Ishaque
44ccd84c7a Merge pull request #17975 from edx/ai/EDUCATOR-2719-button-styling 
Fix styling of button on certificate & membership page.
 2018-04-18 17:32:59 +05:00
Uzair Rasheed
e0d20be11d Merge pull request #17912 from edx/LEARNER-1487/send_successfull_verification_email 
Send verification email status
 2018-04-18 12:09:42 +05:00
Jae Bradley
769ca45f42 Merge pull request #17941 from edx/LEARNER-4864-cookie-policy-banner-component 
LEARNER-4864: Add Cookie Policy Banner
 2018-04-17 17:50:25 -04:00
jaebradley
fab388ad6b add cookie policy banner with feature flag 2018-04-17 16:48:52 -04:00
Feanil Patel
139ac68ad3 Merge pull request #17981 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-17 16:31:04 -04: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
attiyaishaque
9dc01647e8 Fix styling of button on certificate & membership page. 2018-04-17 12:21:09 +05:00
Mushtaq Ali
5a9477af30 Import video transcripts - EDUCATOR-2173 2018-04-16 12:05:44 +05: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
Simon Chen
c02c1d5177 Merge pull request #17902 from edx/rm-new-course-outline-waffle 
EDUCATOR 2283 - Removes the new course outline waffle flag.
 2018-04-14 15:07:00 -04:00
Bill DeRusha
f7dd174873 Merge pull request #17954 from edx/bderusha/generated-pw-complexity 
Update and refactor random password generator
 2018-04-13 17:13:55 -04:00
J Eskew
0269d4a536 Merge pull request #17868 from edx/jeskew/check_for_retired_username 
Reject acct creation when using a retired username.
 2018-04-13 15:15:10 -04:00
John Eskew
338d4551ab Reject acct creation when using a retired username. 
Change from specifying a retired username/email format to specifying
  a retired username prefix and a retired email prefix/domain,
  preventing possible config errors due to unexpected/bad formats.
 2018-04-13 14:27:21 -04:00
Bill DeRusha
d1ed33ac23 Update and refactor random password generator 2018-04-13 14:17:21 -04:00
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00
Michael Terry
2abbd1eb83 Move all our coffee files 
This moves the original files into their JS locations so that when
the next commit modifies them, we dont lose history.
 2018-04-13 14:10:40 -04:00
sandroroux
3899b76929 Removes the new course outline waffle flag. 2018-04-13 12:28:14 -04:00
Nimisha Asthagiri
d0c99dca41 Merge pull request #17921 from edx/douglashall/remove_ccx_usage_of_course_structures 
Remove use of the deprecated course_structures module.
 2018-04-13 09:40:54 -04:00
Michael Terry
98a13423d1 Drop underscore from learner_dashboard 2018-04-12 15:14:52 -04: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