Commit Graph

53520 Commits

Author SHA1 Message Date
Troy Sankey
bfd45980c7 Merge pull request #23236 from edx/pwnage101/deng-18-rename_site_configuration_siteconfiguration_values_2.2
Add migration to populate site_values in SiteConfigurationHistory
2020-03-03 11:05:27 -05:00
David Ormsbee
9d3f4985ed Allow Block Structures Collect to work in Studio
Block Structures were meant to be gathered using the LMS process,
as it's meant to be an optimized store for the LMS to use. But
there's an argument to be made for at least the Collect side of
the Collect + Transform could be a Studio concern, because it
explicitly needs to avoid user-awareness.

In either event, collect() was broken on devstack before this
commit because Studio's runtime does not permit handler_url
invocation on "thirdparty" XBlocks. Since VideoBlock is not
really third-party (and it's questionable whether there's any
benefit to making the distinction these days), I'm just making
this change to allow Studio to run collect() without error in
the Studio process. This will fix devstack, which does not
properly route these collect() calls to the LMS process (because
celery runs in-proc by default).
2020-03-03 10:52:46 -05:00
Manjinder Singh
4399d13955 removing all of provider (#23269)
* Revert "Ran make migration on third_party_auth (#23253)"

This reverts commit 49be65cc58.

* Removing provider.util import

* Removing further provider things

* Adding hash tests
2020-03-03 10:42:18 -05:00
Awais Jibran
ca48c42214 Merge pull request #23245 from edx/aj/handle-not-enrolled-case-extentions
Fix due date extension view.
2020-03-03 20:36:19 +05:00
Awais Jibran
c6e0985812 Upgrade edx-when in edx-platform
Run `make upgrade` on edx-platform to update python packages.
PROD-1333
2020-03-03 20:01:09 +05:00
Feanil Patel
dea918b8b8 Merge pull request #23270 from edx/revert-23253-msingh/run_migration
Revert "Ran make migration on third_party_auth"
2020-03-03 09:57:48 -05:00
Manjinder Singh
fa2140cd16 Revert "Ran make migration on third_party_auth (#23253)"
This reverts commit 49be65cc58.
2020-03-03 09:17:26 -05:00
Adam Butterworth
a628016436 Prevent inline discussions from pulling focus on load (#23254)
TNL-7094 Remove auto focusing of InlineDiscussion views on load. Removing this unneeded focus management eliminates scroll issues when discussions are contain in an iframe in a parent page.
2020-03-03 08:57:30 -05:00
Ahtisham Shahid
be51e92c9e Merge pull request #23235 from edx/ahtisham/PROD-1330
created logs to track edx-lti.org  errors
2020-03-03 15:48:19 +05:00
Braden MacDonald
af6cab86c3 Enforce permissions for content libraries, add REST API to edit perms 2020-03-02 18:17:46 -08:00
Dave St.Germain
c1a09ffcbb Merge pull request #23238 from edx/dcs/mode-info
Add verified mode to the courseware API
2020-03-02 18:16:12 -05:00
Feanil Patel
e04e557575 Merge pull request #23261 from edx/feanil/add_shortuuid
Feanil/add shortuuid
2020-03-02 17:21:36 -05:00
Manjinder Singh
49be65cc58 Ran make migration on third_party_auth (#23253)
* Ran make migration on third_party_auth and removing skip comment from test_migrations_are_in_sync
2020-03-02 16:32:40 -05:00
Cory Lee
4be35d9eca DENG-17 Dropping FK on schedules to enrollments to perform ghost migration (#23260) 2020-03-02 16:32:04 -05:00
Feanil Patel
93b02e5c31 Rollback edx-when. 2020-03-02 16:06:05 -05:00
Feanil Patel
aa2920521f Run make upgrade. 2020-03-02 15:24:09 -05:00
Feanil Patel
5e43d6aa22 Add shortuuid requirement explicitly. 2020-03-02 15:24:09 -05:00
Alex Dusenbery
530cabd003 Remove the auth_source kwarg in connect_to_mongodb, since we're now relying on authsource (no underscore) and the pymongo Database init does not expect and will not tolerate an auth_source kwarg. 2020-03-02 15:20:50 -05:00
Fred Smith
6433e88ac8 Merge pull request #20545 from ichintanjoshi/master
fix very long horizontal scroll for RTL layout
2020-03-02 15:07:24 -05:00
Albert (AJ) St. Aubin
482a3f33d8 Merge pull request #23255 from edx/aj/MICROBA-150_2
Create MB External ID on creation of a CourseEntitlement in MB Program
2020-03-02 14:37:53 -05:00
Albert (AJ) St. Aubin
0721357e46 Create MB External ID on creation of a CourseEntitlement in MB Program 2020-03-02 13:44:20 -05:00
Diana Huang
1d5acb9d21 Merge pull request #23221 from edx/diana/remove-dop-libraries
Remove DOP libraries from INSTALLED_APPS.
2020-03-02 13:34:12 -05:00
Luis Moreno
ae0c051e9e Use authsource instead of auth_source for compatibilities with pymongo 2020-03-02 13:31:07 -05:00
Diana Huang
0024f00195 Constrain django-countries and make upgrade. 2020-03-02 12:57:04 -05:00
Troy Sankey
06b547057e Add migration to populate site_values in SiteConfigurationHistory
Right now the ORM is very unhappy about the JSONField `site_values`
in SiteConfigurationHistory containing non-JSON (empty strings).  We
cannot even write a data migration using the ORM to populate the field
because that causes a JSONDeserializationError.  Therefore, we must
bypass the ORM and populate the values with raw SQL.

DENG-18
2020-03-02 11:44:28 -05:00
Feanil Patel
09031dc250 Merge pull request #23232 from edx/feanil/remove_unused_bokchoy_pages
Feanil/remove unused bokchoy pages
2020-03-02 11:37:09 -05:00
Diana Huang
0fa91d72db Remove DOP libraries from edx-platform.
Remove DOP apps from INSTALLED_APPS.
Remove DOP libraries from requirements.
2020-03-02 11:17:47 -05:00
Feanil Patel
088a3685a0 Remove pages for test removed as a part of bokchoy cleanup. 2020-03-02 11:03:00 -05:00
Feanil Patel
a7219e8eaa Use vulture to find unused bokchoy page objects.
These were all un-used on master.
2020-03-02 11:02:59 -05:00
Manjinder Singh
9725303c4a Removing patch from test (#23250)
the patched toggle was removed from edx-drf-extensions recently
2020-03-02 11:02:25 -05:00
Cory Lee
2c87aeddc3 DENG-17 Dropping the FK on schedulesexperience->schedule to apply change to schedule as a gh-ost migration (#23242) 2020-03-02 10:10:52 -05:00
Feanil Patel
32e854729b Merge pull request #23200 from edx/feanil/remove_unvaluable_bokchoy_tests
Feanil/remove unvaluable bokchoy tests
2020-03-02 10:10:32 -05:00
Feanil Patel
5ec487452d Merge pull request #23188 from edx/robrap/BOM-1324-add-constraint
BOM-1324: remove oauth2.enforce_jwt_scopes toggle
2020-03-02 09:55:35 -05:00
Manjinder Singh
d08cd9ce04 Removing provider imports from edx-platform (#23229)
* Removing from provider imports from openedx

 * removed all uses of retire_dop_oauth2_models

* Removing provider library from lms, common, and cms

Created/copied function short_token(from django-oauth-provider) and create_hash256 to help with conversion
2020-03-02 08:56:54 -05:00
Jeremy Bowman
45644a3511 Upgrade edx-lint BOM-1298 (#23227)
The last time we tried this upgrade we encountered timeouts on the quality job, which it now appears were due to the worker running pylint common running out of memory and killing the Jenkins process. Switching to a different worker type with double the RAM (8 GB vs. 4 GB) seems to have fixed this; about 5.5 GB was used. Upstream is aware of the high memory usage on large projects, it's apparently due primarily to a cache of parsed modules: https://github.com/PyCQA/pylint/issues/1495 .

Even after disabling some of the new checks that have been added, the new version of pylint found about twice as much to complain about. Just bumping the threshold for now to unblock the Django upgrade, we can try automated utilities like pyupgrade to fix some of these later.
2020-03-02 08:27:19 -05:00
Ahtisham Shahid
1a82282cfd created logs to track lti erros
added meta in logger

updated logs

updated logs
2020-03-02 15:27:55 +05:00
Awais Jibran
5577539b0a Fix due date extension view.
Return error when user is not enrolled in the course.
PROD-1339
2020-03-02 12:03:14 +05:00
Bill DeRusha
6330dd1d54 Merge pull request #23240 from edx/bderusha/waffle-util-fix
Fix Deprecation: log.warn -> log.warning
2020-02-28 15:36:55 -05:00
Bill DeRusha
c1ebdaf0c3 Fix Deprecation: log.warn -> log.warning 2020-02-28 15:04:07 -05:00
edX cache uploader bot
cdad9a18fe Updating Bokchoy testing database cache (#23239) 2020-02-28 14:04:28 -05:00
Dave St.Germain
84e854d22c Merge pull request #23205 from edx/dcs/fix-tabs
Add url_slug to the CourseOverviewTab, to support serializing StaticTabs
2020-02-28 12:43:36 -05:00
Dave St.Germain
7d94408132 Add verified mode to the courseware API 2020-02-28 12:42:26 -05:00
Brittney Exline
b12790e405 Merge pull request #23237 from edx/bexline/ent2666
Revert "BOM-1069"
2020-02-28 10:39:23 -07:00
Adam Butterworth
04083cf4ab Allow chromeless courseware content to be centered (#23201)
TNL-7093 Use inline styles to reset display to block from table-cell and width to auto
2020-02-28 12:27:14 -05:00
Brittney Exline
a22c676cac Revert "BOM-1069"
This reverts commit 140738df4c.
2020-02-28 09:52:49 -07:00
Frank Bijlsma
a195b5699c expand subsections when the url anchor points to them. 2020-02-28 11:32:13 -03:00
Ayub
6d6283f4e9 Merge pull request #23119 from edx/BOM-1069
BOM-1069
2020-02-28 18:48:37 +05:00
Ayub-khan
140738df4c BOM-1069
-django-babel-underscore custom version to support django>=2.2
2020-02-28 18:18:45 +05:00
Feanil Patel
fa87430cf6 Remove the crowdsource_hinter tests and the xblock director along with it. 2020-02-27 18:26:24 -05:00
Feanil Patel
44bcf4e87e Remove low value video license test. 2020-02-27 18:26:24 -05:00