Skip to content

Commit 8dc9001

Browse files
author
Ahtesham Quraish
committed
Merge branch 'master' into ahtesham/#2323
fix: merge with master
2 parents 7bac405 + 7825bcd commit 8dc9001

File tree

112 files changed

+4701
-1182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+4701
-1182
lines changed

.github/workflows/validate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- uses: actions/setup-node@v4
1616
with:
1717
node-version-file: '.nvmrc'
@@ -25,9 +25,9 @@ jobs:
2525
runs-on: ubuntu-latest
2626
needs: tests
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
- name: Download code coverage results
30-
uses: actions/download-artifact@v4
30+
uses: actions/download-artifact@v5
3131
with:
3232
name: code-coverage-report
3333
- name: Upload coverage

CODEOWNERS

Lines changed: 0 additions & 2 deletions
This file was deleted.

package-lock.json

Lines changed: 37 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/CourseAuthoringRoutes.jsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import ScheduleAndDetails from './schedule-and-details';
1717
import { GradingSettings } from './grading-settings';
1818
import CourseTeam from './course-team/CourseTeam';
1919
import { CourseUpdates } from './course-updates';
20-
import { CourseUnit } from './course-unit';
20+
import { CourseUnit, SubsectionUnitRedirect } from './course-unit';
2121
import { Certificates } from './certificates';
2222
import CourseExportPage from './export-page/CourseExportPage';
2323
import CourseOptimizerPage from './optimizer-page/CourseOptimizerPage';
@@ -82,6 +82,10 @@ const CourseAuthoringRoutes = () => {
8282
path="custom-pages/*"
8383
element={<PageWrap><CustomPages courseId={courseId} /></PageWrap>}
8484
/>
85+
<Route
86+
path="/subsection/:subsectionId"
87+
element={<PageWrap><SubsectionUnitRedirect courseId={courseId} /></PageWrap>}
88+
/>
8589
{DECODED_ROUTES.COURSE_UNIT.map((path) => (
8690
<Route
8791
key={path}

src/constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ export const iframeMessageTypes = {
105105
resize: 'plugin.resize',
106106
videoFullScreen: 'plugin.videoFullScreen',
107107
xblockEvent: 'xblock-event',
108+
xblockScroll: 'xblock-scroll',
108109
};

0 commit comments

Comments
 (0)