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

53827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Awais Qureshi
30a2ae8aec BOM-1438 
Fix course_id string.
 2020-04-01 14:42:35 +05:00
Nimisha Asthagiri
d8774e4f8d Merge pull request #23555 from edx/arch/django2-bulk-email 
Django2 bulk_email: bytestring conversion
 2020-03-31 16:55:33 -04:00
Nimisha Asthagiri
90a330d0ad Django2 bulk_email: bytestring conversion 2020-03-31 16:04:45 -04:00
Nimisha Asthagiri
c1c447b7f2 Merge pull request #23553 from edx/arch/django2-enrollments 
Django2 enrollments app: course_id string
 2020-03-31 15:46:35 -04:00
Nimisha Asthagiri
e320af0272 Merge pull request #23552 from edx/arch/django2-badges 
Django2 Badges: fix course_id string
 2020-03-31 15:46:11 -04:00
Manjinder Singh
b1baf5db77 Converting variable to string before assignment in tests (#23546) 
* Converting variable to string before assignment in tests

Django 2 is stricter of string typing, so it will no longer do implicit conversions in some cases.
While the release notes only mention dropping bytestring support in some places, they seem to have also dropped implicit conversion to str for whole host of things.
 2020-03-31 15:31:52 -04:00
Nimisha Asthagiri
be6b2a3e52 Merge pull request #23551 from edx/arch/django22-tox 
Django2: Add to tox.ini's envlist
 2020-03-31 14:39:58 -04:00
Calen Pennington
094fbaeda2 Merge pull request #23548 from cpennington/upgrade-edx-when 
Upgrade edx-when
 2020-03-31 14:39:09 -04:00
Nimisha Asthagiri
b96d975b97 Django2 enrollments app: course_id str 2020-03-31 14:28:17 -04:00
Nimisha Asthagiri
8a0d57eec3 Django2 Badges: fix course_id string 2020-03-31 14:23:53 -04:00
Nimisha Asthagiri
662a1a466a Django2: Add to tox.ini's envlist 2020-03-31 14:16:46 -04:00
Calen Pennington
7d8a715b32 Upgrade edx-when 2020-03-31 13:52:04 -04:00
Nimisha Asthagiri
da55a740a1 Django2 experiments app: Fix course_id string 2020-03-31 13:42:02 -04:00
Nimisha Asthagiri
0a57ff98c0 Merge pull request #23547 from edx/arch/django-22-content-type-gating 
Django2 StackedConfigurationModel: Fix query filter
 2020-03-31 13:32:38 -04:00
Nimisha Asthagiri
5447e86307 Django2 StackedConfigurationModel: Fix query filter 
BOM-1432
 2020-03-31 12:45:44 -04:00
Ali Akbar
358b181bdf Merge pull request #23481 from edx/aakbar/demandhint-static-link-fix 
add static links re-write for demnadhint tag
 2020-03-31 15:04:33 +05:00
Saad Yousaf
521f5f2dc8 Merge pull request #23531 from edx/saad/PROD-1287-fix 
[PROD-1287] - Optimize problem_grade_report code - FIX.
 2020-03-31 14:35:08 +05:00
adeelehsan
8d840e6f55 Merge pull request #23529 from edx/revert-23509-aehsan/prod-1222/added_logs_for_investigation 
Revert "Added logs for investigation"
 2020-03-31 12:31:05 +05:00
Nathan Sprenkle
02392879b7 Team Management Upload A11y Improvements (#23502) 
* Expose team management file input for better a11y
* Disable upload button when file not selected
 2020-03-30 17:03:15 -04:00
Tim McCormack
5edc8fd380 Remove test for PREVENT_AUTH_USER_WRITES since code breaks in Django 2 (#23536) 
...and it turns out we don't need the switch anymore, anyway.

When we upgraded to Django 1.11, this flag was added in order to
allow for a database migration that would render the user table
unwriteable for up to half an hour:
https://github.com/edx/edx-platform/pull/17561

This involved swapping out the signal handler for logins via
`user_logged_in.disconnect(django_update_last_login)`, but with
Django 2.0, that disconnect is silently failing (returning
false). Likely the disconnect is now happening too soon.
(See edx-platform/common/djangoapps/student/apps.py line 21 in 61e1eda.)

The result is that by the time the waffle switch is consulted, the
normal handler has already run, and the user's last login date has
already been updated.

For now we're just removing the test, and have filed ARCHBOM-1084 for
followup (deleting the switch and related code).
 2020-03-30 20:28:18 +00:00
David Ormsbee
26d6ee0a5c Merge pull request #23537 from edx/ormsbee/edx-when-index-drop 
Bump edx-when to 1.1.4 (perf fix)
 2020-03-30 15:42:21 -04:00
David Ormsbee
ab15d37655 Bump edx-when to 1.1.4 (perf fix) 2020-03-30 15:18:05 -04:00
Tim McCormack
2e059513d1 Downgrade pytest to 5.3.5 for now to avoid reporting bug (#23533) 2020-03-30 18:57:55 +00:00
Awais Qureshi
195d225044 BOM-1417 (#23476) 
Fixing management command.

Django PR removed force_str method: dc8834cad4 (diff-55346957c9b0473492d19a390a7adb47L36)

None is not working now.
 2020-03-30 14:10:58 -04:00
atesker
c4914bc2b3 EDUCATOR-4979. Bump ora2 verstion to 2.6.22 2020-03-30 14:05:49 -04:00
SaadYousaf
6fb9d199a0 optimize code for problem_grade_report. 2020-03-30 20:33:49 +05:00
Adam Butterworth
d53ab876e2 Fix public view of video xmodule (#23518) 
TNL-7092 Properly include video javascripts for the video public view
 2020-03-30 11:03:48 -04:00
Farhanah Sheets
564ffcfb79 Merge pull request #23528 from edx/revert-23267-saad/PROD-1287 
Revert "[PROD-1287] - initial work to optimise problem_grade_report code."
 2020-03-30 10:56:06 -04:00
adeelehsan
82bf1d744a Revert "Added logs for investigation" 2020-03-30 19:15:26 +05:00
Saad Yousaf
a458491f04 Revert "[PROD-1287] - initial work to optimise problem_grade_report code." 2020-03-30 19:05:54 +05:00
Tim McCormack
22c963a935 Perform byte/string conversions where Django is no longer tolerant 2020-03-30 13:59:32 +00:00
Danial Malik
8d951ae8ae Import private.py in devstack_docker.py files instead of devstack.py (#23512) 
Background: I use private.py a lot in my devstack for my private configurations. But issues are raised when I need to change/override a setting that is defined in devstack_docker.py file. Since that file's contents are loaded after private.py, my private.py is useless against the settings in devstack_docker.py.

Description: Now that the devstack is dockerized, I think it makes more sense to import the private.py in the devstack_docker.py files i.e. at the end of configuration files hierarchy.
 2020-03-30 09:38:25 -04:00
M Zulqarnain
0aba1af792 Merge pull request #23526 from edx/zulqarnain/BOM-1422 
BOM-1420 : Fix Django 2.x tests in Discussion app
 2020-03-30 17:48:47 +05:00
Zulqarnain
34bece208a Fix discussion notif pref tests 2020-03-30 16:01:06 +05:00
Saad Yousaf
4c5006988f Merge pull request #23267 from edx/saad/PROD-1287 
[PROD-1287] - initial work to optimise problem_grade_report code.
 2020-03-30 15:14:10 +05:00
Waheed Ahmed
a23a31c2be Allow Block Structures Collect to work in Studio. 
The collect process was broken before this commit because Studio's
runtime does not permit handler_url invocation on "thirdparty"
XBlocks.

PROD-1393
 2020-03-30 13:24:34 +05:00
SaadYousaf
4e4bffe404 initial work to optimise problem_grade_report code. 2020-03-30 13:14:01 +05:00
Aarif
f7143906b6 Merge pull request #23472 from edx/BOM-1416 
Fixed template engine error under Django 2 - BOM-1416
 2020-03-30 11:38:14 +05:00
edX Transifex Bot
5f63c07ac7 fix(i18n): update translations 2020-03-29 17:24:51 -04:00
Aarif
765942d7d2 Updated the template loaders to make them compatible with django 1.11,2.0 and above 2020-03-28 13:27:38 +05:00
Ned Batchelder
136003fcff Merge pull request #23015 from Abstract-Tech/fix/non-admin-error-descriptor 
Add xblock.v1 and xmodule.v1 entrypoints for NonStaffErrorDescriptor
 2020-03-27 17:43:16 -04:00
Zachary Hancock
b9bafed817 add pending role assignment model (#23506) 2020-03-27 14:29:09 -04:00
Albert (AJ) St. Aubin
c4bd06210e Merge pull request #23503 from edx/aj/email_account 
Added an email search parameter to accounts
 2020-03-27 12:35:01 -04:00
Albert (AJ) St. Aubin
9fb65532d6 Added an email search parameter to accounts 2020-03-27 11:24:25 -04:00
Brandon Baker
824067bf3f Upgrade edx-enterprise to 3.0.3 (#23515) 
Upgrade uses renamed enterprise catalog endpoints
 2020-03-27 11:14:40 -04:00
Ahtisham Shahid
42ccc5564c Merge pull request #23498 from edx/ahtisham/PROD-1232 
Fixed \n escape issue in import-export
 2020-03-27 18:39:29 +05:00
adeelehsan
c04341f863 Merge pull request #23509 from edx/aehsan/prod-1222/added_logs_for_investigation 
Added logs for investigation
 2020-03-27 18:21:21 +05:00