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

6303 Commits

Author SHA1 Message Date
Nimisha Asthagiri
43c7a5171f Merge pull request #16219 from edx/ret/dynamic-pacing-email 
Course Update emails (initial)
 2017-10-13 17:28:36 -04:00
Tyler Hallada
f0ee9ee894 Merge pull request #16222 from edx/thallada/remove-old-recurring-nudge-task 
Delete old recurring_nudge_schedules_for_hour task
 2017-10-13 16:24:26 -04:00
Tyler Hallada
642a9b82b2 Delete old recurring_nudge_schedules_for_hour task 2017-10-13 14:20:11 -04:00
Adam
3fd499b40c Merge pull request #16133 from edx/adam/fix-cg-bug 
address coursegraph issue where components had the same block id but …
 2017-10-13 13:59:10 -04:00
John Eskew
e7f288882d Merge pull request #16188 from edx/jeskew/remove_django_simple_history 
Remove all usage of the django-simple-history module.
 2017-10-13 13:22:52 -04:00
Matt Tuchfarber
946421c438 Rebuild program marketing page in Bootstrap and make it look similar 
to the Micromasters page
 2017-10-13 13:11:39 -04:00
Calen Pennington
12e1af275a Merge pull request #16092 from edx/upsell-nudges-for-unverified-users 
Upsell nudges for unverified users
 2017-10-13 11:32:29 -04:00
Nimisha Asthagiri
741917e92b Course Update emails 2017-10-13 10:53:44 -04:00
sandroroux
40d3f4f2fc Unit tests for "_add_upsell_button_to_email_template". 2017-10-13 10:08:52 -04:00
Tyler Hallada
d571adfb99 Use upsell_link in upgrade reminder template 2017-10-13 10:01:35 -04:00
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
edx-pipeline-bot
17d9336080 Merge pull request #16215 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-12 15:28:25 -04:00
John Eskew
194413cdf9 Add migrations which remove HistoricalRecord tables. 2017-10-12 11:20:25 -04:00
Matthew Piatetsky
c741bcbee7 Implement local currency in lms 
LEARNER-2412
 2017-10-11 14:37:18 -04:00
Simon Chen
29a1df3323 Revert "Exposing course run license via Course API" 
This reverts commit a1419b15f7.
 2017-10-11 12:37:09 -04:00
John Eskew
737ebccb74 Remove django-simple-history and all HistoricalRecords. 2017-10-11 11:36:06 -04:00
Clinton Blackburn
a1419b15f7 Exposing course run license via Course API 
The license for course run content is now stored on the CourseOverviews model and exposed via the Course API.

LEARNER-2791
 2017-10-08 19:47:32 -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
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
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
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
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
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
Adam Palay
8dc58e548e address coursegraph issue where components had the same block id but different locations 2017-09-29 14:46:33 -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
cb7d8dcb86 Create API View for ApiAccessRequest model 2017-09-28 12:27:13 +05:00
Ned Batchelder
ed9b93ff1a Merge pull request #16100 from edx/nedbat/lazy_format 
Have to format lazily for translated constant messages
 2017-09-26 13:05:16 -04:00
Ned Batchelder
f8f911ae5c Have to format lazily for translated constant messages 2017-09-26 11:39:36 -04:00
John Eskew
fe8f7f553d Merge pull request #16022 from edx/jeskew/toxify_edx_platform_testing 
Add tox testing to edx-platform.
 2017-09-26 11:14:11 -04:00
Gabe Mulley
a2dc27e6b1 fix multi-course emails and update ACE 2017-09-25 14:07:08 -04:00
John Eskew
2194d390c8 Remove memory dump signal until meliae packaging issues are resolved. 2017-09-25 10:33:14 -04:00