Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adeel Khan
4765e93bd1 Add new options and remove duplicate ones 
PROD-1129
 2020-01-06 13:58:56 +05:00
aarif
cfbac50a12 removed the deprecated usage of include 
added on_delete parameter

changes made as suggested

updated the courses wiki url to use include

updated the wiki urls

made changes as suggested
 2020-01-06 13:13:31 +05:00
edX cache uploader bot
02daf89745 Updating Bokchoy testing database cache (#22706) 2020-01-03 15:56:55 -05:00
Robert Raposa
0b275625e0 Merge pull request #22701 from edx/robrap/ARCH-1253-clean-up-metrics 
ARCH-1253: remove temporary metric
 2020-01-03 13:12:13 -05:00
Ned Batchelder
ae6132c2eb Merge pull request #22693 from cclauss/patch-1 
from xmodule.modulestore.exceptions import MultipleLibraryBlocksFound
 2020-01-03 13:00:42 -05:00
Calen Pennington
e11e9d9073 Allow overriding ProductionStorage and ProductionS3Storage kwargs with a django settings value 2020-01-03 12:14:12 -05:00
Jeremy Bowman
a4b2db677a Downgrade pandas and python-dateutil (#22703) 2020-01-03 12:12:11 -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
Calen Pennington
e654036d54 Load any AWS_ prefixed settings from ENV_TOKENS to allow S3Boto3Storage to be correctly configured 2020-01-03 11:16:03 -05:00
Hassan
c9b367794a Merge pull request #22699 from edx/pwnage101/rename-creditrequirement-order-2 
Rename order in CreditRequirement (2/3)
 2020-01-03 19:27:43 +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
Christian Clauss
69f286c90c from xmodule.modulestore.exceptions import MultipleLibraryBlocksFound 
Undefined name: __MultipleLibraryBlocksFound__ is raised on line 1096 but is never defined or imported.
 2020-01-02 23:49:32 +01: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
Ned Batchelder
eb94fabe0b Merge pull request #22675 from cclauss/patch-1 
Use ==/!= to compare str, bytes, and int literals
 2020-01-02 13:59:35 -05:00
Ned Batchelder
d263b2cff6 Merge pull request #22676 from cclauss/patch-2 
Undefined name: import datetime for line 30
 2020-01-02 13:58:45 -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
Christian Clauss
1496ce1efb Undefined name: import datetime for line 30 
Without this change, line 30 will raise NameError at runtime.
 2020-01-02 19:23:43 +01:00
Diana Huang
976c6873e5 Upgrade DRF to latest version. 2020-01-02 12:18:03 -05:00
Robert Raposa
909d650667 Merge pull request #22517 from edx/robrap/ARCH-1253-remove-login-shim-part-3 
ARCH-1253: remove shim_student_view from LoginSession.post - Part 3
 2020-01-02 11:46:20 -05:00
Ned Batchelder
471bb41b5b Merge pull request #22680 from edx/nedbat/remove-accepts 
Remove unused code
 2020-01-02 11:17:13 -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
edX cache uploader bot
f4bb9b4b8e Updating Bokchoy testing database cache (#22681) 2020-01-02 09:45:19 -05:00
Abdul Hannan
e652309066 Merge pull request #22391 from edx/rename_start_in_schedule_3/5 
Rename start in schedule 3/5
 2020-01-02 18:24:03 +05:00
hunytalk
e07c2f1c27 Copy values from old to new field in Schedules Model 2020-01-02 18:00:21 +05:00
Ned Batchelder
05700f724e Remove unused code 2020-01-02 07:22:17 -05:00
Zainab Amir
43a06fe385 Fix failing bokchoy test (#22670) 2020-01-02 11:03:01 +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
Manjinder Singh
ac232e926a Merge pull request #22645 from edx/msingh/fixing_type 
Fixing typo
 2020-01-01 21:26:16 -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
9ba09c4151 Merge pull request #22666 from edx/ormsbee/2020_test_fix 
Fix test that assumes 2020 is in the future.
 2019-12-31 18:04:50 -05:00
David Ormsbee
3f0281dd66 Fix test that assumes 2020 is in the future. 2019-12-31 17:25:02 -05:00
Syed Muhammad Dawoud Sheraz Ali
20426c761d Merge pull request #22662 from edx/dsheraz/PROD-1109-ora-update 
ORA update
 2019-12-31 15:37:59 +05:00
Aarif
e607657a73 Merge pull request #22620 from edx/on_delete_parameter 
Added on_delete parameter to models
 2019-12-31 15:23:47 +05:00
DawoudSheraz
8d068a4a09 ORA update 2019-12-31 14:32:20 +05:00
David Ormsbee
80fb484a98 Merge pull request #22445 from edx/ormsbee/reduce_queries 
Query optimizations
 2019-12-30 17:18:09 -05:00
Jeremy Bowman
eace6e36a7 Unpin assorted dependencies (#22656) 2019-12-30 17:09:14 -05:00
David Ormsbee
ad5cc3d5d9 Request cache context processor output. 
In Django template rendering, context processors only run once.
But when we do template rendering through edxmako (which we do for
each and every web fragment/XBlock), we can end up having hundreds
of invocations of templates and run context processors for each
separately. This removes that work.
 2019-12-30 16:38:46 -05:00
David Ormsbee
2cb2265ffe Add request caching to reduce ORM queries 
This adds request caching to the following places:
* course expiration wrapper (displayed in Units)
* offer banner generation (displayed in Units)
* get_enrollment
* user_by_anonymous_id
* youtube_disabled_for_course

On a sample course with edx-val enabled, this reduced the queries
for a large sequence from 450 to 155.
 2019-12-30 16:19:25 -05:00
edX cache uploader bot
e326520c03 Updating Bokchoy testing database cache (#22655) 2019-12-30 15:57:43 -05:00
Jeremy Bowman
3941e40b1b Skip date comments on all bok-choy DB dumps (#22651) 
In the script used to create the bok-choy database cache files, we've been passing in the parameters to omit timestamps that change for every run in some of the mysqldump commands but not all of them. Use them consistently so we can stop creating new redundant automated bok-choy DB cache PRs on almost every merge to edx-platform.
 2019-12-30 15:14:21 -05:00
David Ormsbee
db30d8f447 Merge pull request #22631 from appsembler/omar/iexact__in 
Safer CourseOverview.org filed matching
 2019-12-30 14:59:13 -05:00
Feanil Patel
941204329c Merge pull request #22652 from edx/feanil/lower_pylint_threshold 
Lower the pylint threshold.
 2019-12-30 14:49:27 -05:00
Feanil Patel
d63aaaa4c3 Lower the pylint threshold. 
We fixed various deprecation warnings as part of BOM-1024
 2019-12-30 13:52:15 -05:00
Feanil Patel
046feb0cf0 Merge pull request #22649 from edx/feanil/fix_pep8 
Fix all E303 pep8 errors.
 2019-12-30 13:32:26 -05:00
Feanil Patel
8a7159a324 Fix other pep8 violations. 2019-12-30 13:01:55 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts 
Run `2to3 -f asserts . -w` on edx-platform.
 2019-12-30 12:13:42 -05:00