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

1533 Commits

Author SHA1 Message Date
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
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
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
Brian Beggs
2d19136beb Merge pull request #16009 from edx/jmbowman/pytest_unit_tests 
PLAT-1677 Switch to pytest for unit tests
 2017-09-25 08:57:01 -04:00
Jeremy Bowman
ca97e946a6 Switch to pytest for unit tests 2017-09-22 16:07:53 -04:00
Harry Rein
fcf5f03b2d Fix issue with course message classes. 2017-09-22 14:38:04 -04:00
Harry Rein
990a8cbfe6 Merge pull request #16008 from edx/HarryRein/LEARNER-2307-course-goal-messaging 
LEARNER-2307: Course Goal Messaging
 2017-09-22 11:53:11 -04:00
Alex Dusenbery
00dadc3a3a EDUCATOR-1402 | Fix flaky generate_course_overview test. 2017-09-22 09:59:56 -04:00
Harry Rein
bc76ffe5dc Add message for setting course goal. 
LEARNER-2307
 2017-09-22 09:56:27 -04:00
sanfordstudent
5c88600fbf Merge pull request #16048 from edx/sstudent/EDUCATOR-1288 
Sstudent/educator 1288
 2017-09-21 16:48:46 -04:00
Sanford Student
d0e68f2d24 recalculate course grade on user partition change 2017-09-21 15:32:07 -04:00
McKenzie Welter
cc15081399 Merge pull request #16068 from edx/McKenzieW/learner-2457 
Fixing util to gather course_run data from catalog
 2017-09-21 14:27:05 -04:00
Gabe Mulley
fab1769be4 update nudge templates 2017-09-21 13:41:51 -04:00
McKenzie Welter
f846442233 language --> content_language and get_fields() actually returns 2017-09-21 13:25:40 -04:00
Andy Armstrong
de0380ca0e Merge pull request #16017 from edx/diana/profile-messaging 
LEARNER-2530: Messaging changes on Learner Profile
 2017-09-21 11:35:42 -04:00
Alex Dusenbery
d89afa0832 EDUCATOR-1207 | Run generate_course_overview command via celery task, in batches. 2017-09-21 11:26:59 -04:00
Diana Huang
cbfea6515d Add new info message to profile page. 2017-09-21 10:19:40 -04:00
Alex Dusenbery
42829bd272 EDUCATOR-1103 | Restrict the number of courses to run a single opt-in query for. 2017-09-19 15:27:54 -04:00
Ned Batchelder
253c6fba24 Have to use ugettext_lazy for import-time translations 2017-09-19 14:11:05 -04:00
Alex Dusenbery
ab71318104 EDUCATOR-1316 | Refactor courseware.views.views._get_cert_data and related functions. 2017-09-19 11:11:37 -04:00
Nimisha Asthagiri
813007bb49 Schedules/ACE - support debug logging via waffle 2017-09-16 22:03:28 -04:00
McKenzie Welter
531a51f75c Added util method to retrieve individual course_run data from Catalog 2017-09-15 15:03:20 -04:00