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

42948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Armstrong
4feb57d044 Merge pull request #16205 from edx/andya/more-stylelint-fixes-2 
Sass quality fixes in the LMS
 2017-10-11 16:24:52 -04:00
Matthew Piatetsky
b26d48010a Merge pull request #16135 from edx/LEARNER-2412 
LEARNER-2412 Use local currency in LMS
 2017-10-11 15:43:36 -04:00
Matthew Piatetsky
c741bcbee7 Implement local currency in lms 
LEARNER-2412
 2017-10-11 14:37:18 -04:00
Robert Raposa
344e13b1ce Merge pull request #16179 from edx/robrap/refactor-site-enrollment-filter 
Refactor site course enrollment filtering.
 2017-10-11 14:10:08 -04:00
Andy Armstrong
9f0fba0a8e Sass quality fixes in the LMS 2017-10-11 13:45:08 -04:00
Robert Raposa
112938e4ac Refactor site course enrollment filtering. 2017-10-11 12:21:42 -04:00
Waheed Ahmed
0702df51bf Merge pull request #16114 from edx/waheed/LEARNER-2320-upgrade-edx-organizations-version 
Upgrading the edx-organizations package to 0.4.7.
 2017-10-11 20:20:14 +05:00
Douglas Hall
612d962962 Merge pull request #16196 from edx/douglashall/update_enterprise_0_51_2 
Updating edx-enterprise to 0.51.3.
 2017-10-11 10:37:39 -04:00
Feanil Patel
69d5239678 Merge pull request #16108 from open-craft/haikuginger/install-extra-middleware 
Add middleware classes dynamically from configuration
 2017-10-11 10:22:49 -04:00
Andy Armstrong
5ae2bee17f Merge pull request #16119 from edx/hackathon/bootstrap-courseware 
Convert course home page to Bootstrap
 2017-10-11 10:21:13 -04:00
Jesse Shapiro
c4767e253b Add middleware classes dynamically from configuration and switch MIDDLEWARE_CLASSES to use a list 2017-10-11 09:16:41 -04:00
Waheed Ahmed
5cb908991f Upgrading the edx-organizations package to 0.4.7. 
Added explicit 'fields' attribute to OrganizationSerializer. Creating a
ModelSerializer without either the 'fields' attribute or the 'exclude'
attribute has been deprecated since 3.3.0.

LEARNER-2320
 2017-10-11 18:03:00 +05:00
Douglas Hall
ca903278f5 Updating edx-enterprise to 0.51.2. 
https://github.com/edx/edx-enterprise/compare/0.51.0...0.51.2
 2017-10-11 08:47:50 -04:00
Douglas Hall
c0d74f1956 Merge pull request #16136 from open-craft/uman/refactor-consent-view 
[ENT-497] Update user-facing consent view to reflect new data model
 2017-10-11 08:36:51 -04:00
Andy Armstrong
374cdb0a3d Convert course home page to Bootstrap 
LEARNER-1694

Fix a11y failure

Fix header styling

Fix layout issues

Further layout fixes
 2017-10-10 20:18:27 -04:00
Uman Shahzad
7516453c14 Bump to 0.51.1. 2017-10-11 02:05:04 +05:00
Uman Shahzad
2601b26af6 Update mocks/docs/code to reflect Enterprise API updates. 2017-10-11 02:05:04 +05:00
Michael Youngstrom
db6570b754 Merge pull request #16198 from edx/youngstrom/pin_moment_dependency 
Pin moment dependency to 2.18.1
 2017-10-10 16:55:32 -04:00
Michael Youngstrom
da0c07403c Pin moment dependency 2017-10-10 15:38:46 -04:00
Alex Dusenbery
4489745475 Check if cert_info dict is empty before rendering dashboard_certificate_information.html 2017-10-10 14:17:58 -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
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
Sofiya Semenova
3fcd7c69de Merge pull request #16183 from edx/ssemenova/ed-1315-part3 
Checking if CAD exists before using it in dashboard
 2017-10-06 14:50:05 -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
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