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

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sofiya Semenova
dbfdff090d Checking if CAD exists before using it 2017-10-06 13:24:56 -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
Diana Huang
38c16891c5 Merge pull request #16182 from edx/robrap/LEARNER-2026-course-info-events 
LEARNER-2026: Refactor course info events
 2017-10-06 12:40:18 -04:00
Robert Raposa
8bf028620b Complete rename of CourseHomeEvents to CourseInfoEvents. 
LEARNER-2026
 2017-10-06 11:03:48 -04:00
Robert Raposa
ab4a5694ec Course info event file renames. 
LEARNER-2026
 2017-10-06 10:55:21 -04:00
adeel khan
27a73f77da Merge pull request #16124 from edx/adeel/LEARNER_2607_untranslatedtooltip_progresstab_chart 
Adds translation for lms progress chart tooltip.
 2017-10-06 19:28:02 +05:00
Bill Filler
f4a00bda0a Merge pull request #16181 from edx/bfiller/WL-1241 
bump edx-enterprise version to 0.51.0
 2017-10-06 10:25:42 -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
Adeel Khan
9ef887c547 Adds translation for lms progress chart tooltip. 
Tooltip text under lms->courseview->progress tab->chart
was not under any translation, causing it to appear untranslated for
learners. This would enable its translation to any language.

LEARNER-2607
 2017-10-06 18:32:02 +05:00
Jesse Shapiro
b96f646d35 Merge pull request #16178 from open-craft/haikuginger/remove-unnecessary-ent-enrollment 
[ENT-606] Remove unused generic Enterprise-related enrollment logic
 2017-10-06 08:59:32 -04:00
Bill Filler
dd16bf7685 bump edx-enterprise version to 0.51.0 2017-10-05 17:14:28 -04:00
Giulio Gratta
c0fd667b7c Fix Shopping-cart CSS and JS 2017-10-05 13:17:08 -07:00
Troy Sankey
e94d265fa7 Remove our copy of the slugify() implementation 2017-10-05 15:37:01 -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
Jesse Shapiro
f160980008 Remove unused generic Enterprise-related enrollment logic 2017-10-05 14:47:21 -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
Robert Raposa
4fa813529b Merge pull request #16169 from edx/robrap/LEARNER-2026-fix-bug 
LEARNER-2026: Fix upgrade event.
 2017-10-05 14:12:13 -04:00
Rabia Iftikhar
b245fa0374 Merge pull request #16159 from edx/ri/EDUCATOR-139-add-charset-webOb-response 
EDUCATOR-139 Add charset to the WebOb response
 2017-10-05 22:42:43 +05: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
Sofiya Semenova
4cd7a886be Merge pull request #16109 from edx/ssemenova/ed-1315-part2 
Remove "final course details" message, replace with another
 2017-10-05 12:40:45 -04:00
Ned Batchelder
37effa755b Merge pull request #16172 from edx/nedbat/nicer-rst 
Use nicer .rst for testing.rst
 2017-10-05 12:01:03 -04:00
John Eskew
f5f6b08884 Add missing 'later' variable. 2017-10-05 11:12:54 -04:00
John Eskew
762b87e25d Move xblock tagging model import into method. 2017-10-05 11:12:54 -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
040f5cc9c4 Move edxnotes model import down into method. 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
John Eskew
6294766c24 Split emitted signals from the student models file. 2017-10-05 11:12:50 -04:00
Sofiya Semenova
34e3ec6afe Ed-1315 part 2, removing progress message entirely and replacing with another 2017-10-05 11:06:22 -04:00
Robert Raposa
23edd521f4 Fix upgrade event. 
LEARNER-2026
 2017-10-05 11:01:25 -04:00
Robert Raposa
07061caf91 Revert remains of 'upgrade upsell to course info banner'. 
TNL-6381 added an upgrade upsell to course info. In PR #15265, this was
partially removed/moved, but some clean-up work remained.

LEARNER-2026
 2017-10-05 10:54:08 -04:00
Nimisha Asthagiri
daf040986c Merge pull request #16170 from edx/naa/course-grade-report-three 
Grade reports: eliminate CSM calls, user-transformed structures
 2017-10-05 10:09:32 -04:00