Commit Graph

43 Commits

Author SHA1 Message Date
M. Zulqarnain
16f600910b pyupgrade on lms edxnotes,email_marketing,experiments apps (#26531) 2021-02-22 15:42:32 +05:00
M. Zulqarnain
c9c14ee6fc BOM-2279 : Pylint amnesty for edxnotes,email_marketing, and experiments (#26274)
* lint amnesty for edxnotes,email_marketing, and experiments
2021-02-03 18:15:26 +05:00
Calen Pennington
0294f28818 Tag some known instances of sailthru specific code that can be removed as part of AA-607 2021-01-13 15:58:55 -05:00
Muhammad Soban Javed
f62b1c417b replaced task decorator with shared_task decorator (#25925) 2021-01-07 19:46:34 +05:00
Muhammad Soban Javed
bd601cf3a6 Update celery routing for celery 4+ (#25567)
* Update celery routing

- Used routing function instead of class
- Move task queues dictionary to Django settings
- Removed routing_key parameter
- Refactored routing for singleton celery instantiation

Co-authored-by: Awais Qureshi <awais.qureshi@arbisoft.com>
2020-12-16 13:40:47 +05:00
Robert Raposa
8eef18710d set code_owner for celery tasks
ARCHBOM-1260

Co-authored-by: Tim McCormack <tmccormack@edx.org>
2020-11-17 15:33:33 -05:00
Awais Qureshi
7201edb11d Revert "Update routing config" (#25536)" (#25549)" (#25553)" (#25561)
This reverts commit db4c3b1210.
2020-11-11 00:13:47 +05:00
Awais Qureshi
db4c3b1210 Revert "Revert ""Update routing config" (#25536)" (#25549)" (#25553)
This reverts commit c1fe3c3a93.
2020-11-10 23:23:09 +05:00
Muhammad Soban Javed
c1fe3c3a93 Revert ""Update routing config" (#25536)" (#25549)
This reverts commit 39a22734c1.
2020-11-09 23:43:47 +05:00
Awais Qureshi
39a22734c1 "Update routing config" (#25536)
* Revert "Revert "Update routing config"

* Removed settings from lms/celery.py and cms/celery.py

* Moved settings import from top-level to function's scopes

Co-authored-by: Soban Javed <iamsobanjaved@gmail.com>
2020-11-09 19:06:55 +05:00
Muhammad Soban Javed
5a2ea1f954 Revert "Update routing config" 2020-11-06 02:05:48 +05:00
Muhammad Soban Javed
bfa8f71f33 Update routing config #25419 2020-11-06 01:00:29 +05:00
Kyle McCormick
d1a775d3cd Use full names for lms.djangoapps imports (#25401)
* Use full LMS imports paths in LMS settings and urls modules
* Use full LMS import paths in Studio settings and urls modules
* Import from lms.djangoapps.badges instead of badges
* Import from lms.djangoapps.branding instead of branding
* Import from lms.djangoapps.bulk_email instead of bulk_email
* Import from lms.djangoapps.bulk_enroll instead of bulk_enroll
* Import from lms.djangoapps.ccx instead of ccx
* Import from lms.djangoapps.course_api instead of course_api
* Import from lms.djangoapps.course_blocks instead of course_blocks
* Import from lms.djangoapps.course_wiki instead of course_wiki
* Import from lms.djangoapps.courseware instead of courseware
* Import from lms.djangoapps.dashboard instead of dashboard
* Import from lms.djangoapps.discussion import discussion
* Import from lms.djangoapps.email_marketing instead of email_marketing
* Import from lms.djangoapps.experiments instead of experiments
* Import from lms.djangoapps.gating instead of gating
* Import from lms.djangoapps.grades instead of grades
* Import from lms.djangoapps.instructor_analytics instead of instructor_analytics
* Import form lms.djangoapps.lms_xblock instead of lms_xblock
* Import from lms.djangoapps.lti_provider instead of lti_provider
* Import from lms.djangoapps.mobile_api instead of mobile_api
* Import from lms.djangoapps.rss_proxy instead of rss_proxy
* Import from lms.djangoapps.static_template_view instead of static_template_view
* Import from lms.djangoapps.survey instead of survey
* Import from lms.djangoapps.verify_student instead of verify_student
* Stop suppressing EdxPlatformDeprecatedImportWarnings
2020-11-04 08:48:33 -05:00
Soban Javed
3206d9cb9a Update celery routing
- Used routing function istead of class
- Move task queues to Djano settings
- Removed routing_key parameter
2020-11-02 15:03:53 +05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
2019-12-30 10:35:30 -05:00
usama sadiq
79d02a1b67 Python3 Update
Added absolute_import
Changed unicode() with six.text_type()
2019-07-11 19:27:15 +05:00
Matthew Piatetsky
6e81c84d8b fix unicode strings in lms/ part 1 2019-02-05 15:15:02 -05:00
Zia Fazal
9bfe4c3b6c Do not send user info to sailthru when registered from white label site
Added tests to support changes
2018-10-11 17:26:02 +05:00
Jeremy Bowman
1a5bf35357 TE-2689 Remove useless pylint suppressions part 2 2018-08-14 17:39:02 -04:00
uzairr
d84d47f32c Update sailthru audit purchase calls
Currently, there are two purchase calls are occurring for each audit
purchase on sail-thru.To avoid it,code is updated so that a single
call will occur for each purchase.

LEARNER-5257
2018-07-09 01:09:27 +05:00
Douglas Hall
7b65a76d33 Reverting celery task kwarg name. 2018-04-02 12:40:03 -04:00
Waheed Ahmed
8eb73a6e17 Route sailthru tasks to lms ace queue instead of default.
LEARNER-4801
2018-03-29 14:39:03 +05:00
Douglas Hall
2ecbe19b29 ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration. 2018-03-28 14:00:35 -04:00
Tasawer Nawaz
abf7b26b32 Exclude enterprise learners from the welcome email
LEARNER-3649
2017-12-28 15:49:45 +05:00
uzairr
1b6ed3ba21 Celery task to update sailthru purchase record
After change in the audit enrollment process, edX platform is
no longer keeping its audit enrollment record on sailthru.To keep
updated sailthru a celery task is created that will update sailthru
user profile in case of enroll/un-enroll of any audit enrollment course.

LEARNER-2694
2017-11-01 15:28:52 +00:00
tasawernawaz
9d7a1d5b53 send welcome email to only activated users
LEARNER-2474
2017-09-12 10:44:05 +05:00
uzairr
1aea33cefc Fix email will not sent to white-label users
White label partners reported that the users are receiving edX
welcome emails at the time of signup.To solve it, a check is added
that will assure, only edX users will receive the welcome email.

LEARNER-1466

changes requested

update

update

updated
2017-08-28 14:55:24 +00:00
Waheed Ahmed
f780b02b03 Send welcome email to inactive learners on registration.
LEARNER-2039
2017-08-09 16:39:14 +05:00
Waheed Ahmed
853c9cd8df Revert "Send welcome email to inactive learners on registration." 2017-08-08 19:00:09 +05:00
Waheed Ahmed
f073a11475 Send welcome email to inactive learners on registration.
LEARNER-2039
2017-08-07 12:44:50 +05:00
Adeel Khan
52e28d91fa Implementing connection timeout for sailthru api call.
LEARNER-1186
2017-07-06 14:54:19 +05:00
Andy Armstrong
79acb5c5be Reorder LMS imports using isort 2017-06-11 21:48:06 -04:00
Simon Chen
8309930bbf Add the email marketing welcome email delay ECOM-6760 2017-01-10 11:41:02 -05:00
Simon Chen
3bda3c4a77 Remove Sailthru enrollment related signal handlers because they are being invoked from the ECOM service already.
ECOM-6581
2017-01-04 15:54:59 -05:00
Ahsan Ulhaq
eb895fae82 WL Enrollees on edX.org email list
ECOM-6324
2016-12-07 14:11:48 +05:00
PaulWattenberger
9add24e409 Handle vars: None in Sailthru user record in unenroll list update 2016-08-17 21:44:07 -04:00
PaulWattenberger
dd4bab3cb3 ECOM-5065 Don't treat invalid email response from Sailthru as retryable error 2016-07-28 10:35:10 -04:00
PaulWattenberger
ab242145cb Fix 500 error unenrolling when running Sailthru integration on Stage ECOM-4960 2016-07-15 16:36:20 -04:00
PaulWattenberger
aa078dfda2 Pwattenberger/sailthru enroll (#12816)
* Partial changes for purchase tracking

* Continued changes for purchase tracking

* Clean up code quality issues

* Clean up code quality issues

* Responses to code review

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix problem processing sailthru_content cookie
2016-06-28 11:13:21 -04:00
PaulWattenberger
f5b42c8955 Initial lms changes for Sailthru (#12706)
* Initial lms changes for Sailthru

* Fix identified code quality issues

* Fix migration failure

* Fix code quality identified issue
2016-06-09 16:21:11 -04:00
PaulWattenberger
9781685719 Revert "Pwattenberger/sailthru" (#12701) 2016-06-08 23:03:22 -04:00
PaulWattenberger
ca02235e64 Pwattenberger/sailthru (#12646)
* Initial commit of Sailthru lms changes

* Field mapping changes for Sailthru integration

* Merge fix

* Add users to Sailthru list on registration

* FIx minor code format issues

* Several updates based on code review feedback

* Updates based on recomendations from Sailthru

* Clean up unit tests

* Fix last login

* Updates based on code review feedback

* Updates based on code review feedback

* Fix comment

* Cleanup
2016-06-08 19:38:29 -04:00