Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
Aamish Baloch
02ab4a0364 Merge pull request #16146 from edx/aamishbaloch/YONK-776 
YONK-776: added thread_followed and thread_unfollowed signals
 2017-10-16 11:54:49 +05:00
Michael LoTurco
12e09d1c2e Merge pull request #16185 from edx/MLoTurco/learner-1996 
Adding spanish certificate template partials learner-1996
 2017-10-13 13:42:09 -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
Michael LoTurco
96dbd26f83 Added edx-themed certificate template partials for learner-1996 2017-10-13 11:02:20 -04:00
sandroroux
40d3f4f2fc Unit tests for "_add_upsell_button_to_email_template". 2017-10-13 10:08:52 -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
956cb91955 Add an import of a submodule to make pytest less complainy 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
Nimisha Asthagiri
c5e0ce503e Merge pull request #16218 from edx/naa/fix-grade-zero-error 
Grades: Fix ZeroDivisionError
 2017-10-12 15:36:07 -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
Nimisha Asthagiri
811ab640f9 Grades: fix ZeroDivisionError 2017-10-12 14:17:56 -04:00
John Eskew
194413cdf9 Add migrations which remove HistoricalRecord tables. 2017-10-12 11:20:25 -04:00
McKenzie Welter
8f31c1f251 extended parameters of language-less certificate templates 2017-10-12 10:30:51 -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
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
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
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
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
2601b26af6 Update mocks/docs/code to reflect Enterprise API updates. 2017-10-11 02:05:04 +05:00
Aamish Baloch
7c3dab08a7 YONK-776: added thread_followed and thread_unfollowed signals 2017-10-09 19:14:38 +05: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
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
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
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
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
Troy Sankey
e94d265fa7 Remove our copy of the slugify() implementation 2017-10-05 15:37:01 -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
f5f6b08884 Add missing 'later' variable. 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
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
6294766c24 Split emitted signals from the student models file. 2017-10-05 11:12:50 -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
b5435e6f5a Course Grade reports: eliminate CSM calls, user-transformed structures 
EDUCATOR-558
 2017-10-05 01:12:49 -04:00
Nimisha Asthagiri
33428519aa Have SubsectionGrade compute problem_scores lazily 2017-10-04 09:56:27 -04:00
Nimisha Asthagiri
10171bbfd1 Merge pull request #16149 from edx/naa/grade-report 
Optimize grade reports for ZeroCourseGrades
 2017-10-03 16:39:31 -04:00
Andy Armstrong
ace9a4fc78 Merge pull request #16143 from edx/andya/verification-availability-message 
Display course home message for certificate availability
 2017-10-03 15:08:01 -04:00
Andy Armstrong
c13b531eeb Display course home message for certificate availability 
LEARNER-2182
 2017-10-03 14:06:11 -04:00
Nimisha Asthagiri
27229a1f9b Optimize grade reports for ZeroCourseGrades. 
EDUCATOR-558
 2017-10-03 11:35:32 -04:00
Nimisha Asthagiri
0b1d22f0b4 Merge pull request #16084 from edx/naa/grades-test-cleanup 
Grades: Clean up
 2017-10-03 11:33:21 -04:00
Nimisha Asthagiri
f8e3a3c461 Grades Cleanup 
EDUCATOR-1405
EDUCATOR-1451
 2017-10-02 19:03:26 -04:00
Nimisha Asthagiri
0de55de2a0 Grades: Clean up tests 
EDUCATOR-1404
 2017-10-02 19:01:38 -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
McKenzie Welter
18d8cd965c Merge pull request #16088 from edx/McKenzieW/learner-1997 
Add 'Hours of Effort' to Spanish certificates template context
 2017-09-29 15:53:35 -04:00
Nimisha Asthagiri
8721dad500 Merge pull request #16083 from edx/naa/grades-remove-read-only 
Grades: remove read_only param and create method
 2017-09-29 14:50:43 -04:00