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

51544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
dab59635a7 Fix some failing xmodule tests (#21775) 2019-09-25 12:01:27 -04:00
Jeremy Bowman
8828efc060 Fix test collection under py35 BOM-615 (#21774) 2019-09-25 11:20:21 -04:00
David Ormsbee
605674f766 Merge pull request #21690 from open-craft/blockstore-libraries-events 
Track grades for Blockstore content, emit tracking logs
 2019-09-25 11:05:10 -04:00
Chris Pappas
918b70f9a1 ENT-2294 | Removing wrapper api in program_enrollments app that edx-enterprise will no longer use (#21763) 2019-09-25 10:55:43 -04:00
Braden MacDonald
8a2d499dd2 Track grades for Blockstore content, emit tracking logs 2019-09-25 10:42:55 -04:00
edX cache uploader bot
17a8d57699 Updating Bokchoy testing database cache (#21772) 2019-09-25 10:21:41 -04:00
Diana Huang
9ecbbf6801 Merge pull request #21457 from edx/diana/remove-shoppingcart-pdf 
Remove shoppingcart pdf generation.
 2019-09-25 10:06:17 -04:00
Diana Huang
e80265bb9a Remove shoppingcart pdf generation. 
DEPR-40
 2019-09-25 09:07:09 -04:00
edX requirements bot
1cc925b624 Updating Python Requirements (#21771) 2019-09-25 09:06:00 -04:00
Ayub
6428797366 Merge pull request #21707 from edx/BOM-679 
BOM-679
 2019-09-25 17:11:56 +05:00
Aarif
4e95024dc3 Merge pull request #21525 from edx/BOM-367 
BOM-367 Python 3 fixes
 2019-09-25 16:07:44 +05:00
Aarif
22992029f8 Merge pull request #21755 from edx/BOM-658 
BOM-658
 2019-09-25 15:19:01 +05:00
Aarif
43ebcc3dab Merge pull request #21758 from edx/BOM-407 
BOM-407
 2019-09-25 15:14:09 +05:00
Aarif
5f3b5d6110 Merge pull request #21748 from edx/BOM-586 
BOM-586
 2019-09-25 14:55:12 +05:00
Ayub khan
22c6d45d90 BOM-679 
Request object was mocked but mocked value was never assigned.
In py2 moked object call is always successful. But in py3 if
value is not properly assigned it returns None. Causing the test
to fail. Removing the mocked object also fails the test so
removing it as broken test.
 2019-09-25 14:47:28 +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
aarif
22e99642e7 python 3 fixes 2019-09-24 16:24:44 +05:00
aarif
11fe396314 python 3 fixes 2019-09-24 15:38:01 +05: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
822af10479 python 3 fixes 
quality fixes
 2019-09-23 19:22:40 +05: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