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

42987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
3fd499b40c Merge pull request #16133 from edx/adam/fix-cg-bug 
address coursegraph issue where components had the same block id but …
 2017-10-13 13:59:10 -04: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
3f7d8bc9b4 Merge pull request #16187 from edx/tuchfarber/program_marketing 
Rewrite program marketing page to use Bootstrap and change design to look more like other marketing design
 2017-10-13 13:12:51 -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
Robert Raposa
92318ccc0f Merge pull request #16217 from edx/robrap/fix-outline-caching 
LEARNER-2819: Fix caching of course_outline_root_block.
 2017-10-13 11:19:04 -04:00
Andy Armstrong
87b43ba05c Merge pull request #16200 from edx/andya/bootstrap-rtl-support 
Add RTL support for Bootstrap CSS
 2017-10-13 11:11:32 -04:00
Michael LoTurco
96dbd26f83 Added edx-themed certificate template partials for learner-1996 2017-10-13 11:02:20 -04:00
Dennis Jen
3c4323010c Merge pull request #16221 from edx/dsjen/fix-config-text 
Fixed typos in comment and config  message.
 2017-10-13 10:26:55 -04:00
Robert Raposa
1a66ae368a Fix caching of course_outline_root_block. 
LEARNER-2819
 2017-10-13 10:10:37 -04:00
sandroroux
40d3f4f2fc Unit tests for "_add_upsell_button_to_email_template". 2017-10-13 10:08:52 -04:00
Tyler Hallada
d571adfb99 Use upsell_link in upgrade reminder template 2017-10-13 10:01:35 -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
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
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