Commit Graph

4212 Commits

Author SHA1 Message Date
DawoudSheraz
466e2ce530 remove the logs 2020-01-16 13:14:29 +05:00
Dave St.Germain
cfd1e2ae7d Merge pull request #22707 from edx/dcs/sequence-api
Implementation of metadata endpoint for sequence modules
2020-01-15 10:33:18 -05:00
M Zulqarnain
e5407a31ee Merge pull request #22841 from mzulqarnain1/zulqarnain/BOM-1147
BOM-1147 -- Create a code mod for Widget.render change
2020-01-15 11:35:58 +05:00
Julia Eskew
84de6bc6de Revert "This stage does the following: (#22692)"
This reverts commit cebeab4348.
2020-01-14 13:01:21 -05:00
Julia Eskew
cebeab4348 This stage does the following: (#22692)
- Adds the new field and migration to create the column.
- Makes all writes go to both old and new field.
2020-01-14 10:40:39 -05:00
Dave St.Germain
20235bcf56 Added subsection id to gated metadata. 2020-01-14 10:01:07 -05:00
Awais Qureshi
a37854931e Merge pull request #22842 from mzulqarnain1/zulqarnain/BOM-1138
BOM-1138 -- Update assertRedirects usage
2020-01-14 16:57:08 +05:00
Zia Fazal
402a1b3257 Merge pull request #22840 from edx/ziafazal/ENT-2535-b
ENT-2535: Changed site configuration name to avoid conflict with existing configuration
2020-01-14 16:38:15 +05:00
Zulqarnain
93a726ff6b Merge branch 'master' into zulqarnain/BOM-1138 2020-01-14 15:25:20 +05:00
Zulqarnain
e6a6fd15d4 Merge branch 'master' into zulqarnain/BOM-1147 2020-01-14 15:23:43 +05:00
zia.fazal@arbisoft.com
17e64a8020 Chnage site configuration name to avoid conflict with existing configration
Changed `THIRD_PARTY_AUTH_HINT` to `THIRD_PARTY_AUTH_ONLY_HINT` because there is an existing configuration with same name.
2020-01-14 15:19:52 +05:00
Zulqarnain
834079104b BOM-1147 Widget.render change 2020-01-14 15:15:19 +05:00
Nicholas D'Alfonso
3ad963b8a7 AA-3 course dates cleanup
-change Important Course Dates to Upcoming Dates
-remove today's date
-left align date, right aling rest of info
2020-01-13 14:58:23 -05:00
George Babey
ebe2ee103e Merge pull request #22813 from edx/ziafazal/ENT-2535
ENT-2535: Added link to error message displayed when TPA only user login from FPA form
2020-01-13 12:06:56 -05:00
hunytalk
ef7350f375 Add comment 2020-01-13 19:09:15 +05:00
hunytalk
8374d111c1 Add start_date, end_date for renaming start, end field to CourseOverview 2020-01-13 18:59:51 +05:00
zia.fazal@arbisoft.com
60ce80379b Added link to error message displayed when TPA only user login from FPA login page
Added link to error message displayed when TPA only user login from FPA login page.
ENT-2535

Fixed pep8 quality violation

skip unit test if context is not LMS
2020-01-13 14:23:04 +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
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
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
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
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
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
Zulqarnain
cf58da6ee0 Update assertRedirects usage 2020-01-08 14:35:40 +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
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
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
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
Calen Pennington
a20d511e4e Merge pull request #22702 from cpennington/static-files-s3-configs
Load any AWS_ prefixed settings from ENV_TOKENS to allow S3Boto3Stora…
2020-01-06 14:20:43 -05:00
Waheed Ahmed
78dabaf2b5 Fix update session language endpoint.
PROD-1107
2020-01-06 18:57:46 +05:00
Calen Pennington
e11e9d9073 Allow overriding ProductionStorage and ProductionS3Storage kwargs with a django settings value 2020-01-03 12:14:12 -05:00
Robert Raposa
fca5db3c8a remove temporary metric
Note: This metric is always "None", and was only used temporarily to
prove that no `enrollment_action` was getting through.

ARCH-1253
2020-01-03 11:29:17 -05:00
Troy Sankey
407c8cb076 Rename order in CreditRequirement (2/3)
This stage does the following:

- Includes a data migration to copy the values from old to new field.
- Changes business logic to switch to using new field.
- Deletes all code references of the old field.
2020-01-03 18:07:28 +05:00
Diana Huang
c061a9c4a6 Merge pull request #22596 from edx/diana/upgrade-drf
Upgrade DRF to 3.9.4.
2020-01-02 16:09:02 -05:00
Calen Pennington
de53a434aa Merge pull request #22569 from cpennington/static-files-s3
Static files s3
2020-01-02 15:19:25 -05:00
Calen Pennington
151b309225 Convert custom storage subclasses into mixins so that we can store to either the filesystem or S3 2020-01-02 14:49:19 -05:00
Christian Clauss
6e8b4ccb08 Use ==/!= to compare str, bytes, and int literals
Identity is not the same thing as equality in Python so use ==/!= to compare str, bytes, and int literals. In Python >= 3.8, these instances will raise SyntaxWarnings so it is best to fix them now. https://docs.python.org/3.8/whatsnew/3.8.html#porting-to-python-3-8
2020-01-02 19:26:13 +01:00
Diana Huang
976c6873e5 Upgrade DRF to latest version. 2020-01-02 12:18:03 -05:00
Calen Pennington
0ee1c2f05a Remove S3ReportStorage, because S3BotoStorage already handles a custom_domain argument 2020-01-02 10:25:53 -05:00
Manjinder Singh
6c69b6d435 Adding code to output pytest warnings. (#22570)
* Added pytest-json-report plugin
	- modifying app-opts in setup.cfg
	- adding hook to all conftest.py files in repo
	- setting report to be saved to test_root/log/warnings.json
	- Writing custom logic to save json report to avoid overwrite if pytest called twice
This was created to allow us to easily parse through test warnings in jenkins
2020-01-02 10:01:52 -05:00
hunytalk
e07c2f1c27 Copy values from old to new field in Schedules Model 2020-01-02 18:00:21 +05:00
Matthew Piatetsky
09e62afb99 Merge pull request #22598 from edx/REV-1061
[REV-1061] Set discount on order based on discount that was on basket
2020-01-01 22:53:01 -05:00
Zaman Afzal
363a75cc99 ENT-2518 Fix Enterprise Login Page not showing to the user (#22602) 2020-01-01 15:18:45 +05:00
David Ormsbee
3f0281dd66 Fix test that assumes 2020 is in the future. 2019-12-31 17:25:02 -05:00