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

42170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edx-pipeline-bot
b411fa0c79 Merge pull request #15765 from edx/release-mergeback-to-master 
Merge release back to master
 2017-08-07 13:51:57 -04:00
Brittney Exline
7bc87a5f56 Merge pull request #15754 from edx/douglashall/upgrade_enterprise_0_39_8 
Upgrading edx-enterprise to 0.39.8.
 2017-08-07 10:17:46 -04:00
Eric Fischer
7c06fad512 Merge pull request #15757 from edx/efischer/saturday 
EDU-1090, take 2 part 3
 2017-08-07 09:46:42 -04:00
Nimisha Asthagiri
74829243d6 Merge pull request #15758 from edx/neem/course-overview-force-update 
Add force_update option to generate_course_overview command
 2017-08-07 08:40:20 -04:00
Waheed Ahmed
6e780eaaf3 Merge pull request #15731 from edx/waheed/LEARNER-2039-send-welcome-email-on-new-user-creation 
Send welcome email to inactive learners on registration.
 2017-08-07 14:04:20 +05:00
Waheed Ahmed
f073a11475 Send welcome email to inactive learners on registration. 
LEARNER-2039
 2017-08-07 12:44:50 +05:00
Clinton Blackburn
986afbfa38 Powering courseware deadline with schedules 2017-08-05 22:06:17 -04:00
Clinton Blackburn
85e4274a05 Refactored tests for date summary blocks 2017-08-05 22:06:17 -04:00
Clinton Blackburn
1e7f7df79b Added CourseEnrollment.upgrade_deadline 
This new property knows how to rely on schedule deadliens and fallback to course mode deadlines, when necessary.
 2017-08-05 22:06:17 -04:00
Clinton Blackburn
7274a20f38 Created Schedule model 
This model will be used to control dynamic upgrade deadlines for
learners.
 2017-08-05 22:06:17 -04:00
Eric Fischer
ca3a7c2608 edx-submissions patch release 
See https://github.com/edx/edx-submissions/pull/68 for details.

EDUCATOR-1090
 2017-08-05 17:53:09 -04:00
Nimisha Asthagiri
944d30a973 Add force_update option to generate_course_overview command 2017-08-05 11:36:55 -04:00
Eric Fischer
dab4728ff3 Merge pull request #15756 from edx/efischer/clean_master 
Revert "Merge pull request #15753 from edx/efischer/submissions_rc"
 2017-08-04 23:28:08 -04:00
Eric Fischer
0356bfdd4d Revert "Merge pull request #15753 from edx/efischer/submissions_rc" 
This reverts commit 95d76568a5, reversing
changes made to aafd4d9c61.
 2017-08-04 22:28:29 -04:00
edx-pipeline-bot
888e817e72 Merge pull request #15755 from edx/release-mergeback-to-master 
Merge release back to master
 2017-08-04 22:23:37 -04:00
Douglas Hall
24b316e311 Upgrading edx-enterprise to 0.39.8. 
https://github.com/edx/edx-enterprise/compare/0.39.7...0.39.8
 2017-08-04 20:31:06 -04:00
Eric Fischer
95d76568a5 Merge pull request #15753 from edx/efischer/submissions_rc 
patch release edx-submissions
 2017-08-04 17:03:15 -04:00
Eric Fischer
2e6f2a72d0 Merge pull request #15752 from edx/efischer/submissions_rc 
patch release edx-submissions
 2017-08-04 16:56:18 -04:00
Steven Zheng
229c685884 Merge pull request #15697 from edx/LEARNER-2101 
Add advanced settings to generate_courses command
 2017-08-04 16:35:23 -04:00
Eric Fischer
17e44491c8 patch release edx-submissions 2017-08-04 15:34:04 -04:00
Steven Zheng
d04c03e67c Add advanced settings to generate_courses command 2017-08-04 15:28:59 -04:00
Brian Beggs
555619906a Merge pull request #15751 from edx/bbeggs/PLAT-1656 
Add forums URL default for docker devstack
 2017-08-04 15:25:59 -04:00
Brian Beggs
7b54cf5603 Modify COMMENTS_SERVICE_URL for bokchoy docker settings 2017-08-04 15:17:01 -04:00
Brian Beggs
54695d84fb Add forums URL default for docker devstack 2017-08-04 15:07:10 -04:00
Douglas Hall
0a81e6c226 Merge pull request #15748 from edx/douglashall/upgrade_enterprise_0_39_7 
Upgrade edx-enterprise package to 0.39.7.
 2017-08-04 15:01:01 -04:00
Michael Youngstrom
129428bb53 Merge pull request #15749 from edx/revert-14836-teltek/i18n_certificate_date 
Revert "Add i18n to date in certificate web"
 2017-08-04 14:48:05 -04:00
George Song
53ccd15850 Merge pull request #15742 from edx/george/fix-breaking-test 
Strip `c` from `.pyc` for error message comparison
 2017-08-04 11:20:49 -07:00
George Song
fab9ddba6a Merge pull request #15737 from caesar2164/fix-library-content-import-upstream 
Fix attrib check code for library_content import
 2017-08-04 10:58:01 -07:00
Michael Youngstrom
ca1ca99abf Revert "Add i18n to date in certificate web" 2017-08-04 13:55:17 -04:00
Giulio Gratta
2ad885b726 Fix attrib check code for library_content import 
Attributes come in as a list of dicts with strings as keys and values.
Implicitly casting each result as a tuple causes the code to split the key string into it's characters.
This yields a list of characters, the first two of which are placed into the variables "attr_name" and "attr_value".
This is not only wrong, but because keys tend to be more than 2 characters, the net result is:

"ValueError: too many values to unpack"
 2017-08-04 10:47:05 -07:00
George Song
69b2116d85 Merge pull request #14836 from pepeportela/teltek/i18n_certificate_date 
Add i18n to date in certificate web
 2017-08-04 09:24:44 -07:00
pepeportela
1ff5333bc0 Add space between arguments 2017-08-04 18:16:39 +02:00
Douglas Hall
a3c0e54cf2 Upgrade edx-enterprise package to 0.39.7. 
https://github.com/edx/edx-enterprise/compare/0.39.6...0.39.7
 2017-08-04 11:57:07 -04:00
George Song
f3faad7ebc Strip c from .pyc for error message comparison 
In Python 2.7, `__file__` returns `.pyc` by default, this breaks our
comparison so let's strip out the trailing `c`.
 2017-08-04 08:41:23 -07:00
jportela
54a26cfff4 Add i18n month with strftime_localized in certificate views 2017-08-04 17:38:51 +02:00
Douglas Hall
198dbc1e61 Merge pull request #15738 from edx/douglashall/upgrade_enterprise_0_39_6 
Upgrading edx-enterprise to 0.39.6.
 2017-08-04 09:41:04 -04:00
jportela
a35e974457 Fix typo introduced in commit b841176 2017-08-04 14:31:55 +02:00
jportela
b841176e9c Add i18n month dict to certificate using @amangano-edx solution in PR #14836 2017-08-04 14:27:43 +02:00
jportela
2646858cad Add i18n to date in certificate web 2017-08-04 14:11:34 +02:00
Douglas Hall
8812664384 Upgrading edx-enterprise to 0.39.6. 
https://github.com/edx/edx-enterprise/compare/0.39.5...0.39.6
 2017-08-03 17:11:25 -04:00
Alex Dusenbery
aafd4d9c61 Turn down grades logging; put policy change regrade behind a waffle killswitch. 2017-08-03 14:06:17 -04:00
Brittney Exline
d8a974b678 Merge pull request #15715 from edx/saleem-latif/ENT-555 
ENT-555: Continue button is not appearing on registration page.
 2017-08-03 11:05:34 -04:00
Michael Roytman
0dddf9eb1a Merge pull request #15660 from edx/mroytman/PLAT_1495_django_1.11_upgrade_django-debug-toolbar 
update django-debug-toolbar from 1.5 to 1.8
 2017-08-03 10:10:34 -04:00
Tasawer Nawaz
8463dd49aa Merge pull request #15724 from edx/tasawer/learner-2167/fix-lms-dashboard-errors 
Fix LMS dashboard error, if HttpServerError occurs on ecommerce
 2017-08-03 17:49:22 +05:00
tasawernawaz
b645af424a Fix lms dashboard error, if HttpServerError occurs on ecommerce 
LEARNER-2167
 2017-08-03 16:48:21 +05:00
Noraiz Anwar
993ba5f2d7 Merge pull request #15543 from edx/noraiz/EDUCATOR-444 
Throw error if celery task creation is not successfully completed.
 2017-08-03 16:15:04 +05:00
Waheed Ahmed
fcba934122 Merge pull request #15719 from edx/waheed/LEARNER-1801-lerner-fulfilment-error 
Added new signal to refund on un-enrollment from LMS dashboard.
 2017-08-03 15:34:19 +05:00
Waheed Ahmed
c74cd970ad Added new signal to refund on un-enrollment from LMS dashboard. 
LEARNER-1801
 2017-08-03 14:39:05 +05:00
noraiz-anwar
d1da044520 Throw error if messaging queue is not available 2017-08-03 14:11:25 +05:00
Tasawer Nawaz
3e7243ea67 Merge pull request #15699 from edx/tasawer/learner-1494/add-password-complexity-on-reset-page 
length complexity added on password reset page
 2017-08-03 13:54:50 +05:00