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

1751 Commits

Author SHA1 Message Date
sandroroux
fc7c1652f8 Modified criteria for upselling. User must have a dynamic deadline to receive an email with an upsell button 2017-10-13 10:01:35 -04:00
Calen Pennington
8468357ac4 Separate the date and link logic out of VerifiedUpgradeDeadlineBlock, so that it can be called directly with prefetched data for check_and_get_upgrade_link_and_date 2017-10-13 10:01:34 -04:00
castellanese
f8d41b9764 Differentiated emails - unverified users receive email with upsell button. 2017-10-06 15:23:42 -04:00
Tyler Hallada
d38428ea41 Merge pull request #16129 from edx/thallada/refactor-verified-upgrade-reminder 
Refactor recurring nudge and verified upgrade reminder emails
 2017-10-06 14:59:52 -04:00
Troy Sankey
f44f304559 Merge pull request #16176 from edx/pwnage101/remove-1.4-shims_PLAT-1424 
[WIP] cleanup django 1.4 shims and mentions
 2017-10-06 14:27:31 -04:00
Harry Rein
c63020f9ce Merge pull request #16184 from edx/HarryRein/LEARNER-2784-sock-cleanup 
Harry rein/learner 2784 sock cleanup
 2017-10-06 14:18:58 -04:00
Harry Rein
f534e01888 Merge pull request #16096 from edx/HarryRein/LEARNER-2308-update-course-goal 
Harry rein/learner 2308 update course goal
 2017-10-06 14:11:23 -04:00
Calen Pennington
d5b6b170dd Use the current site to generate absolute urls for emails 2017-10-06 13:36:27 -04:00
Tyler Hallada
e7b3590448 Add verified cert image to email template 
Make image url in the task and pass to template
 2017-10-06 13:36:18 -04:00
Tyler Hallada
9876f597e6 Refactor common task querying into a separate func 
Address some of Cale's PR comments

Combine query functions into one. No debug logging

Pull int variables out into static class variables

Mixin needs to call super __init__ too

Remove multi-course copy from upgrade reminder

Address Cale's round 2 comments
 2017-10-06 13:36:13 -04:00
Tyler Hallada
efe814c64f Update copy for the upgrade_reminder emails 2017-10-06 13:35:05 -04:00
Tyler Hallada
4acdcc698e Display new flags in the ScheduleConfig admin list 2017-10-06 13:35:04 -04:00
Tyler Hallada
004ca4800e Add tests for upgrade_reminder 
Fix test_templates

By passing the date pre-formatted to ace.

Address PR comments

Fix linting

Add TODO comment about using LoggerAdapter

More lint fixes

Fix upgrade_reminder task from silently failing
 2017-10-06 13:35:00 -04:00
Tyler Hallada
1bcd3a45ca Refactor upgrade_reminder to use async celery task 
Finish test_base.py tests

Address some PR comments

Some test_send_recurring_nudge fixes

Fix test_schedule_bin

Fix test_site_config

Fix test_multiple_enrollments

Tests pass now!

Use consistent naming: upgrade_reminder
 2017-10-06 13:34:23 -04:00
Tyler Hallada
0c0a5a93c0 Create func for common template context entries 2017-10-06 13:33:30 -04:00
Harry Rein
0666ea6969 Sock upgrade message on mobile. 2017-10-06 13:15:54 -04:00
Harry Rein
f3f3edf4bd Allow user to update course goal on course home page. 
LEARNER-2308

Once a goal has been set for a user on the course home message,
allow them to update it on the course home side bar. Automatically
sets a course goal for users when enrolling in a verifiable course.
 2017-10-06 13:07:03 -04:00
Albert (AJ) St. Aubin
c7bfd69e88 Merge pull request #16174 from edx/aj/LEARNER-2715 
Bug fix for unpublished courses that users have purchased within a pr…
 2017-10-06 12:40:35 -04:00
Robert Raposa
91bf523920 Merge pull request #16175 from edx/robrap/LEARNER-2026-clean-up 
LEARNER-2026: Revert remains of 'upgrade upsell to course info banner'.
 2017-10-06 10:02:49 -04:00
Albert St. Aubin
724168d605 simplification pr changes 2017-10-06 09:53:58 -04:00
Albert St. Aubin
a4cb374b16 PR update 2017-10-06 09:53:58 -04:00
Albert St. Aubin
d37264ae0c Bug fix for unpublished courses that users have putchased within a program 
[LEARNER-2715]
 2017-10-06 09:53:57 -04:00
Troy Sankey
cc2fe585ec Remove PatchedClient, a django 1.4 shim. 2017-10-05 15:37:00 -04:00
Troy Sankey
d76a1ac014 Tests should make use of django test client's PATCH functionality 
Previously, these tests were skipped in order to support Django 1.4.
 2017-10-05 15:37:00 -04:00
Troy Sankey
46d8caa8cd Remove/update comments related to django 1.4 
Course keys as PKs don't appear to break detail links in admin pages
anymore.
 2017-10-05 15:35:01 -04:00
Robert Raposa
e8945ebdc5 Course home event clean-up. 
- Convert hero events to BI events.
- Upgrade click event clean-up

LEARNER-2026
 2017-10-05 15:29:37 -04:00
Harry Rein
747611eaca Merge pull request #16168 from edx/HarryRein/LEARNER-2332-reviews-speed-up 
Add loading icon to reviews page.
 2017-10-05 14:31:54 -04:00
John Eskew
b07826cbc0 Merge pull request #16148 from edx/jeskew/initial_django_1.11_startup_changes 
Initial Django 1.11 startup changes
 2017-10-05 12:48:26 -04:00
John Eskew
0890193d6b PLAT-1408: Import csrf from new path. 2017-10-05 11:12:53 -04:00
John Eskew
4b95abb715 Make an AppConfig to register ccxcon signals. 2017-10-05 11:12:53 -04:00
John Eskew
7dfb6cc681 Change all UTC timezones to import from pytz instead of Django. 2017-10-05 11:12:52 -04:00
John Eskew
02f26f55ce Remove unused imports. Push model imports down into relevant methods. 
Mock out the static_replace modules in the proper location.
 2017-10-05 11:12:52 -04:00
John Eskew
8b5b1eba86 Use Django 1.11 compatible version of django-countries. 2017-10-05 11:12:51 -04:00
Diana Huang
ef5670f29a Merge pull request #16153 from edx/diana/disappear-message 
Make the welcome message disappear after seven days of first viewing.
 2017-10-05 10:08:22 -04:00
Harry Rein
271f3c9f3c Add loading icon to reviews page. 
LEARNER-2332

Since CourseTalk doesn't allow for loading a read and write reviews
page at the same time, this commit adds a loading icon to show that
we need to grab the iframe.
 2017-10-05 09:18:49 -04:00
Diana Huang
eab6363d94 Make the welcome message disappear after sevent days of first viewing. 2017-10-04 13:30:03 -04:00
Bill Filler
5268588980 Display banner if user declines data sharing consent 
Revert changes for getting enterprise customer from enteprise from
Enterprise API and update/add test.
Lookup the enterprise_customer_uuid based on the site and user if not
found through the cookie or request parameter.
 2017-10-04 11:27:16 -04:00
Troy Sankey
3036013388 Merge pull request #16150 from edx/pwnage101/remove-django.utils.unittest-PLAT-1551 
remove uses of django.util.unittest
 2017-10-03 13:46:21 -04:00
Troy Sankey
7f394cfce8 remove uses of django.util.unittest 
django.util.unittest was deprecated in django 1.7 and removed in 1.9.

PLAT-1551
 2017-10-03 11:51:28 -04:00
Harry Rein
0e6d9acece Merge pull request #16104 from edx/HarryRein/LEARNER-2236-remove-old-wells 
Remove old messaging wells.
 2017-10-03 11:29:13 -04:00
Diana Huang
7f4550387c Add eventing to course home upgrade paths. 2017-10-02 17:27:51 -04:00
Andy Armstrong
7dfe12a1f3 Show course home messages for important course dates 
LEARNER-2073
 2017-10-02 17:27:51 -04:00
Gabe Mulley
d509ae1da1 change verified cert image 2017-10-02 12:21:18 -04:00
Brian Mesick
6fbea7f191 Merge pull request #16106 from edx/bmedx/raw_sql_dates_PLAT-1531 
Update raw sql that uses datetimes to be Django 1.9 compatible
 2017-10-02 09:29:50 -04:00
McKenzie Welter
1fe76d7c01 calculated hours of effort for rendering cert template context 2017-09-29 14:26:16 -04:00
bmedx
cfd77f61f6 Update raw sql that uses datetimes to be Django 1.9 compatible 2017-09-29 11:33:28 -04:00
Saleem Latif
55df657000 Merge pull request #16086 from edx/saleem-latif/ENT-656 
ENT-656: Create API View for ApiAccessRequest model
 2017-09-28 13:31:53 +05:00
Zubair Afzal
24df31402e Merge pull request #16067 from edx/zub/ENT-624-update-enterprise-api-support 
Ent 624 update enterprise api support
 2017-09-28 13:29:41 +05:00
Saleem Latif
cb7d8dcb86 Create API View for ApiAccessRequest model 2017-09-28 12:27:13 +05:00
zubair-arbi
4040c45f06 update enterprise api support for request users and enterprise service user 
ENT-624
 2017-09-27 18:04:44 +05:00