Commit Graph

52861 Commits

Author SHA1 Message Date
Ned Batchelder
ccac3f5e14 Merge pull request #22804 from mahyard/master
Delete extra parentheses which prevented a message from being extracted
2020-01-12 09:40:02 -05:00
Mahyar Damavand
532f3e80fa Delete extra parentheses which prevented a message from being extracted 2020-01-12 17:17:51 +03:30
Jeff Chaves
251aad6288 Chavesj/enterprise v2 0 45 (#22796)
bumping enterprise version to 2.0.45
2020-01-10 16:05:41 -05:00
Awais Qureshi
87da483e87 Merge pull request #22789 from edx/awais786/BOM-1146-p2
Bom-1146
2020-01-11 01:24:59 +05:00
David Ormsbee
d0c764b4d8 Merge pull request #22320 from open-craft/fix-blockstore-field-bug
Improve handling of 'children' field in Blockstore XBlock runtime
2020-01-10 14:32:04 -05:00
Aarif
d89a1b872d Merge pull request #22713 from edx/BOM-1131
Updated the Mako Loader to remove deprecated methods
2020-01-10 21:34:04 +05:00
edX cache uploader bot
6eefba4e14 Updating Bokchoy testing database cache (#22792) 2020-01-10 09:44:26 -05:00
Awais Qureshi
48dbebd28f Bom-1146
In mobile-api model PLATFORM_CLASSES tuple of list and make migrations generate new migration due to different order.
2020-01-10 18:10:05 +05:00
Usama Sadiq
e7f112c61c Merge pull request #22773 from edx/usama/bom-1137
Updated ExceptionViews handles
2020-01-10 16:29:19 +05:00
usama sadiq
720dcb6c3a Updated ExceptionViews handles
Added additional 'exception' parameter to function headers.
Disabled pylint warnings for missing docstring and unused arguments.
2020-01-10 15:56:24 +05:00
Usama Sadiq
7a7ed99a73 Merge pull request #22771 from edx/usama/bom-1086
Django-mptt package upgrade to 0.10.0
2020-01-10 12:57:18 +05:00
Zia Fazal
f9e73da4f7 Merge pull request #22772 from edx/ziafazal/ENT-2524
ENT-2524: Unmarked name field of content gating partition for translation
2020-01-10 12:26:17 +05:00
usamasadiq
c821a49359 Updated django-mptt package to version 0.10.0 to provide support up to Django 2.2. 2020-01-10 11:42:30 +05:00
Awais Qureshi
804a2bbbb9 Merge pull request #22785 from edx/awais786/BOM-1146
Bom-1146
2020-01-10 11:38:35 +05:00
Awais Qureshi
390bae36e8 Bom-1146
Due to some recent schema changes this test is failing. Temporarily skipping it. Fix it in other PR.
2020-01-10 10:59:45 +05:00
mraarif
ecdf2a3ebd updated the custom Loader to remove deprecated methods 2020-01-10 03:16:29 +05:00
Stu Young
6fa7940792 Add django simple history to student.ManualEnrollmentAudit (#22629)
add django simple history to student.ManualEnrollmentAudit
2020-01-09 16:29:18 -05:00
David Ormsbee
946cc659c2 Merge pull request #22779 from edx/ormsbee/revert_context_processor_cache
Revert "Request cache context processor output."
2020-01-09 12:19:28 -05:00
David Ormsbee
bb271e10e8 Revert "Request cache context processor output."
This reverts commit ad5cc3d5d9.

This was causing middleware errors while processing 404s.
2020-01-09 10:51:42 -05:00
Matthew Piatetsky
ca7ca033b1 Merge pull request #22768 from edx/REV-1080
add coupon code to discount banner
2020-01-09 10:51:33 -05:00
Guruprasad Lakshmi Narayanan
c9fecb1103 Update the existing 'create_site_configuration' management command
Updates the existing command, after renaming it, to allow:
* Specifying the site ID instead of the domain.
* Updating the existing site configuration parameters.
* Enabling and disabling the SiteConfiguration instance.
2020-01-09 10:34:20 -05:00
Waheed Ahmed
833af45ef4 Fix course about page video. (#22775)
PROD-1124
2020-01-09 17:43:31 +05:00
zia.fazal@arbisoft.com
5367af07d8 Unmarked name field of content gating partition
Unmarked name field of content gating partition. edX mobile apps expect it in english. If value of name field of content gating partition is not `Feature-based Enrollments` string literal mobile apps ignore gating restriction and try to pull content of the block which cause 404 errors for all those blocks which are gated.
ENT-2524
2020-01-09 16:06:51 +05:00
Braden MacDonald
ac39692a8a Fix: don't store .children usage keys in definition data cache
I needed this change because I found a bug:

1. Create a block with children in a content library
2. Delete that content library
3. Create a new identical block with children in a new content library.
4. If the OLX is identical to the original block, this new block will not load in the LMS.

The reason for the bug is that the .children field contains usage keys (which encode the library, for example), but the values were being stored in BlockstoreFieldData which caches really aggressively and caches based on the hash of the OLX. Since the OLX is identical, it assumes the .children values should be identical as well.

The fix was to move children to a children-specific field data store, and only store the part of the child data that is encoded by the OLX (the <xblock-include> data) in BlockstoreFieldData. This is a better match for the way the caching works and cleaned up a hacky part of the runtime (at least it's slightly less hacky now).
2020-01-08 15:28:36 -08:00
Matthew Piatetsky
a47e68321e add coupon code to discount banner 2020-01-08 16:57:04 -05:00
Mahyar Damavand
f1c5981fab Removing deprecated management commands which intended to clear historical data (#21522) 2020-01-08 12:50:34 -05:00
Andytr1
24115bc696 Merge pull request #22751 from edx/andytr1/EDUCATOR-4828-team-prefix
EDUCATOR-4828
2020-01-08 10:47:28 -05:00
edX cache uploader bot
460a08d3f4 Updating Bokchoy testing database cache (#22762) 2020-01-08 09:41:42 -05:00
edX requirements bot
1b7ef708b8 Updating Python Requirements (#22758) 2020-01-08 08:56:01 -05:00
Aarif
7e517a987d Merge pull request #22576 from edx/BOM-1109
Updated the django-waffle to support django 2.2
2020-01-08 18:47:12 +05:00
edX cache uploader bot
58b6247d6b Updating Bokchoy testing database cache (#22759) 2020-01-08 07:54:57 -05:00
Zia Fazal
23c036fae9 Merge pull request #22757 from edx/ziafazal/ENT-2529
Ignore `ResourceWarning`
2020-01-08 16:34:08 +05:00
zia.fazal@arbisoft.com
ffd6f48557 Ignore ResourceWarning
Ignore `ResourceWarning` to clear noise in logs until we replace `EdxRestApiClient` with `OAuthAPIClient`. We have too many warnings like this
unclosed <ssl.SSLSocket fd=33, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6, laddr=('*.*.*', 47040), raddr=('*.*.*.*', 443)
2020-01-08 15:34:29 +05:00
aarif
79bf089406 updated the django-waffle to support django 2.2
made changes to test with previous version of django-waffle

updated the query count to test

testing with version 0.13

testing with version 0.14

testing with version 0.15

added version 0.14

updated the django-waffle version to use 0.18

updated the django-waffle version to use 0.16

updated the query counts to pass tests

ran make upgrade

updated the django-waffle to support django 2.2

made changes to test with previous version of django-waffle

updated the query count to test

testing with version 0.13

testing with version 0.14

testing with version 0.15

added version 0.14

updated the django-waffle version to use 0.18

updated the django-waffle version to use 0.16

updated the query counts to pass tests

removed the pdb statements

ran make upgrade
2020-01-08 14:11:42 +05:00
Usama Sadiq
2de89d6e49 Merge pull request #22732 from edx/usama/bom-1136
BOM-1136
2020-01-08 11:49:04 +05:00
Alex Dusenbery
6ab42849b7 CR-1640 | Makes course_api.api.get_due_dates() a little more defensive. 2020-01-07 21:34:09 -05:00
atesker
b4202bf8b7 EDUCATOR-4828 2020-01-07 15:42:02 -05:00
Hassan
582414842b Merge pull request #22737 from edx/pwnage101/rename-creditrequirement-order-3
Rename order in CreditRequirement (3/3)
2020-01-08 01:38:51 +05:00
Calen Pennington
5e98fd7fb2 Merge pull request #22747 from cpennington/read-staticfiles-storage-kwargs-from-config
Read STATICFILES_STORAGE_KWARGS from config to allow separate storage…
2020-01-07 15:10:38 -05:00
Calen Pennington
dd5f85c870 Read STATICFILES_STORAGE_KWARGS from config to allow separate storage configuration for static assets 2020-01-07 14:03:37 -05:00
Andytr1
7889386178 Merge pull request #22745 from edx/andytr1/delete_manual_grade_history
Delete persistent subsection grade override history
2020-01-07 13:56:01 -05:00
atesker
8234208cbb Delete persisten subsection grade override history
Removed model

renamed file
2020-01-07 12:05:24 -05:00
Hasnain Naveed
57d14201c0 Merge pull request #22735 from edx/hasnain-naveed/ENT-2524
ENT-2524 | Added the request `PATH_INFO` in exception traceback.
2020-01-07 21:33:51 +05:00
Calen Pennington
ea5c3f3d1b Merge pull request #22738 from cpennington/log-collect-assets-to-stdout
Allow debugging collect static during paver update_assets
2020-01-07 10:58:28 -05:00
edX requirements bot
742d65d56a Updating Python Requirements (#22733) 2020-01-07 10:36:35 -05:00
Calen Pennington
8091b7d45b Allow debugging collect static during paver update_assets 2020-01-07 09:32:30 -05:00
Troy Sankey
1178ad8b8b Rename order in CreditRequirement (3/3)
This stage does the following:

- Includes a migration to delete the old column.
- NO code changes.
2020-01-07 19:17:56 +05:00
hasnain.naveed
447f873924 ENT-2524 | Added the request META in exception traceback.
Only add `PATH_INFO` to log

removed METH from label too
2020-01-07 19:13:53 +05:00
Waheed Ahmed
49abac5812 Remove lang cookie for mobile app requests. (#22731)
* Remove lang cookie for mobile app requests.

Responses for mobile app requests must not include language preference cookie.

PROD-1107
2020-01-07 15:49:36 +05:00
usama sadiq
1c52f19f19 Deprecation of the direct assignment to the forward side of a many-to-many set
Changed the direct assignments with the use of set() method.
2020-01-07 14:40:23 +05:00