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
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
George Song
2605bf99b6 Merge pull request #15700 from mitodl/aq_unicode_issue_capa 
Fixed problem with non-Latin characters in loncapa/python problems
 2017-10-13 04:59:21 -07:00
Douglas Hall
457b9a110a Merge pull request #16223 from edx/douglashall/ENT-704 
Fix get_enterprise_customer api cache key.
 2017-10-13 06:59:19 -04:00
Douglas Hall
2062dd8629 Fix get_enterprise_customer api cache key. 
ENT-704
 2017-10-13 14:43:12 +05:00
asadiqbal
c5be291e6f Version bumped 2017-10-13 11:31:07 +05:00
Andy Armstrong
fc3af68e3b Add RTL support for Bootstrap CSS 
LEARNER-1705
 2017-10-13 00:15:01 -04:00
Dennis Jen
badcd439ff Fixed typos in comment and config message. 2017-10-12 16:48:55 -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
McKenzie Welter
5557eae276 Merge pull request #16212 from edx/McKenzieW/cert-lookup-logic-fix 
extended parameters of non-language-specific custom certificate templates
 2017-10-12 13:06:43 -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
Noraiz Anwar
092183d8fe Merge pull request #16214 from edx/noraiz/EDUCATOR-1506 
delete_course command with course keys containing unicode chars
 2017-10-12 19:10:27 +05:00
noraiz-anwar
8bc7ae1466 delete_course command with course keys containing unicode chars 2017-10-12 18:07:04 +05:00
AsadAzam
a9d68c32c0 Merge pull request #16160 from edx/asad/educator-1427-problem-rescore 
Fixed score update on rescore
 2017-10-12 14:32:22 +05:00
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
Simon Chen
540e8237e6 Merge pull request #16206 from edx/schen/revert-for-release 
Revert "Exposing course run license via Course API"
 2017-10-11 14:25:58 -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
Asad Azam
cde6f4b773 Fixed score update on rescore 2017-10-11 23:03:04 +05:00
Andy Armstrong
9f0fba0a8e Sass quality fixes in the LMS 2017-10-11 13:45:08 -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
Robert Raposa
112938e4ac Refactor site course enrollment filtering. 2017-10-11 12:21:42 -04:00
John Eskew
737ebccb74 Remove django-simple-history and all HistoricalRecords. 2017-10-11 11:36:06 -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
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
Calen Pennington
dd53edc6e0 Cache upgrade_deadline on CourseEnrollment objects 2017-10-06 15:23:42 -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
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