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

42399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
83dee24410 Merge pull request #15885 from edx/zoldak/EDUCATOR-1233 
Remove flaky test PreRequisiteCourseTest.test_dashboard_message
 2017-08-23 12:53:19 -04:00
Calen Pennington
a08447e420 Merge pull request #15883 from edx/ret/remove-old-test 
Remove a test that was only valid for XML-backed courses
 2017-08-23 12:15:19 -04:00
Jesse Zoldak
8cca5d1649 Remove flaky test PreRequisiteCourseTest.test_dashboard_message 2017-08-23 11:50:17 -04:00
Saleem Latif
3131790a47 Merge pull request #15873 from edx/saleem-latif/ENT-612 
ENT-612: Version upgrade for edx-enterprise that contains fix for 500 error on enterprise landing page.
 2017-08-23 19:59:00 +05:00
Calen Pennington
bfd7241e0c Remove a test that was only valid for XML-backed courses 2017-08-23 10:52:52 -04:00
Jeff LaJoie
f79e9da044 Merge pull request #15874 from edx/jlajoie/EDUCATOR-1135-add-null-check 
EDUCATOR-1135: Adds in null check cohort management command
 2017-08-23 10:17:35 -04:00
Matthew Piatetsky
a23b74691e Merge pull request #15867 from edx/LEARNER-1510 
Fix unenrollment survey when multiple courses are present
 2017-08-23 09:58:47 -04:00
Stu Young
7318161760 Merge pull request #15844 from edx/estute/remove-skipped-flaky-tests 
remove or unskip skipped flaky tests
 2017-08-23 09:26:39 -04:00
Jeff LaJoie
87db8fcff1 adds in null check for swap from auto track cohort management command 2017-08-23 08:59:44 -04:00
Saleem Latif
5d7d191e19 Version upgrade for edx-enterprise that contains fix for 500 error on enterprise landing page. 2017-08-23 17:22:42 +05:00
Eric Fischer
d16363d628 Merge pull request #15865 from edx/efischer/ora_2.0.3 
update edx-ora2
 2017-08-22 17:39:24 -04:00
Matthew Piatetsky
dcee785543 Fix selectors so that unenrollment survey works with multiple courses 2017-08-22 17:31:50 -04:00
Matthew Piatetsky
7c0423ff03 Revert revert of unenrollment survey. 
This reverts commit e2ee48c3c9.
 2017-08-22 16:33:05 -04:00
Diana Huang
40a5b066dc Merge pull request #15843 from edx/robrap/LEARNER-1858-show-join-date-2 
Support for joined date to profile.
 2017-08-22 15:43:49 -04:00
Ayub khan
04da157e04 Merge pull request #15861 from edx/LEARNER-174 
LEARNER-174 Make country label and error message more user friendly
 2017-08-23 00:16:55 +05:00
Eric Fischer
926e5a49bb update edx-ora2 2017-08-22 14:54:37 -04:00
ayub-khan
e737728cde Updated Country Label and help text 
Country Label was causing confusions for learners if it was country of origin or in which they
are living so changed it to a more appropriate message.
LEARNER-174
Also updated some other error messages to some more appropriate error messages.
 2017-08-22 23:20:35 +05:00
Matthew Piatetsky
6e607fcc56 Merge pull request #15864 from edx/revert-15828-LEARNER-1510 
Revert "Un-revert unenrollment survey and only show it for edx.org users"
 2017-08-22 13:47:53 -04:00
Matthew Piatetsky
e2ee48c3c9 Revert "Un-revert unenrollment survey and only show it for edx.org users" 2017-08-22 13:40:25 -04:00
Brittney Exline
8c2586f68c Merge pull request #15859 from edx/bexline/enterprise_version_bump 
ENT-585 Enterprise: Change course modal to use discovery api
 2017-08-22 13:29:53 -04:00
Alex Dusenbery
2cc87952e3 EDUCATOR-1204 | can always view certs when ready for self-paced courses; don't hide cert buttons; update messaging. 2017-08-22 13:27:26 -04:00
Robert Raposa
7cc9400b91 Support for joined date to profile. 
LEARNER-1858
 2017-08-22 12:52:37 -04:00
Gregory Martin
b8aa3052ae Merge pull request #15813 from edx/yro/update_cert 
Update Certificate Task Call
 2017-08-22 12:42:43 -04:00
Matthew Piatetsky
839b5320de Merge pull request #15828 from edx/LEARNER-1510 
Un-revert unenrollment survey and only show it for edx.org users
 2017-08-22 11:37:31 -04:00
Brian Mesick
6f30dedb56 Merge pull request #15821 from edx/bmedx/upgrade_django_model_utils 
Upgrade of django-model-utils to 3.0.0 for Django 1.11 support
 2017-08-22 10:51:46 -04:00
Matthew Piatetsky
25ffb3568c Update unenrollment survey to only be included for edx.org and rebase with master 2017-08-22 10:12:01 -04:00
Matthew Piatetsky
98cf69bac5 Revert "Revert "LEARNER-1510 Add unenrollment reason survey"" 
This reverts commit 441bccf4b6.
 2017-08-22 10:12:01 -04:00
Diana Huang
2cd20d28b9 Merge pull request #15857 from edx/diana/change-icon 
Use an X icon instead of text.
 2017-08-22 10:10:56 -04:00
Gregory Martin
b19d80597c Update Task 2017-08-22 09:57:29 -04:00
Diana Huang
cb381a7cff Use an X icon instead of text. 2017-08-22 09:13:48 -04:00
Brittney Exline
b6e4e175dc ENT-585 Enterprise: Change course modal to use discovery api 2017-08-21 15:04:00 -04:00
McKenzie Welter
ff54a771a8 Merge pull request #15838 from edx/McKenzieW/learner-2228 
Track program purchase attempts from learner programs dashboard
 2017-08-21 12:51:18 -04:00
McKenzie Welter
3e4d20e0d4 bundle purchase tracking 2017-08-21 11:22:52 -04:00
Ned Batchelder
eeb70ca3e3 Merge pull request #15856 from edx/nedbat/fix-field-i18n 
XBlock fields with formatted-in values can now translate properly
 2017-08-21 11:19:01 -04:00
Michael Roytman
e8e01a99d5 Merge pull request #15782 from edx/mroytman/PLAT-1612-upgrade-django-babel-underscore 
PLAT-1612: Upgrade edx-platform to use new django-babel-underscore (0.5.2)
 2017-08-21 10:54:42 -04:00
Waheed Ahmed
6c74cf48e4 Merge pull request #15837 from edx/waheed/LEARNER-2110-add-activation-key-var-in-sailthru 
Add activation_key var to user profile in SailThru.
 2017-08-21 11:32:02 +05:00
Ned Batchelder
fee0c41ce0 XBlock fields with formatted-in values can now translate properly 2017-08-19 15:37:12 -04:00
Gregory Martin
e00867ccd4 Merge pull request #15852 from edx/yro/neem_bugbash 
Yro/neem bugbash
 2017-08-19 11:25:09 -04:00
Gregory Martin
147405df76 Update Flag handling 2017-08-19 08:37:21 -04:00
Andy Armstrong
a506486f67 Merge pull request #15855 from edx/andya/bootstrap-update-lang-page-3 
Convert /update_lang/ page to use Bootstrap
 2017-08-18 17:18:05 -04:00
Douglas Hall
93d84396bd Merge pull request #15854 from edx/douglashall/ENT-585 
Upgrading the edx-organizations package to 0.4.6.
 2017-08-18 16:59:47 -04:00
Andy Armstrong
82f7d6ee64 Convert /update_lang/ page to use Bootstrap 
LEARNER-1922
 2017-08-18 16:15:38 -04:00
Douglas Hall
79660788f7 Upgrading the edx-organizations package to 0.4.6. 
This fixes a bug with the organizations API's get_organization function.
 2017-08-18 15:59:57 -04:00
Andy Armstrong
2b4fe140e1 Merge pull request #15850 from edx/andya/fix-features-i18n-part-2 
Allow i18n strings to be scraped from openedx/features
 2017-08-18 15:42:05 -04:00
Andy Armstrong
41f7502ae3 Allow i18n strings to be scraped from openedx/features 
LEARNER-2304
 2017-08-18 14:41:36 -04:00
George Song
98ee25fbab Merge pull request #15587 from open-craft/jill/tpa-hint-setting 
Adds settings.FEATURES['THIRD_PARTY_AUTH_HINT']
 2017-08-18 13:28:18 -04:00
Ayub khan
36e4c801a9 Merge pull request #15848 from edx/LEARNER-1426-Render_Issue 
LEARNER-1426 Fix for dialog rendering
 2017-08-18 19:53:04 +05:00
Waheed Ahmed
33e077d4e2 Add activation_key var to user profile in SailThru. 
As an email marketer, I would like to send an account activation reminder to learners who haven't activated
their accounts to increase their chances of coming back and engaging with our platform. Each user profile in
SailThru will have a var with the correct activation_key originally assigned to the user.

LEARNER-2110
 2017-08-18 19:34:52 +05:00
Michael Roytman
f2c2402068 update to new version of django-babel-underscore, which supports Django 1.8 - Django 1.11 2017-08-18 10:25:44 -04:00
ayub-khan
558490e71b Fix for dialog rendering 2017-08-18 18:10:09 +05:00