Commit Graph

22621 Commits

Author SHA1 Message Date
David Ormsbee
21aca9ccb8 Merge pull request #21633 from open-craft/samuel/celery-fix
SE-1463 add djangoapps.heartbeat to INSTALLED_APPS by default
2019-09-26 13:19:44 -04:00
Ned Batchelder
ef192243e2 Fix one XSS linter issue 2019-09-26 10:53:55 -04:00
Ned Batchelder
58828da55b Fix patches to use proper courseware imports 2019-09-26 10:53:55 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Ned Batchelder
83406db629 Add more diagnostics to the courseware import warning 2019-09-26 09:13:15 -04:00
adeelehsan
609fe8632c Merge pull request #21777 from edx/aehsan/prod-707/fixed_encoding_error
Used encode instead of str
2019-09-26 18:01:25 +05:00
adeelehsan
8e2cdc2dad Used smart_str instead of str 2019-09-26 16:28:03 +05:00
aarif
1793de5cbb python 3 fixes
test fixes

python 3 fixes

test fixes

test fixes

quality fix

python 3 fixes

minor fixes
2019-09-26 14:50:14 +05:00
Ayub khan
2b3538a6eb BOM-687
python3 compatibility
2019-09-26 12:46:47 +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
Samuel Walladge
518060fc51 Include djangoapps.heartbeat by default
If this isn't installed, the sample_task provided by
openedx.core.djangoapps.heartbeat isn't imported, and thus are never
registered with the celery workers.  This sample_task is used for the
extended heartbeat api call. Since the celery heartbeat check is turned
on by default, we should also make sure this djangoapp and thus
sample_task is registered by default. Otherwise the extended heartbeat
check fails with the default configuration.
2019-09-26 11:13:43 +09:30
Joseph Mulloy
f2a599bffb Add dependency on csmhe migration to csm bigint 2019-09-25 15:41:26 -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
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
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
Ayub
6428797366 Merge pull request #21707 from edx/BOM-679
BOM-679
2019-09-25 17:11:56 +05:00
Aarif
43ebcc3dab Merge pull request #21758 from edx/BOM-407
BOM-407
2019-09-25 15:14:09 +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
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
atesker
eee86323a4 restore model 2019-09-24 15:57:21 -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
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
Zainab Amir
ad41b7b2c0 Use edx-ui-toolkit for KeyCodes (#21743)
PROD-687
2019-09-24 13:42:56 +05:00
noraiz-anwar
a596579e62 patch jquery's extend 2019-09-24 10:53:10 +05: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
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
Nimisha Asthagiri
2b8e6b0806 Rename cookie-policy-banner to frontend-component-cookie-policy-banner 2019-09-22 20:47:34 -04:00
Awais Qureshi
a0e4e94e31 BOM-482
Fixing python3
2019-09-20 20:18:18 +05: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
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
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2
Python3 swarm 2
2019-09-20 08:48:19 -04:00
Ayub khan
7d055023bb BOM-314
python3 compatibility
2019-09-20 15:50:48 +05:00
Ayub
a85b30a8b4 Merge pull request #21703 from edx/BOM-273
BOM-273
2019-09-20 15:41:54 +05:00
Usama Sadiq
682e5cad56 Merge pull request #21667 from edx/usama/prod-600-aside-tag-on-dashboard-programs-page
Dashboard Programs Page Aside tag update
2019-09-20 12:38:12 +05:00
Feanil Patel
844acea50e Fix linting errors. 2019-09-19 17:05:02 -04:00
Feanil Patel
0c1e18ff53 BOM-622 Fix more type errors. 2019-09-19 16:57:54 -04:00
Feanil Patel
802929fde4 BOM-622 Type errors in content matching. 2019-09-19 16:18:23 -04:00
Ben Holt
5cc8da127a REV-935 mobile upsell and tests (#21687)
Positive test case and improvements including: requires course id to be correctly encoded in the url params, only checks entitlements of the course in question, better source for the basket url, check enrollment upgrade deadline
2019-09-19 14:59:07 -04:00
Feanil Patel
9740e2e077 BOM-618 Don't decode string objects. 2019-09-19 14:14:23 -04:00
Jansen Kantor
b0f40a111c add requesting_user to simple-history model (#21683) 2019-09-19 13:43:35 -04:00