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

52837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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