Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,877 Commits 1 Branch 0 Tags
5deb18eab1eef1f435536ea5d02b95c385236ff3
Commit Graph

53877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Terry
5deb18eab1 Upgrade edx-when to 1.2.0 
This adds django admin access to its models.

AA-93
 2020-04-03 09:12:00 -04:00
Nimisha Asthagiri
3a60ef0773 Merge pull request #23588 from edx/arch/django2-student-admin 
Django2: student admin views permission fix
 2020-04-03 08:38:34 -04:00
Ahtisham Shahid
9eaeb75df9 Merge pull request #23593 from edx/ahtisham/PROD-1295 
updated xblock-poll version
 2020-04-03 14:56:34 +05:00
Hammad Ahmad Waqas
7bd3900476 Merge pull request #23592 from edx/hammad/ENT-2740 
ENT-2740 | Flaky tests due to UNIQUE constraint failed on enterprise_enterprisecourseenrollment.id
 2020-04-03 14:22:06 +05:00
Ahtisham Shahid
46f792f598 updated xblock-poll version 2020-04-03 13:53:21 +05:00
adeelehsan
6fcf9779b7 Merge pull request #23591 from edx/aehsan/prod-1395/certificate_verification_enabled_for_software_secure 
Certification verification enabled
 2020-04-03 12:56:29 +05:00
HammadAhmadWaqas
c09b382e52 fixing flakiness of tests due to redundant id created by faker. 2020-04-03 12:50:47 +05:00
adeelehsan
3f1220276d Certification verification enabled 
Previously software secure was using self sign certificates.
Now they are not using it that's why we are enabling ssl
certificate verfication.

PROD-1395
 2020-04-03 11:11:13 +05:00
Nimisha Asthagiri
9c60bd6386 Django2: student admin views permission fix 2020-04-02 19:26:40 -04:00
Tim McCormack
2a27fe0915 Remove bad "test_no_file" test case revealed by Django 2.1 upgrade (#23584) 
Before Django 2.1, the dict was being stringified as `{'name': 'file.txt'}`
(note the single quotes) and producing a JSON parse error in
https://github.com/edx/edx-platform/blob/9cf2f9f/cms/djangoapps/contentstore/views/assets.py#L541
which was then converted to a 400 error. However, in Django 2.1,
django.test.client starts JSON-encoding request bodies when an appropriate
content-type is set:
https://github.com/django/django/compare/2.0.8..2.1#diff-97160f50594424a40f2621d5a3c581ccR320

This results in the JSON parse succeeding, and the expected error never
occurs; instead, there is a KeyError when the `locked` attribute is
missing from the dict.

For now, removing the test, since it is blocking Django 2 upgrade work,
and we need to get off of (unsupported) Django 1.11 ASAP.
We should probably repair and restore this test, but it is likely that
we'll want to change the code it is testing first, since that code is
insufficiently defensive and handles both multipart form data and JSON
without properly checking which kind it is dealing with, as well as
assuming too much about what keys are present in the JSON.

I've filed ARCHBOM-1090 for this followup work.
 2020-04-02 13:59:20 -04:00
Matthew Piatetsky
443eeb9f42 Merge pull request #23581 from edx/REV-1123 
[REV-1123] Modify the program dashboard to make it pass the bundle parameter which is necessary to see the program discounted price
 2020-04-02 13:02:35 -04:00
Matthew Piatetsky
68777a270a Modify the program dashboard to make it pass the bundle parameter which is necessary to see the program discounted price 
REV-1123
 2020-04-02 11:34:02 -04:00
edX cache uploader bot
013b32383a Updating Bokchoy testing database cache (#23580) 2020-04-02 11:26:02 -04:00
Jeremy Bowman
5c40a3729a Stop using deprecated assertions (#23579) 
Replace some usage of deprecated assertions with non-deprecated equivalents.
 2020-04-02 11:06:37 -04:00
Manjinder Singh
96792cde56 Adding samesite cookie option in django 2.1 and above (#23571) 
* Adding samesite cookie option in django 2.1 and above

Django 2.1 release note: Added the SESSION_COOKIE_SAMESITE setting to set the SameSite cookie flag on session cookies.
 2020-04-02 09:57:18 -04:00
Manjinder Singh
853744656c Changing test to work with django 2.1 and higher (#23573) 
This is part of the django 2 upgrade
 2020-04-02 09:56:22 -04:00
Nick
26f0176ddd Merge pull request #23550 from edx/ndalfonso/AA-85-reset-dates-mobile 
AA-85 mobile reset dates
 2020-04-02 09:53:50 -04:00
Dillon Dumesnil
0a39e6dba8 Merge pull request #23574 from edx/ddumesnil/lms-api-staff 
Update the LMS courses API for staff permissions
 2020-04-02 06:27:41 -07:00
Diana Huang
747a0e444b Merge pull request #23572 from edx/diana/new-django2-migration 
Add a migration that was generated for Django 2.
 2020-04-02 09:11:59 -04:00
Nimisha Asthagiri
9278521188 Merge pull request #23576 from edx/arch/django21-logout-cookie 
Django2 LoginTest: fix expired cookie date format change
 2020-04-02 07:53:58 -04:00
edX requirements bot
2698257954 Updating Python Requirements (#23578) 2020-04-02 07:36:20 -04:00
edX cache uploader bot
63ab354138 Updating Bokchoy testing database cache (#23577) 2020-04-02 07:18:14 -04:00
Saad Yousaf
9e847ea26c Merge pull request #23570 from edx/saad/PROD-1287-add-logs 
[PROD-1287] - Add logs to optimized ProblemGradeReport code.
 2020-04-02 15:32:32 +05:00
SaadYousaf
3c1f7ec5e9 add logs to optimized ProblemGradeReport code. 2020-04-02 14:39:43 +05:00
Syed Muhammad Dawoud Sheraz Ali
cd6549748b add credentials saving in VAL (#23561) 2020-04-02 11:21:09 +05:00
Nicholas D'Alfonso
ac9d2bfd30 AA-85 mobile reset dates 
- render reset dates banner in webview for mobile app.
- improve banner redirect mechanism
 2020-04-02 00:37:54 -04:00
Jansen Kantor
18c5333a68 bump submission and ora versions (#23575) 2020-04-01 19:14:47 -04:00
Nimisha Asthagiri
27433ecac0 Django2 LoginTest: fix to accommodate expired cookie date format 2020-04-01 18:25:41 -04:00
Nimisha Asthagiri
946aa548ae Merge pull request #23569 from edx/arch/django2-instructor-analytics 
Django2: Update django-model-utils
 2020-04-01 18:11:07 -04:00
Nimisha Asthagiri
28f65effd2 Update edx-ora2 and edx-celeryutils to upgrade django-model-utils 2020-04-01 17:46:22 -04:00
Nimisha Asthagiri
147189478f Django2: Update django-model-utils 
Update this library in order to get the Django2 fix in https://github.com/jazzband/django-model-utils/pull/335
 2020-04-01 17:43:52 -04:00
Dillon Dumesnil
78a1b835fa Update the LMS courses API for staff permissions 
We want to allow staff to see all courses in the LMS.
This changes the behavior from staff being treated like
an AnonymousUser (unless an username query parameter is
provided) to being treated like staff.

I also added in some tests for the other paths in this
function that did not seem to be tested.
 2020-04-01 13:45:37 -07:00
Jansen Kantor
c096464a3c EDUCATOR-4976 (Part 1): Add teamset type validation to has_specific_team_access (#23539) 
Add teamset type validation to has_specific_team_access
 2020-04-01 16:40:03 -04:00
Muhammad Soban Javed
05e5c7e6ab Merge pull request #23530 from edx/BOM-1428 
BOM-1428: Fix Django 2.0 test failures in theming management command
 2020-04-02 01:15:42 +05:00
Diana Huang
ea0b7019cf Add a migration that was generated for Django 2. 2020-04-01 16:09:44 -04:00
Diana Huang
e2b82479a1 Merge pull request #23541 from cldme/LEARNER-2041_remove_logout_view_config 
LEARNER-2041: Remove deprecated LogoutViewConfiguration from student models
 2020-04-01 15:40:00 -04:00
Claudiu Ion
765a6867fd Remove deprecated LogoutViewConfiguration from student models 2020-04-01 18:47:49 +00:00
Jeremy Bowman
9ef0aa4880 Downgrade to pytest-django 3.8.0 for now (#23566) 
We'll upgrade this again along with pytest once pytest-dev/pytest#6925 is resolved.

Also, it looks like a flaky error in test class DB setup outside a transaction was mucking things up for the rest of the test shard. I didn't try to fix the flakiness, but this should at least limit the blast radius to just that test class. We really need to start using setUpTestData() more consistently.
 2020-04-01 14:17:27 -04:00
edX cache uploader bot
c8663fa518 Updating Bokchoy testing database cache (#23538) 2020-04-01 14:15:54 -04:00
Nimisha Asthagiri
efc14c1e9d Merge pull request #23568 from edx/arch/csmh-router-comment 
Django2 CMSH Router: add clarifying comment
 2020-04-01 12:00:25 -04:00
Nimisha Asthagiri
7f036af429 Django2 CMSH Router: add clarifying comment 2020-04-01 11:28:23 -04:00
Nimisha Asthagiri
03bb132368 Merge pull request #23564 from edx/arch/django22-fix-csmh-router 
Django2 CSMH: Database Router update
 2020-04-01 11:20:58 -04:00
David Ormsbee
11025c4d1a Merge pull request #23559 from edx/ormsbee/csm_write_optimization 
Make XBlock views/handlers non-atomic requests.
 2020-04-01 11:02:46 -04:00
Stu Young
9b9e2f7e67 add reserved keyword linter to CI (#23499) 2020-04-01 10:30:46 -04:00
Ahtisham Shahid
3c35f21da2 Merge pull request #23545 from edx/ahtisham/PROD-1376 
Updated ORA2 version
 2020-04-01 19:00:25 +05:00
Nimisha Asthagiri
8991b161dc Django2 CSMH Database Router update 2020-04-01 09:25:56 -04:00
Tim McCormack
b489a4ecb1 Django2 bytestring conversion: Lynx html_to_text output (#23558) 
Fixes test of email body for Django 2.0.
 2020-04-01 13:12:25 +00:00
Saad Yousaf
e4c00dd335 Merge pull request #23563 from edx/saad/PROD-1287-remove-flaky-test 
[PROD-1287] - Remove flaky test lms.djangoapps.instructor_task.tests.test_tasks_helper.TestProblemGradeReport.test_grading_failure
 2020-04-01 17:49:28 +05:00
Awais Qureshi
8dfcdc3281 Merge pull request #23554 from edx/awais786/BOM-1438 
BOM-1438
 2020-04-01 16:07:21 +05:00
SaadYousaf
8c4ae15766 remove flaky test. 2020-04-01 15:46:20 +05:00