Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,815 Commits 1 Branch 0 Tags
ea5c3f3d1b60bfbd2ac4f804fb15ff7c1e531205
Commit Graph

52815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Aarif
8f5a166ab4 Merge pull request #22616 from edx/BOM-1120 
Removed the deprecated usage of include urls.
 2020-01-07 12:52:57 +05:00
Jeremy Bowman
f10a7550d7 Unpin more dependencies (#22690) 2020-01-06 15:07:01 -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
Andytr1
7655e54719 Merge pull request #22726 from edx/andytr1/ora2-2.5.8-release 
Update edx-ora2 version to 2.5.8
 2020-01-06 14:14:18 -05:00
atesker
b5887d9755 Update edx-ora2 version to 2.5.8 2020-01-06 13:22:25 -05:00
Waheed Ahmed
3857cf1f90 Merge pull request #22722 from edx/waheed/PROD-1107-fix-update-session-lang 
Fix update session language endpoint.
 2020-01-06 19:48:47 +05:00
edX requirements bot
0f74e6ce69 Updating Python Requirements (#22716) 2020-01-06 09:46:56 -05:00
Waheed Ahmed
78dabaf2b5 Fix update session language endpoint. 
PROD-1107
 2020-01-06 18:57:46 +05:00
Waheed Ahmed
8cd9f141fd Merge pull request #22721 from edx/waheed/PROD-800-add-page-title-for-program-webviews 
Add page title for program dashboard webviews.
 2020-01-06 18:55:18 +05:00
Waheed Ahmed
8a1c3b4ae2 Add page title for program dashboard webviews. 
PROD-800
 2020-01-06 18:05:24 +05:00
Ayub
74f430f35f Merge pull request #22697 from edx/codejail-version-bump 
codejail version bump.
 2020-01-06 17:32:51 +05:00
adeel khan
c654c31db7 Merge pull request #22711 from edx/adeel/prod_1130_security_option_contact_form 
Add security option to contact us form
 2020-01-06 16:30:02 +05:00
adeel khan
e4dd9e29cf Merge pull request #22712 from edx/adeel/prod_1129_add_and_remove_duplicates 
Add new options and remove duplicate ones
 2020-01-06 16:29:49 +05:00
Ayub-khan
03c17fe778 Codejail New Style Middlware 2020-01-06 15:51:22 +05:00
Ahtisham Shahid
e485bc0d5e Merge pull request #22696 from edx/ahtisham/ORA2-version-update 
updated ora2 version to 2.5.6
 2020-01-06 15:18:10 +05:00
Ahtisham Shahid
765b578d3f Updated ora2 and others by make upgrade 2020-01-06 14:45:52 +05:00
Adeel Khan
b849b14269 Add security option to contact us form 
PROD-1130
 2020-01-06 14:12:59 +05:00
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