Commit Graph

51526 Commits

Author SHA1 Message Date
Zia Fazal
b73979dc72 Added signal handler for COURSE_GRADE_NOW_PASSED
Added signal handler for COURSE_GRADE_NOW_PASSED to trigger single learner data transmission task in edx-enterprise.

Bumped edx-enterprise version to 1.10.7

Revert edx-enterprise version bump
2019-09-25 14:30:49 +05:00
Uzair Rasheed
b284c2337f Merge pull request #21753 from edx/PROD-664/gettext-attribute-error
DjangoTranslation object doesn't have ugettext attribute
2019-09-25 14:04:31 +05:00
uzairr
930bf84188 DjangoTranslation object doesn't have ugettext attribute
Some of the tests are failing because DjangoTranslation object is
behaving differently with py2 and py3.With py2, it has 'ugettext'
attribute but with py3 it doesn't have.To make it compliant with
both versions modifications in the tests have been added so that
build will not fail.

PROD-664
2019-09-25 13:31:39 +05:00
Alex Dusenbery
60fa989a39 edx-bulk-grades==0.6.4 2019-09-24 18:08:03 -04:00
David Ormsbee
f4f01c48b4 Merge pull request #21286 from open-craft/paulo/fix-progress-graph-yaxis
Fix the progress graph y-axis - window resize formatting problem in Ironwood
2019-09-24 18:00:33 -04:00
Andytr1
608924c602 Merge pull request #21766 from edx/andytr1/restore-grade-history-model
restore model
2019-09-24 16:30:21 -04:00
atesker
eee86323a4 restore model 2019-09-24 15:57:21 -04:00
Alex Dusenbery
07cf13ceae EDUCATOR-4638 | edx-bulk-grades==0.6.3 - make sure we pass a user_id attribute into GradeCSVProcessor.__init__() 2019-09-24 12:26:40 -04:00
Jeremy Bowman
6cfa08d21d Fix CSV writing in test BOM-639 (#21762) 2019-09-24 12:13:59 -04:00
Feanil Patel
4b64a44c3a Merge pull request #21736 from edx/feanil/update_for_py3_fixes
Feanil/update for py3 fixes
2019-09-24 11:23:20 -04:00
Kyle McCormick
da08357d89 Revert "Revert "Create Python API for program_enrollments: Part IV"" (#21759)
This reverts commit a67b9f70a16a0f16a842aad84754b245a2480b5f,
reinstating commit cf78660ed35712f9bb7c112f70411179070d7382.
The original commit was reverted because I thought I found
bugs in it while verifying it on Stage, but it turns out that
it was simply misconfigured Stage data that causing errors.

The original commit's message has has been copied below:

This commit completes the program_enrollments LMS app
Python API for the time being. It does the following:
* Add bulk-lookup of users by external key in api/reading.py
* Add bulk-writing of program enrollments in api/writing.py
* Move grade-reading to api/grades.py
* Refactor api/linking.py to use api/writing.py
* Refactor signals.py to use api/linking.py
* Update rest_api/v1/views.py to utilize all these changes
* Update linking management command and support tool to use API
* Remove outdated tests from test_models.py
* Misc. cleanup

EDUCATOR-4321
2019-09-24 10:49:54 -04:00
Feanil Patel
35cb40859d Update dependencies to pull in python3 fixes. 2019-09-24 10:41:56 -04:00
edX requirements bot
76d7270fe9 Updating Python Requirements (#21756) 2019-09-24 10:39:54 -04:00
Jeremy Bowman
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
Chris Pappas
4c9af183cb ENT-2294 | Moving utility functions in program enrollments to places … (#21752)
* ENT-2294 | Moving utility functions in program enrollments to places related to the data they manipulate

* updating a mock path

* minor test fix
2019-09-24 10:07:38 -04:00
Awais Qureshi
6d5ea3b7ea Merge pull request #21732 from edx/awais786/BOM-584
Awais786/bom 584
2019-09-24 14:37:37 +05:00
Awais Qureshi
1f92b080f7 Merge pull request #21733 from edx/awais786/BOM-581
BOM-581
2019-09-24 14:26:29 +05:00
Awais Qureshi
2c8b17a153 Merge pull request #21741 from edx/awais786/BOM-594
awais786/bom 594
2019-09-24 14:24:25 +05:00
Zainab Amir
ad41b7b2c0 Use edx-ui-toolkit for KeyCodes (#21743)
PROD-687
2019-09-24 13:42:56 +05:00
Aarif
2f5998f085 Merge pull request #21626 from edx/BOM-457
BOM-457
2019-09-24 12:33:17 +05:00
aarif
07b5c954b0 python 3 fixes
test fixes

python 3 fixes

minor fixes

python 3 fixes

quality fixes

quality fixes
2019-09-24 12:01:02 +05:00
noraiz-anwar
a596579e62 patch jquery's extend 2019-09-24 10:53:10 +05:00
Andytr1
73a89a876e Merge pull request #21746 from edx/andytr1/remove-persistence-subsec-history-model
EDUCATOR-4670 - pr 1 - remove usage of persistsubsectionoride history
2019-09-23 16:00:09 -04:00
Emma Green
cf6f9ea06a Merge pull request #21739 from edx/emma-green/REV-970/enterprise-users-should-not-get-first-purchase-discount
enterprise users should not get the first purchase discount
2019-09-23 15:04:09 -04:00
Emma Green
4783aed927 Enterprise users should not get the first purchase discount. 2019-09-23 14:30:38 -04:00
Feanil Patel
9633e3cd1a Pull the recommender xblock from PyPI. 2019-09-23 11:52:26 -04:00
Alex Dusenbery
a379dddc1e Remove faker==2.0.1 constraint; upgrade edx-bulk-grades to 0.6.2 2019-09-23 11:38:19 -04:00
Ned Batchelder
e1a3d66143 Merge pull request #21220 from eduNEXT/coa/course-index-regex
Making the regex that gets the index courses more secure
2019-09-23 11:32:28 -04:00
atesker
47d32f0ef5 EDUCATOR-4670 - pr 1 - remove usage of persistsubsectionoride history
remove unused param
2019-09-23 11:04:30 -04:00
Nimisha Asthagiri
41c392493b Merge pull request #21587 from edx/arch/rename-fed-repos
Rename cookie-policy-banner to frontend-component-cookie-policy-banner
2019-09-23 10:25:01 -04:00
Aarif
9fc5b70f1b Merge pull request #21702 from edx/BOM-736
BOM-736
2019-09-23 19:16:14 +05:00
Stu Young
e7e7873e96 fix variable in feature toggle script (#21737) 2019-09-23 09:41:18 -04:00
Kyle McCormick
775d2fd807 Revert "Create Python API for program_enrollments: Part IV"
This reverts commit af4e7a348a.

After merging the above commit, I was seeing 'internal-error's
on Stage in responses to the Registrar API. I am temporarily
reverting it until I can figure out a fix.
2019-09-23 09:39:01 -04:00
aarif
70f51de25b python 3 fixes
quality fixes

python 3 fixes

quality fixes
2019-09-23 17:21:37 +05:00
Nimisha Asthagiri
6bc34727e4 Update package.json via npm install 2019-09-23 07:32:47 -04:00
Aarif
e7a509faf0 Merge pull request #21704 from edx/BOM-724
BOM-724
2019-09-23 14:24:35 +05:00
Nimisha Asthagiri
2b8e6b0806 Rename cookie-policy-banner to frontend-component-cookie-policy-banner 2019-09-22 20:47:34 -04:00
edX Transifex Bot
a51c362561 fix(i18n): update translations 2019-09-22 17:22:49 -04:00
Awais Qureshi
8fcb74efa4 BOM-594
Python3 fix.
2019-09-22 04:25:31 +05:00
Awais Qureshi
0dcee53c1c BOM-594
Python3 fix.
2019-09-21 23:42:54 +05:00
Awais Qureshi
d8e49fadab Merge pull request #21727 from edx/awais786/BOM-637
BOM-637
2019-09-21 17:59:58 +05:00
Awais Qureshi
ec7f575474 Merge pull request #21678 from edx/awais786/BOM-482
Awais786/bom 482
2019-09-21 17:58:13 +05:00
Hassan
bada715554 Merge pull request #21716 from edx/hassan/courseoverview-history
Management command to add history to course_overviews_courseoverview.
2019-09-21 00:35:03 +05:00
Hassan Javeed
23cd4d9899 Management command to add history to course_overviews_courseoverview. 2019-09-20 23:50:01 +05:00
Awais Qureshi
a0e4e94e31 BOM-482
Fixing python3
2019-09-20 20:18:18 +05:00
Matthew Piatetsky
d6dbaabd33 Merge pull request #21720 from edx/emma-green/use-the-user-from-parameter-to-check-flag
use the specified user from the parameter to determine if the flag is…
2019-09-20 10:49:23 -04:00
Kyle McCormick
af4e7a348a Create Python API for program_enrollments: Part IV
This commit completes the program_enrollments LMS app
Python API for the time being. It does the following:
* Add bulk-lookup of users by external key in api/reading.py
* Add bulk-writing of program enrollments in api/writing.py
* Move grade-reading to api/grades.py
* Refactor api/linking.py to use api/writing.py
* Refactor signals.py to use api/linking.py
* Update rest_api/v1/views.py to utilize all these changes
* Update linking management command and support tool to use API
* Remove outdated tests from test_models.py
* Misc. cleanup

EDUCATOR-4321
2019-09-20 09:55:13 -04:00
Kyle McCormick
298c3498ae Add course_exists utility to CourseOverview class 2019-09-20 09:55:13 -04:00
Kyle McCormick
14d650a522 Style fix: de-dent docstring in linking.py 2019-09-20 09:55:13 -04:00
Ayub
1fda63900c Merge pull request #21666 from edx/BOM-314
BOM-314
2019-09-20 18:35:59 +05:00