Commit Graph

58450 Commits

Author SHA1 Message Date
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
Nick
d1ebd1294b Remove backtick typo in advanced_entry.underscore 2019-10-11 15:25:33 -04:00
Feanil Patel
55c0151cc8 Merge pull request #22019 from edx/feanil/fix_perf_pins
Feanil/fix perf pins
2019-10-11 14:59:48 -04:00
Feanil Patel
1098c106e3 Run make upgrade. 2019-10-11 14:18:31 -04:00
Feanil Patel
695ed0cb29 Pin just edx-drf-extensions.
We also pin back edx-lint to fix a regression we introduced when we
started having to roll back all the requirements changes.
2019-10-11 14:08:36 -04:00
Nick
190b175955 Merge pull request #21971 from edx/ndalfonso/DISCO-1388-publisher-link
DISCO-188 publisher link
2019-10-11 13:18:07 -04:00
Calen Pennington
501cd6795b Merge pull request #22001 from cpennington/no-discount-for-anonymous-users
Don't try to show anonymous users the first-purchase discount
2019-10-11 12:44:42 -04:00
Douglas Hall
bf3d337312 Fix dismissal of enterprise learner portal banner. (#22015) 2019-10-11 11:49:09 -04:00
Awais Qureshi
ae9dcdef8a BOM-917
Fix encoding issue.
2019-10-11 20:12:34 +05:00
Nicholas D'Alfonso
545d5eddc8 DISCO-188 publisher link
Add publisher link to settings dropdown if the features setting
is set.
2019-10-11 09:29:24 -04:00
Awais Qureshi
c446964721 BOM-916
Fixed double decoding issue.
Fixed the mock.assertMethod. Dict keys were coming different order.
2019-10-11 18:24:28 +05:00
AsadAzam
b8a19b7b92 Merge pull request #21809 from edx/asad/prod-694
Upgrade python 3 decode error
2019-10-11 17:22:29 +05:00
Waheed Ahmed
ab49dfa324 Merge pull request #22008 from edx/waheed/PROD-816-remove-youtube-logo
Remove YouTube logo from footer.
2019-10-11 15:28:02 +05:00
Ayub khan
44b2414a5d BOM-804
python3 compatibility
we only need to decode if the xml is bytes
2019-10-11 13:53:54 +05:00
Ayub
313183f3aa Merge pull request #21986 from edx/BOM-821_BOM-822
BOM-821_BOM-822 fixed webob issue
2019-10-11 13:05:59 +05:00
Ayub
e289326172 Merge pull request #21991 from edx/BOM-905
BOM-905 test_graders.py tests fixed
2019-10-11 13:02:16 +05:00
Ayub
732dfce14d Merge pull request #21996 from edx/BOM-test-fix-test_download_srt_exist
BOM test_download_srt_exist test fix
2019-10-11 13:01:47 +05:00
Waheed Ahmed
637e1d0bee Remove YouTube logo from footer.
Current YouTube logo is not compliant with YouTube's branding
guidelines.

PROD-816
2019-10-11 12:44:54 +05:00
Douglas Hall
c9aa258495 Do not display enterprise learner portal banner if no enterprise learner portals exist for user. (#22005) 2019-10-10 19:02:15 -04:00
Jeremy Bowman
9c92bd96ed Fix assertions failing under Python 3 BOM-668 (#21978) 2019-10-10 15:22:07 -04:00
Ned Batchelder
d8d91f4e68 Merge pull request #21945 from edx/nedbat/update-contributing
Bring this file into the 21st century
2019-10-10 15:11:09 -04:00
Feanil Patel
54b00573bd Merge pull request #22002 from edx/release-mergeback-to-master
Merge release back to master
2019-10-10 14:28:07 -04:00
Feanil Patel
b6638d21ca Update everything but the constrained packages. 2019-10-10 14:02:37 -04:00
Andytr1
f4738c4b82 Merge pull request #21958 from edx/andytr1/get-override-history-by-grade-id
EDUCATOR-4700 - pull grade overrides by grade_id
2019-10-10 13:42:29 -04:00
Awais Qureshi
e44f238611 Merge pull request #21995 from edx/awais786/BOM-913
BOM-913
2019-10-10 22:38:55 +05:00
Feanil Patel
2cd474c72d Merge pull request #21970 from edx/feanil/fix_xmodule_video_tests
Fix video module tests related to transcript conversion.
2019-10-10 13:32:44 -04:00
Feanil Patel
ef96137ca0 Merge branch 'master' into release-mergeback-to-master 2019-10-10 13:30:33 -04:00
atesker
4aff507847 EDUCATOR-4700 - pull grade overrides by grade_id
pep8

udate filter on simple history

convert to list

diable no member error
2019-10-10 12:13:07 -04:00
Feanil Patel
076908b38d Merge pull request #22000 from edx/feanil/merge_more_of_master
Feanil/merge more of master
2019-10-10 11:38:02 -04:00
Awais Qureshi
b098ba633c Merge pull request #21993 from edx/awais786/BOM-912
BOM-912
2019-10-10 20:25:24 +05:00
Awais Qureshi
91e7d8a7be BOM-913
reduce functions moves into functools in python3. Fixed the import.
Fixing bytes issue.
2019-10-10 20:06:08 +05:00
Awais Qureshi
3e217e3a43 Merge pull request #21999 from edx/awais786/BOM-915
BOM-915
2019-10-10 20:03:39 +05:00
Feanil Patel
7fba045ce6 Merge branch 'master' into feanil/fix_xmodule_video_tests 2019-10-10 11:00:54 -04:00
Calen Pennington
355826f7d8 Don't try to show anonymous users the first-purchase discount
This fixes errors like:

    Oct 10 12:46:07 ip-10-2-10-15 [service_variant=lms][django.request][env:prod-edx-edxapp] ERROR [ip-10-2-10-15  31278] [user None] [exception.py:135] - Internal Server Error: /courses/course-v1:HarvardX+1962USRx+3T2019/discussions/settings
    Traceback (most recent call last):
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/core/handlers/exception.py", line 41, in inner
        response = get_response(request)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/core/handlers/base.py", line 249, in _legacy_get_response
        response = self._get_response(request)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/core/handlers/base.py", line 187, in _get_response
        response = self.process_exception_by_middleware(e, request)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/core/handlers/base.py", line 185, in _get_response
        response = wrapped_callback(request, *callback_args, **callback_kwargs)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/utils/decorators.py", line 185, in inner
        return func(*args, **kwargs)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/newrelic/hooks/framework_django.py", line 539, in wrapper
        return wrapped(*args, **kwargs)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/views/decorators/http.py", line 40, in inner
        return func(request, *args, **kwargs)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/utils/decorators.py", line 149, in _wrapped_view
        response = view_func(request, *args, **kwargs)
    File "/edx/app/edxapp/edx-platform/common/djangoapps/util/json_request.py", line 55, in parse_json_into_request
        return view_function(request, *args, **kwargs)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/contrib/auth/decorators.py", line 23, in _wrapped_view
        return view_func(request, *args, **kwargs)
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/discussion/views.py", line 936, in course_discussions_settings_handler
        course, discussion_settings
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/discussion/views.py", line 957, in get_divided_discussions
        all_discussions = utils.get_discussion_categories_ids(course, None, include_all=True)
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/discussion/django_comment_client/utils.py", line 485, in get_discussion_categories_ids
        xblock.discussion_id for xblock in get_accessible_discussion_xblocks(course, user, include_all=include_all)
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/discussion/django_comment_client/utils.py", line 146, in get_accessible_discussion_xblocks
        return get_accessible_discussion_xblocks_by_course_id(course.id, user, include_all=include_all)
    File "/edx/app/edxapp/edx-platform/openedx/core/lib/cache_utils.py", line 73, in decorator
        result = wrapped(*args, **kwargs)
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/discussion/django_comment_client/utils.py", line 159, in get_accessible_discussion_xblocks_by_course_id
        if has_required_keys(xblock) and (include_all or has_access(user, 'load', xblock, course_id))
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/access.py", line 158, in has_access
        return _has_access_descriptor(user, action, obj, course_key)
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/access.py", line 572, in _has_access_descriptor
        return _dispatch(checkers, action, user, descriptor)
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/access.py", line 669, in _dispatch
        result = table[action]()
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/access.py", line 543, in can_load
        group_access_response = _has_group_access(descriptor, user, course_key)
    File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/access.py", line 513, in _has_group_access
        user_fragment=partition.access_denied_fragment(descriptor, user, user_group, allowed_groups),
    File "/edx/app/edxapp/edx-platform/openedx/features/content_type_gating/partitions.py", line 98, in access_denied_fragment
        upgrade_price, _ = format_strikeout_price(user, course)
    File "/edx/app/edxapp/edx-platform/openedx/features/discounts/utils.py", line 22, in format_strikeout_price
        if can_receive_discount(user, course):
    File "/edx/app/edxapp/edx-platform/openedx/features/discounts/applicability.py", line 74, in can_receive_discount
        if CourseEnrollment.objects.filter(user=user).exclude(mode__in=CourseMode.UPSELL_TO_VERIFIED_MODES).exists():
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/manager.py", line 85, in manager_method
        return getattr(self.get_queryset(), name)(*args, **kwargs)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/query.py", line 787, in filter
        return self._filter_or_exclude(False, *args, **kwargs)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/query.py", line 805, in _filter_or_exclude
        clone.query.add_q(Q(*args, **kwargs))
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1250, in add_q
        clause, _ = self._add_q(q_object, self.used_aliases)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1276, in _add_q
        allow_joins=allow_joins, split_subq=split_subq,
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1206, in build_filter
        condition = lookup_class(lhs, value)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/lookups.py", line 24, in __init__
        self.rhs = self.get_prep_lookup()
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/fields/related_lookups.py", line 112, in get_prep_lookup
        self.rhs = target_field.get_prep_value(self.rhs)
    File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/fields/__init__.py", line 966, in get_prep_value
        return int(value)
    TypeError: int() argument must be a string or a number, not 'AnonymousUser'

This is tracked in https://openedx.atlassian.net/browse/REV-988
[REV-988]
2019-10-10 10:53:26 -04:00
Feanil Patel
7dd7f2344b Merge commit 'bbadf48b8e19a0c9f1e1ca750f5ad8b26856bcc1' into feanil/merge_more_of_master
Sorry for the merge commits but release was in a really bad state and so
we need to get changes out piecemeal on the release-candidate.

Slowly mergig master into RC.
2019-10-10 10:36:56 -04:00
Awais Qureshi
f07fae6e74 Merge pull request #21989 from edx/awais786/BOM-910
BOM-910
2019-10-10 18:39:09 +05:00
Awais Qureshi
750b554637 BOM-915
Fixing bytes and ordering issue.
2019-10-10 18:00:12 +05:00
Feanil Patel
d9302ab73b Merge pull request #21982 from edx/feanil/revert_requirements_changes
Revert requirements changes due to memory issues.
2019-10-10 08:45:32 -04:00
Manjinder Singh
df0f601057 Merge pull request #21981 from edx/msingh/str_no_decode
py2topy3 conversion: fixing str no decode method errors
2019-10-10 08:36:30 -04:00
Ayub khan
198743f7b0 BOM test_download_srt_exist test fix
need unicode to compare with unicode string
2019-10-10 17:17:29 +05:00
Zaman Afzal
69920f2781 Merge pull request #21985 from edx/zafzal/bump-edx-enterprise-version
bump edx enterprise version to 2.0.3
2019-10-10 16:09:23 +05:00
Awais Qureshi
4387f753d5 BOM-912
Can't convert 'bytes' object to str implicitly
2019-10-10 16:06:17 +05:00
Awais Qureshi
4470a1b487 BOM-910
There was in issue coming in order of error msg.
fixing bytes issue also.
2019-10-10 15:01:18 +05:00
Ayub khan
3a760435bc BOM-905 test_graders.py tests fixed
py3 shows missing argument istead of showing number
2019-10-10 14:49:27 +05:00
Awais Qureshi
19342524d5 Merge pull request #21963 from edx/awais786/BOM-799
BOM-799
2019-10-10 12:36:09 +05:00
Ayub khan
ba0cc9a87f BOM-821_BOM-822 fixed webob issue
python2 webob request.post object is equal to webob MultiDict(request.post)
but in python3 its not so updated test cases.
2019-10-10 12:09:19 +05:00
zamanafzal
b52b4d09ea bump edx enterprise version to 2.0.3 2019-10-10 11:54:38 +05:00
adeel khan
1ef7797c51 Merge pull request #21980 from edx/geoip2-bot-update-country-database2019-10-09
geoip2: update maxmind geolite country database
2019-10-10 11:10:13 +05:00
Awais Qureshi
6af113c76f Merge pull request #21966 from edx/awais786/BOM-814
BOM-814
2019-10-10 10:51:53 +05:00
Ayub
c5a61541ab Merge pull request #21949 from edx/BOM-894
BOM-894 python3 order mismatch
2019-10-10 10:22:57 +05:00