Commit Graph

50838 Commits

Author SHA1 Message Date
Ayub
658cd5c62e BOM-70 (#21327)
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
2019-08-16 13:05:35 -04:00
Feanil Patel
f5f875401a Fix some of the common test collection issues. (#21340)
* Remove old  performance tests that we haven't been running.

As far as I can tell, these tests to capture HAR files were created 5
years ago and not being run as a part of our suite?  They capture HAR
data that we do nothing with so even if they were running we should
remove them until we're ready to care about consuming this kind of
information.

* Update password test unicode string.
* Add ugettext translation helper function.
* Fix lambda syntax that is not valid in python 3.
* Fix ur raw strings which his not valid in python 3
* Use edx_six.get_gettext instead of ugettext.
* Fix a few other encoding issues.
* Don't use old form of sorted funciton.

This form which uses a 'cmp' method is not available in python 3.
2019-08-16 11:31:36 -04:00
Stu Young
8cf86012cf modernize xdist scripts (#21347) 2019-08-16 11:26:36 -04:00
Diana Huang
5d7d3f7770 Merge pull request #21336 from edx/diana/remove-microsites
Remove microsite djangoapp and configuration.
2019-08-16 10:55:56 -04:00
Dave St.Germain
a394391a66 Merge pull request #21352 from edx/dcs/upgrade
Upgrade edx-when to fix CR-1089
2019-08-16 10:24:27 -04:00
Matt Hughes
c3a1a70d4f Correct discrepancy between grade data sources for gradebook 2019-08-16 10:02:46 -04:00
Dave St.Germain
ef67067d17 Upgrade edx-when to fix CR-1089 2019-08-16 09:57:14 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
edx-pipeline-bot
e585e0bdf2 Merge pull request #21348 from edx/private_to_public_c74331e
Mergeback PR from private to public.
2019-08-16 14:43:47 +05:00
Awais Jibran
c74331e16e Merge pull request #158 from edx/ormsbee/sec_609_customtag_fix
Make CustomTagModule safe (remove Mako) [SEC-609]
2019-08-16 13:52:51 +05:00
Syed Muhammad Dawoud Sheraz Ali
71ec2b05ae Merge pull request #21294 from edx/dsheraz/educator-4553
Add Drag&Drop submission deadline acceptance tests
2019-08-16 10:19:13 +05:00
DawoudSheraz
103a825d51 added DnD submission deadline acceptance tests 2019-08-16 09:50:56 +05:00
Manjinder Singh
65b858e3e7 Merge pull request #21209 from edx/msingh/discussion_topic_validation2
PROD-145: Added validation to discussion topic input in studio, testing 2
2019-08-15 19:53:17 -04:00
jinder1s
e7fb13a74f Added validation to discussion topic input in studio 2019-08-15 16:13:37 -04:00
Chris Pappas
4461d978db Running make upgrade to bump edx-enterprise version (#21344)
Fix for test that broke related to DRF;
2019-08-15 14:56:08 -04:00
edX Transifex Bot
a6526a8874 geoip2: update maxmind geolite country database 2019-08-14 17:01:43 -04:00
Feanil Patel
dd361bf938 Merge pull request #21337 from edx/feanil/fix_lms_test_collection
Get LMS test collection working in python 3.
2019-08-14 14:44:10 -04:00
Michael Roytman
ee17f8a3fc Merge pull request #21341 from edx/mroytman/EDUCATOR-4432-make-course-grade-filter-more-robust
make course grade filter robust against missing minimum filter as wel…
2019-08-14 14:14:21 -04:00
Zachary Hancock
96f99bc053 reset integration environment endpoint (#21319) 2019-08-14 13:19:45 -04:00
Chris Pappas
4829fd4fde ENT-2117 | Creating new endpoint for enterprise learner portal. Includes small refactor of programs_enrollment GET logic, sowe do not need to duplicate the logic (#21258)
Adding new course_overview internal api

CourseOverview serializer work

Removing enterprise learner portal djangoapp from this repo

Removing ent learner portal url

Minor cleanups

Updating serializers again

typo

adding some tests and quality fixes

more quality fixes

Fixing test

Adding in an import i removed
2019-08-14 11:27:12 -04:00
Michael Roytman
05a67400ac make course grade filter robust against missing minimum filter as well as 0 minimum filter 2019-08-14 10:19:21 -04:00
Feanil Patel
dc078bb5da Create a new SRT file for this test.
Usingthe shared file with the other tests wolud sometimes cause this
test to fail.  Made this change to make it less flaky.
2019-08-13 16:33:09 -04:00
Feanil Patel
9d7f0ca46e Get LMS test collection working in python 3.
This should be all the changes needed to get test collection working in
python 3 for the `lms` folder.
2019-08-13 16:32:40 -04:00
Michael Roytman
25bf85b9c5 Merge pull request #21339 from edx/mroytman/EDUCATOR-4432-course-level-grade-filter
mroytman/educator 4432 course level grade filter
2019-08-13 15:58:50 -04:00
Michael Roytman
df634ab7e3 add course level min and max filters to gradebook API 2019-08-13 15:32:12 -04:00
Matt Hughes
828c2fdc93 Add limit stops for assignment grade filtering for gradebook api
JIRA:EDUCATOR-4541
2019-08-13 15:05:03 -04:00
Feanil Patel
602970ed90 Fix test collection for CMS in python 3. (#21338) 2019-08-13 13:54:49 -04:00
Jansen Kantor
ecb65a4fff Jkantor/link program enrollments (#21330)
* add management command to link program enrollments to users
2019-08-13 13:37:11 -04:00
Kyle McCormick
fff69a9f58 Add course grade listing API for program_enrollments app
This new API endpoint differs from the existing Grades API
in that (i) it only includes grades for users enrolled with a
ProgramCourseEnrollment and (ii) it alters its return code
depending on whether any student's grade failed to load.

EDUCATOR-4529
2019-08-13 13:33:02 -04:00
Feanil Patel
9753eae441 Convert to using ExitStack instead of nested. (#21329)
* Convert to using ExitStack instead of nested.

nested is not available in Python3.

* Use ExitStack from contextlib2.

ExitStack has not been backported to the Python 2.7 standard library and
contextlib.nested is no longer available in Python 3.5.  We need to be
able to use something in both 2 and 3 as we transition so we'll pull in
contextlib2 which has backports of the full python3 contextlib.
2019-08-12 16:55:05 -04:00
Feanil Patel
1739e4b6b4 Merge pull request #21332 from edx/feanil/fix_more_test_collection
Fix more test collection.
2019-08-12 15:33:34 -04:00
Feanil Patel
890e119951 Remove import of nested.
We stopped using it but forgot to remove it from the import.
2019-08-12 14:34:48 -04:00
Feanil Patel
e66a7a90e5 Byte string doesn't have a format function in python 3 2019-08-12 14:34:52 -04:00
Dave St.Germain
05375b40fa Merge pull request #21318 from edx/dcs/missing-when
Added edx-when's FieldData
2019-08-12 12:41:51 -04:00
Dave St.Germain
267be29ab7 Added edx-when's FieldData
EDUCATOR-4554
This fixes a bug where extended due dates were visible in the outline but not reflected on the courseware pages, resulting in problems not being submittable past the due date.
In order for edx-when to work on courseware pages, it has to be more careful about field inheritance, which version 0.2 achieves.
2019-08-12 11:05:44 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85
BOM-85
2019-08-12 10:01:07 -04:00
Feanil Patel
e3aa131f1c Merge pull request #21324 from edx/BOM-83
BOM-83 Removed usages of bulk_assertion
2019-08-12 09:54:37 -04:00
aarif
4da4749f84 removed bulk_assertions context manager
removed usages of bulk_assertion

changes made to comply quality failure

removing test-bulk assertions.
2019-08-10 12:27:23 +05:00
David Ormsbee
e612a9bca6 Merge pull request #21320 from edx/ormsbee/theme_by_qs
Override theme with site_theme query param
2019-08-09 13:27:29 -04:00
arbisoft
9b87cb0172 BOM-85
he builtin basestring abstract type was removed. Use str instead.
2019-08-09 22:08:57 +05:00
Feanil Patel
b599c807a9 Merge pull request #21325 from edx/awais786/BOM-84-version
BOM-84
2019-08-09 12:17:41 -04:00
Alex Dusenbery
fd539e4001 Don't jam LOGIN_REDIRECT_WHITELIST into devstack_docker settings, we already define it in devstack (and we read private.py from devstack). 2019-08-09 12:04:58 -04:00
Feanil Patel
a2e0acf1e0 Merge pull request #21317 from edx/feanil/upgrade_mongodb_proxy
Feanil/upgrade mongodb proxy
2019-08-09 11:56:18 -04:00
Ayub
45ab1fec53 Merge pull request #21316 from edx/BOM-70-1
BOM-70
2019-08-09 20:19:18 +05:00
arbisoft
ed1bdf31bd BOM-84
Update the version.
2019-08-09 19:44:32 +05:00
Feanil Patel
b8f8f072b4 Run make upgrade. 2019-08-09 10:02:17 -04:00
Feanil Patel
3cf42a692e Update mongodbproxy. 2019-08-09 09:44:58 -04:00
Ayub
1c730fecad Merge pull request #21315 from edx/BOM-79
BOM-79
2019-08-09 18:43:49 +05:00
Syed Muhammad Dawoud Sheraz Ali
5ac57c2a68 Merge pull request #21323 from edx/revert-19781-kshtij/problem-response-multi-root-and-fitler
Revert "[BB-873] Support for filters, and multiple roots in problem response reports"
2019-08-09 17:54:19 +05:00
Syed Muhammad Dawoud Sheraz Ali
22d3f802f2 Revert "[BB-873] Support for filters, and multiple roots in problem response reports" 2019-08-09 17:17:36 +05:00