Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-SunbirdEd-portal-old
Commits
234abc9c
Commit
234abc9c
authored
4 years ago
by
swetha-aggidevara
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'upstream/release-3.3.0' into sh-809
parents
57d30d1d
5780dd5b
Changes
20
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/app/client/package.json
+3
-3
src/app/client/package.json
src/app/client/src/app/modules/core/components/content-type/content-type.component.spec.ts
+19
-0
...re/components/content-type/content-type.component.spec.ts
src/app/client/src/app/modules/core/components/content-type/content-type.component.ts
+12
-0
...es/core/components/content-type/content-type.component.ts
src/app/client/src/app/modules/learn/components/course-consumption/assessment-player/assessment-player.component.ts
+2
-0
...sumption/assessment-player/assessment-player.component.ts
src/app/client/src/app/modules/learn/components/course-consumption/consent-pii/consent-pii.component.spec.ts
+0
-15
...rse-consumption/consent-pii/consent-pii.component.spec.ts
src/app/client/src/app/modules/learn/components/course-consumption/consent-pii/consent-pii.component.ts
+1
-5
...s/course-consumption/consent-pii/consent-pii.component.ts
src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-page/course-consumption-page.component.ts
+1
-0
...rse-consumption-page/course-consumption-page.component.ts
src/app/client/src/app/modules/learn/components/course-consumption/course-player/course-player.component.ts
+1
-0
...urse-consumption/course-player/course-player.component.ts
src/app/client/src/app/modules/player-helper/components/content-credits/content-credits.component.html
+1
-1
...components/content-credits/content-credits.component.html
src/app/client/src/app/modules/player-helper/components/contentplayer-page/contentplayer-page.component.spec.ts
+41
-4
...s/contentplayer-page/contentplayer-page.component.spec.ts
src/app/client/src/app/modules/public/module/course/components/course-consumption/public-course-consumption-page/public-course-consumption-page.component.ts
+4
-2
...sumption-page/public-course-consumption-page.component.ts
src/app/client/src/app/modules/public/module/help/components/faq/faq.component.ts
+1
-1
...odules/public/module/help/components/faq/faq.component.ts
src/app/client/src/app/modules/public/module/player/components/public-collection-player/public-collection-player.component.ts
+1
-0
...c-collection-player/public-collection-player.component.ts
src/app/client/src/app/modules/resource/modules/player/components/collection-player/collection-player.component.html
+1
-1
...onents/collection-player/collection-player.component.html
src/app/client/src/app/modules/resource/modules/player/components/collection-player/collection-player.component.ts
+1
-0
...mponents/collection-player/collection-player.component.ts
src/app/client/src/app/modules/shared/services/layoutconfig/layout.service.ts
+2
-2
...pp/modules/shared/services/layoutconfig/layout.service.ts
src/app/client/src/app/modules/workspace/components/data-driven/data-driven.component.ts
+3
-0
...workspace/components/data-driven/data-driven.component.ts
src/app/client/yarn.lock
+22
-22
src/app/client/yarn.lock
src/app/resourcebundles/data/consumption/en.properties
+16
-16
src/app/resourcebundles/data/consumption/en.properties
src/app/resourcebundles/json/en.json
+1
-1
src/app/resourcebundles/json/en.json
with
133 additions
and
73 deletions
+133
-73
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets
