Merge branch 'master' into a-asad/video-player-logging-fix

.eslintignore

@@ -20,9 +20,21 @@ test_root/staticfiles
 common/static/xmodule
 
 
-# Symlinks into xmodule/js
+# Various intra-repo symlinks that we've added over the years to duct-tape the JS build together.
+# Ignore them so that we're not double-counting these violations.
+cms/static/edx-ui-toolkit
 cms/static/xmodule_js
+lms/static/common
+lms/static/course_bookmarks
+lms/static/course_experience
+lms/static/course_search
+lms/static/discussion
+lms/static/edx-ui-toolkit
+lms/static/learner_profile
+lms/static/support
+lms/static/teams
 lms/static/xmodule_js
+xmodule/js/common_static
 
 
 # Mako templates that generate .js files

cms/static/sass/elements/_vendor.scss

@@ -66,13 +66,6 @@
   z-index: 100000 !important;
 }
 
-//jQuery loupeAndLightbox Plugin
-.zooming-image-place {
-  .larger {
-    left: 0 !important;
-    bottom: 100% !important;
-  }
-}
 // ====================
 
 // reset styles to remove ui-lightness jquery ui theme from the tabs component (used in the add component problem tab menu)

docs/concepts/extension_points.rst

@@ -139,10 +139,10 @@ Here are the different integration points that python plugins can use:
      - This decorator allows overriding any function or method by pointing to an alternative implementation in settings. Read the |pluggable_override docstring|_ to learn more.
    * - Open edX Events
      - Adopt, Stable
-     - Events are part of the greater Hooks Extension Framework for open extension of edx-platform. Events are a stable way for plugin developers to react to learner or author events. They are defined by a `separate events library`_ that developers can include in their requirements to develop and test the code without creating a dependency on this large repo. For more information see the `hooks guide`_.
+     - Events are part of the greater Hooks Extension Framework for open extension of edx-platform. Events are a stable way for plugin developers to react to learner or author events. They are defined by a `separate events library`_ that developers can include in their requirements to develop and test the code without creating a dependency on this large repo. For more information see the `Hooks Extension Framework docs`_ or for more detailed documentation about Open edX Events, see the `Open edX Events documentation`_.
    * - Open edX Filters
      - Adopt, Stable
-     - Filters are also part of Hooks Extension Framework for open extension of edx-platform. Filters are a flexible way for plugin developers to modify learner or author application flows. They are defined by a `separate filters library`_ that developers can include in their requirements to develop and test the code without creating a dependency on this large repo. For more information see the `hooks guide`_.
+     - Filters are also part of Hooks Extension Framework for open extension of edx-platform. Filters are a flexible way for plugin developers to modify learner or author application flows. They are defined by a `separate filters library`_ that developers can include in their requirements to develop and test the code without creating a dependency on this large repo. For more information see the `Hooks Extension Framework docs`_ or for more detailed documentation about Open edX Filters, see the `Open edX Filters documentation`_.
 
 .. _Application: https://docs.djangoproject.com/en/3.0/ref/applications/
 .. _Django app plugin documentation: https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/plugins/README.rst
@@ -159,7 +159,9 @@ Here are the different integration points that python plugins can use:
 .. _pluggable_override docstring: https://github.com/openedx/edx-django-utils/blob/master/edx_django_utils/plugins/pluggable_override.py
 .. _separate events library: https://github.com/eduNEXT/openedx-events/
 .. _separate filters library: https://github.com/eduNEXT/openedx-filters/
-.. _hooks guide: https://github.com/openedx/edx-platform/blob/master/docs/guides/hooks/index.rst
+.. _Hooks Extension Framework docs: https://docs.openedx.org/en/latest/developers/concepts/hooks_extension_framework.html
+.. _Open edX Events documentation: https://docs.openedx.org/projects/openedx-events/en/latest/
+.. _Open edX Filters documentation: https://docs.openedx.org/projects/openedx-filters/en/latest/
 
 Platform Look & Feel
 ====================

docs/conf.py

@@ -68,6 +68,7 @@
     'code_annotations.contrib.sphinx.extensions.featuretoggles',
     'code_annotations.contrib.sphinx.extensions.settings',
     # 'autoapi.extension',  # Temporarily disabled
+    'sphinx_reredirects',
 ]
 
 # Temporarily disabling autoapi_dirs and the AutoAPI extension due to performance issues.
@@ -304,6 +305,16 @@
     # 'xmodule': 'references/docstrings/xmodule',
 }
 
+# Mapping permanently moved pages to appropriate new location outside of edx-platform
+# with by sphinx-reredirects extension redirects.
+# More information: https://documatt.com/sphinx-reredirects/usage.html
+
+redirects = {
+    'hooks/events': 'https://docs.openedx.org/projects/openedx-events/en/latest/',
+    'hooks/filters': 'https://docs.openedx.org/projects/openedx-filters/en/latest/',
+    'hooks/index': 'https://docs.openedx.org/en/latest/developers/concepts/hooks_extension_framework.html',
+}
+
 
 def update_settings_module(service='lms'):
     """