Commit Graph

12296 Commits

Author SHA1 Message Date
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
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
atesker
8234208cbb Delete persisten subsection grade override history
Removed model

renamed file
2020-01-07 12:05:24 -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
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
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
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
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
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
Calen Pennington
0ee1c2f05a Remove S3ReportStorage, because S3BotoStorage already handles a custom_domain argument 2020-01-02 10:25:53 -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
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
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
Feanil Patel
39d3a7ca17 Fix pep8 issues caused by the fixer. 2019-12-30 11:42:04 -05:00
Feanil Patel
61e1eda20d Merge pull request #22644 from edx/feanil/2to3_imports
Run `2to3 -f future . -w`
2019-12-30 11:21:05 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform.
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
2019-12-30 10:22:19 -05:00
Awais Qureshi
928a84f969 BOM-1117
Specifying a namespace in django.conf.urls.include() without providing an app_name is deprecated.
Adding the app_name attribute in the included module.
2019-12-30 18:08:21 +05:00
David Ormsbee
a8992a16dd Merge pull request #21610 from open-craft/samuel/test-oauth2
SE-1071 send user_logged_in signal from my_user_info
2019-12-27 10:34:44 -05:00
aarif
02350e0fee added on_delete parameter to foreign_key and oneToOne fields
changes made to fix issues with quality
2019-12-27 19:59:45 +05:00
Giovanni Cimolin da Silva
d1aeec45ad Remove flaky test related to MockS3Mixin
The MockS3Mixin prevents the correct setup of the ModuleStoreTestCase 
and made this test fail. Since the fix for this wasn't trivial, this 
test was skipped on python 3, and now is removed.
2019-12-27 09:59:25 -03:00
Samuel Walladge
c0b908e02d send user_logged_in signal from my_user_info
A user's last logged in value previously wasn't updated when the user
logs in through the oauth2 flow from the ios mobile app. Here we must
send the user_logged_in signal manually. It's implemented in the
my_user_info mobile rest api endpoint because adding it to where the
oauth2 flow happens is to complex, and the mobile app hits this endpoint
after a successful login anyway.
2019-12-27 09:37:22 +10:30
Feanil Patel
f359c9cd8f Merge pull request #21197 from open-craft/giovanni/upgrade-pymongo
BB-1744: Bump pymongo version and fix course export issue
2019-12-26 11:16:15 -05:00
Awais Qureshi
9bae9c0f55 Merge pull request #22595 from edx/awais786/BOM-1111
BOM-1111
2019-12-23 21:29:46 +05:00
Awais Qureshi
5f6b2db31b BOM-1111
Updating User.is_authenticated and User.is_anonymous as properties
2019-12-23 17:51:27 +05:00
Alan Zarembok
be8fef3513 PROD-1113: Fix retry_failed_photo_verifications to work when no database arguments exist. 2019-12-20 17:52:03 -05:00
Feanil Patel
640e8cc9c8 Only store bytes to s3 via boto2.
https://github.com/boto/boto/issues/2868

In python 3 contentfile can act like a file but return unicode strings.
Boto doesn't like that and it causes issues when encoding the bytes for
transfer to s3.
2019-12-20 11:57:32 -05:00
Feanil Patel
2cae30cd92 Instantiate idv attempt with a string photo_id_key.
When we run the management command, the photo_id_key is retrieved
through the orm and so is represented as a string.  However, when we do
the initial attempt, the object is instantiated and we refer to the key
without having decoded it.  The photo_id_key is sent as a part of the
request to software secure.  And if we have a byte representation their
signature checking will fail.

This is why the management command worked even when the site didn't.
It was getting a cleaned key via the orm.
2019-12-19 16:18:02 -05:00
Simon Chen
682a450362 Fix the bug where we return many programs if the number of courses the staff user is enrolled in are many 2019-12-19 15:00:43 -05:00
Zainab Amir
d2ca9a02d1 Disable Audit Certs for Whitelisted Students (#22401)
Ensure that certificate is not generated if a learner enrolled in
audit mode is whitelisted

PROD-978
2019-12-19 17:06:33 +05:00
Feanil Patel
972aa3fd4e Merge pull request #22567 from edx/feanil/fix_id_verification_errors
Ensure that photo verification data is correctly typed.
2019-12-18 16:31:52 -05:00
Jansen Kantor
92e833d565 add api function and teams service (#22515)
* add api function and teams service
2019-12-18 15:05:02 -05:00
Matthew Piatetsky
652b49c5ac Merge pull request #22550 from edx/REV-1064
[REV-1064] show discount in sidebar and sock
2019-12-18 14:08:22 -05:00
Feanil Patel
3808b2991c Ensure that photo verification data is correctly typed.
There were cases where we needed to encode things to codecs other than
ascii.  In these cases, python returns byte strings but we needed them
to be unicode so that they serialize correctly later when we combine
them with other unicode strings.
2019-12-18 13:54:37 -05:00
Calen Pennington
3633d7148e Merge pull request #22424 from eduNEXT/dmo/INCR-562
INCR-562 @require_certificate_permission parameters added
2019-12-18 13:25:28 -05:00
DawoudSheraz
bb02732d37 update user check in user state service 2019-12-18 11:16:43 +05:00
Matthew Piatetsky
3a54df511a show discount in sidebar and sock 2019-12-17 09:09:19 -05:00
Troy Sankey
22f8b65228 Add history to GeneratedCertificate
DE-1881
2019-12-17 17:50:25 +05:00