Commit Graph

54964 Commits

Author SHA1 Message Date
iamsobanjaved
82dd040382 fixed deprecated django-filter features 2020-02-06 18:32:36 +05:00
Diana Huang
a46f6d911c Merge pull request #23025 from edx/diana/remove-sql-track-flag
Remove ENABLE_SQL_TRACKING_LOGS and all associated code.
2020-02-05 15:16:50 -05:00
Calen Pennington
943bf2f084 Correctly wire in signal the new course_date_signals app so that it actually handles signals 2020-02-05 14:47:29 -05:00
Diana Huang
1f45181c14 Remove ENABLE_SQL_TRACKING_LOGS and all associated code. 2020-02-05 14:42:33 -05:00
Ned Batchelder
8207311a33 Merge pull request #22937 from mahyard/master
Reveal a message to be extracted
2020-02-05 09:44:57 -05:00
Diana Huang
0899aff56d Merge pull request #23017 from edx/diana/remove-tracking-log-backend
Remove the tracking django backend and the TrackingLog tables.
2020-02-05 08:54:47 -05:00
Jansen Kantor
b63a5f1db2 bump ora (#23019) 2020-02-04 15:59:53 -05:00
adeel khan
53813eebd7 Merge pull request #22968 from edx/adeel/prod_960_automate_js_18n_compilation
Adds compilejs task to paver.
2020-02-05 01:59:41 +05:00
Diana Huang
742868c2da Remove the tracking django backend and the TrackingLog tables. 2020-02-04 14:24:56 -05:00
atesker
5a2d98b11d initial layout
interim commit

clean up

Initial unit tests and pylint

pylint cleanup

Unit tests extended and passing. Pylint

WIP - fix Unit tests extended and passing. Pylint

Updated logic to validate before commit.

CR pass1

CR pass1, pep8

pep8 2

interim cr

interim cr2

refactor to using DictReader

removed uneeded mixin

pr comments

encoding fix and return value

Cache teams/membershipos

ncr

cr aed
2020-02-04 13:52:51 -05:00
Michael Terry
6e80d6046d Merge pull request #22982 from edx/mikix/drop-outline-3rd-level
Limit course outline to a depth of two
2020-02-04 11:13:33 -05:00
Robert Raposa
a49ff5a0ce Merge pull request #23013 from edx/robrap/add-jwt-auth-for-third-party-auth
add jwt auth to third-party auth endpoint
2020-02-04 10:47:36 -05:00
Calen Pennington
268d03a7cd Merge pull request #22996 from cpennington/move-course-date-signal-handling
Duplicate signals handlers for course content dates from edx-when
2020-02-04 10:17:21 -05:00
irfanuddinahmad
124505d318 Merge pull request #23011 from edx/iahmad/ENT-2604-Version-bump-for-edx-enterprise
ENT-2604: Updated edx-enterprise version
2020-02-04 20:16:29 +05:00
Silvio Tomatis
99bdb23375 Add xblock.v1 and xmodule.v1 entrypoints for NonStaffErrorDescriptor
If an error occurs while rendering an xmodule, the LMS chokes with the
following error if accessed by a non admin user.

In the admin user case the existing line that registers ErrorDescriptor
ensures that everything works. But for the non admin case we need this
additional directive.

Traceback (most recent call last):
  File "/openedx/edx-platform/lms/djangoapps/courseware/views/index.py", line 153, in get
    return self.render(request)
  File "/openedx/edx-platform/lms/djangoapps/courseware/views/index.py", line 217, in render
    return render_to_response('courseware/courseware.html', self._create_courseware_context(request))
  File "/openedx/edx-platform/lms/djangoapps/courseware/views/index.py", line 468, in _create_courseware_context
    courseware_context['fragment'] = self.section.render(self.view, section_context)
  File "/usr/local/lib/python2.7/site-packages/xblock/core.py", line 202, in render
    return self.runtime.render(self, view, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1914, in render
    return self.__getattr__('render')(block, view_name, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1335, in render
    return super(MetricsMixin, self).render(block, view_name, context=context)
  File "/usr/local/lib/python2.7/site-packages/xblock/runtime.py", line 831, in render
    frag = view_fn(context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/seq_module.py", line 262, in student_view
    return self._student_or_public_view(context, prereq_met, prereq_meta_info, banner_text)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/seq_module.py", line 343, in _student_or_public_view
    items = self._render_student_view_for_items(context, display_items, fragment, view) if prereq_met else []
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/seq_module.py", line 485, in _render_student_view_for_items
    rendered_item = item.render(view, context)
  File "/usr/local/lib/python2.7/site-packages/xblock/core.py", line 202, in render
    return self.runtime.render(self, view, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1914, in render
    return self.__getattr__('render')(block, view_name, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1335, in render
    return super(MetricsMixin, self).render(block, view_name, context=context)
  File "/usr/local/lib/python2.7/site-packages/xblock/runtime.py", line 831, in render
    frag = view_fn(context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/vertical_block.py", line 118, in student_view
    return self._student_or_public_view(context, STUDENT_VIEW)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/vertical_block.py", line 85, in _student_or_public_view
    rendered_child = child.render(view, child_block_context)
  File "/usr/local/lib/python2.7/site-packages/xblock/core.py", line 202, in render
    return self.runtime.render(self, view, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1914, in render
    return self.__getattr__('render')(block, view_name, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1335, in render
    return super(MetricsMixin, self).render(block, view_name, context=context)
  File "/usr/local/lib/python2.7/site-packages/xblock/runtime.py", line 831, in render
    frag = view_fn(context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/library_content_module.py", line 314, in student_view
    rendered_child = displayable.render(STUDENT_VIEW, child_context)
  File "/usr/local/lib/python2.7/site-packages/xblock/core.py", line 202, in render
    return self.runtime.render(self, view, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1914, in render
    return self.__getattr__('render')(block, view_name, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1335, in render
    return super(MetricsMixin, self).render(block, view_name, context=context)
  File "/usr/local/lib/python2.7/site-packages/xblock/runtime.py", line 835, in render
    updated_frag = self.wrap_xblock(block, view_name, frag, context)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 1287, in wrap_xblock
    frag = wrapper(block, view, frag, context)
  File "/openedx/edx-platform/openedx/core/lib/xblock_utils/__init__.py", line 155, in wrap_xblock
    add_webpack_to_fragment(frag, class_name)
  File "/openedx/edx-platform/common/lib/xmodule/xmodule/util/xmodule_django.py", line 28, in add_webpack_to_fragment
    for chunk in webpack_loader.utils.get_files(bundle_name, extension, config):
  File "/usr/local/lib/python2.7/site-packages/webpack_loader/utils.py", line 31, in get_files
    return list(_get_bundle(bundle_name, extension, config))
  File "/usr/local/lib/python2.7/site-packages/webpack_loader/utils.py", line 23, in _get_bundle
    bundle = get_loader(config).get_bundle(bundle_name)
  File "/usr/local/lib/python2.7/site-packages/webpack_loader/loader.py", line 83, in get_bundle
    raise WebpackBundleLookupError('Cannot resolve bundle {0}.'.format(bundle_name))
WebpackBundleLookupError: Cannot resolve bundle NonStaffErrorModule.
2020-02-04 16:12:57 +01:00
Robert Raposa
28206e4c45 add jwt auth to third-party auth endpoint
BOM-897
2020-02-04 10:02:04 -05:00
irfanuddinahmad
0c815af11c Updated edx-enterprise 2020-02-04 19:26:47 +05:00
Manjinder Singh
e0981025b2 changed oauth2 authentication class in bookmarks app (#22908)
* Added new authentication class(meets drf standards)

The new class replaces the deprecated oauth2authetnication class from rest_framework_auth library(repo django-rest-framework-oauth).
Majority of the code is combination of copy-pasta from old oauth2authentication class and Oauth2AuthenticationAllowInactiveUser class

* Added ability to switch to new authentication class in bookmarks app

* Changed error type reported by Outh class. It now outputs a json rather than a string.
2020-02-04 08:49:26 -05:00
Awais Jibran
bcb2038843 Fix CAPA Problems 2020-02-04 17:51:18 +05:00
Calen Pennington
7e411cddc0 Upgrade edx-when to 0.7.0 to drop course date signal handling 2020-02-03 15:35:23 -05:00
Calen Pennington
019a97c084 Duplicate signals handlers for course content dates from edx-when 2020-02-03 15:35:23 -05:00
Michael Terry
ea92073e08 Limit course outline to a depth of two
Previously, we'd show three layers deep (section, subsection, and
unit). But now we cut out unit and stop at subsection.

AA-17
2020-02-03 14:49:34 -05:00
Dave St.Germain
f09e9fdc57 Merge pull request #23004 from edx/dcs/sequence-bookmark
Include bookmark info in sequence metadata.
2020-02-03 14:26:40 -05:00
Dave St.Germain
5528adccb1 Include bookmark info in sequence metadata. 2020-02-03 13:54:03 -05:00
Chris Pappas
247cffa846 Bumping edx-enterprise version (#23003)
* Bumping edx-enterprise version

* Running make upgrade to bump edx-enterprise

* contraining a package

* fix

* adding yet another constraint
2020-02-03 12:39:21 -05:00
Robert Raposa
ed0131169e Merge pull request #22986 from edx/robrap/BOM-897-add-course-id-endpoint
BOM-897: add course_ids api
2020-02-03 09:38:52 -05:00
Zainab Amir
4b458099cf Add unique_together to CourseEntitlement (#22948)
Add unique_together on course_uuid and order_number to avoid
duplicate records

PROD-1064
2020-02-03 13:21:44 +05:00
edX Transifex Bot
29b9b7b0b2 fix(i18n): update translations 2020-02-02 16:30:37 -05:00
Robert Raposa
9fa5443379 add course_ids api
Adds a course_ids api that can filter by user role, since the courses
api could not perform well enough for this, and returned much more
data than we need.

Additionally, adds a LazyPageNumberPagination to provide more accurate
counts in the pagination response when using LazySequence with the
queryset.

BOM-897
2020-01-31 18:02:16 -05:00
edX cache uploader bot
36f75865c8 Updating Bokchoy testing database cache (#22995) 2020-01-31 13:26:01 -05:00
Simon Chen
f3678a44e1 Revert the proctoring email template change 2020-01-31 12:53:24 -05:00
Calen Pennington
d83a12eea0 Merge pull request #22985 from cpennington/upgrade-edx-when
Upgrade edx-when to 0.6.0 to support converting relative to absolute …
2020-01-31 11:45:57 -05:00
Alex Dusenbery
ca032b47c0 Upgrade ORA to 2.6.7 2020-01-31 11:31:53 -05:00
Dave St.Germain
42adb72aa5 Merge pull request #22336 from edx/dcs/data-researcher
Add new role for course data researcher
2020-01-31 10:07:27 -05:00
Uzair Rasheed
76052ee9ba Merge pull request #22921 from edx/PROD-1142/add-check-for-grade-display
Add additional check for grade display on course banner.
2020-01-31 15:25:39 +05:00
Awais Jibran
2f98463c35 Merge pull request #22939 from edx/aj/fix-grade-reports
Generate Grade Report for Verified Learners by Default
2020-01-31 12:47:18 +05:00
George Babey
aced705091 Merge pull request #22983 from edx/gbabey/bulk-update-emails
Adds management command for bulk updating email addresses
2020-01-30 21:46:43 -05:00
George Babey
efdbe1f3b1 Adds management command for bulk updating email addresses
This PR adds a management command that will update the email address
of the given accounts provided through a CSV file.

This is necessary internally at edX to update a number of internal accounts
which are using sibling email addresses and would be locked out after we
enforce SSO.
2020-01-30 21:11:04 -05:00
Calen Pennington
b0f090476c Upgrade edx-when to 0.6.0 to support converting relative to absolute dates 2020-01-30 14:39:32 -05:00
Abdul Hannan
57d1690b82 Merge pull request #22981 from edx/upgrade-release-util
Upgrade django-release-util version
2020-01-30 21:31:39 +05:00
Troy Sankey
7127cc9231 Merge pull request #22975 from edx/rename_start_in_schedules_intermediate
Remove reads from old column
2020-01-30 10:39:25 -05:00
hunytalk
e824fa4696 Upgrade django-release-util version 2020-01-30 20:33:30 +05:00
Nathan Sprenkle
62d5ff49a0 EDCUATOR-4810: Add team anonymous ID lookup (#22868)
* Add ability for team-members to look up each other's anonymous user IDs for team assignments
2020-01-30 09:50:47 -05:00
Alex Dusenbery
37180c07ab Update ORA to 2.6.5 2020-01-30 09:39:35 -05:00
Feanil Patel
ee5178604f Merge pull request #22976 from edx/feanil/remove_course_api_role_option
Remove the role parameter from the courses api.
2020-01-30 09:23:58 -05:00
Manjinder Singh
eb694528e7 Adding metrics to oauth2authentication class (#22970)
Currently, we are working on removing the rest_framework_auth library from edx-platform. For this push, we need to remove the oauth2Authentication class. This PR creates a new class oauth2AuthenticationDeprecated that adds additional new relic metrics. The metrics would allow us to see how often this class is used and its success rate. The hope is that this information will help us with transitioning to a different authentication class.
2020-01-30 09:13:51 -05:00
Awais Qureshi
a88bf6306d Merge pull request #22932 from edx/awais786/BOM-1121-mixin
Awais786/bom 1121 mixin
2020-01-30 18:12:08 +05:00
edx-pipeline-bot
fb416ba4e7 Merge pull request #22979 from edx/private_to_public_561fb8c
Mergeback PR from private to public.
2020-01-30 07:03:38 -05:00
Aarif
97d327feeb BOM-1121
Old style mixin compatibility with django2.2
2020-01-30 16:36:02 +05:00
Awais Jibran
561fb8cafb Merge pull request #168 from edx/aj/fix-schedules-app
Fix schedules app
2020-01-30 16:10:50 +05:00