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

51562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aarif
6f1c05e28c Merge pull request #21744 from edx/BOM-645 
BOM-645
 2019-09-26 12:36:00 +05:00
Aarif
37b08c5784 Merge pull request #21745 from edx/BOM-610 
BOM-610
 2019-09-26 12:35:24 +05:00
Aarif
53e6f7ce8d Merge pull request #21757 from edx/BOM-531 
BOM-531
 2019-09-26 12:34:40 +05:00
Ayub
732e57ddde Merge pull request #21640 from edx/BOM-135 
BOM-135
 2019-09-26 11:55:22 +05:00
Ayub khan
4ae88b1bee BOM-135 
fixed all failing tests for the file.
 2019-09-26 11:23:57 +05:00
Ayub
846a12939e Merge pull request #21735 from edx/BOM-update_str_method 
BOM Project __unicode__ to __str__
 2019-09-26 10:47:14 +05:00
edX Transifex Bot
89960f726c geoip2: update maxmind geolite country database 2019-09-25 17:08:27 -04:00
Joseph Mulloy
348550957b Merge pull request #21718 from edx/jdmulloy/fix_devstack_migrations 
Add dependency on csmhe migration to csm bigint
 2019-09-25 16:29:10 -04:00
Joseph Mulloy
f2a599bffb Add dependency on csmhe migration to csm bigint 2019-09-25 15:41:26 -04:00
Alex Dusenbery
30655847f9 Upgrade django-user-tasks==0.2.1 2019-09-25 15:22:01 -04:00
Zia Fazal
8c9b13e6fc Merge pull request #21770 from edx/ziafazal/ENT-2268 
ENT-2268: Added signal handler for COURSE_GRADE_NOW_PASSED
 2019-09-25 23:31:36 +05:00
Zia Fazal
19436f8d3d Bumped edx-enterprise version to 1.10.7 
Fixed broken unit test

connected COURSE_GRADE_NOW_PASSED at the end

added receiver to signal connect call
 2019-09-25 22:32:53 +05:00
Cory Lee
0befab339b Always run CSMH migrations in all contexts (#21776) 
* Always run CSMHE migrations for every application in all contexts
 2019-09-25 13:27:26 -04:00
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
aarif
00f42fbd9a python 3 fixes 
python 3 fixes

python 3 fixes

python 3 fixes

minor changes
 2019-09-25 18:47:37 +05:00
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05: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
736001e7f1 python 3 fixes 
quality fixes

python 3 fixes
 2019-09-25 15:10:50 +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
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
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