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
3b8688ff
Commit
3b8688ff
authored
4 years ago
by
Sourav
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'upstream/release-3.3.0' into SB-20292
parents
6ca892c3
93509ea7
Changes
46
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/app/client/package.json
+4
-4
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/core/services/generalisedLable/generaliseLable.service.spec.ts
+54
-0
...services/generalisedLable/generaliseLable.service.spec.ts
src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.ts
+8
-1
...core/services/generalisedLable/generaliseLable.service.ts
src/app/client/src/app/modules/core/services/player/player.service.spec.ts
+22
-1
...c/app/modules/core/services/player/player.service.spec.ts
src/app/client/src/app/modules/core/services/player/player.service.ts
+17
-8
...nt/src/app/modules/core/services/player/player.service.ts
src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.spec.ts
+2
-1
...ts/activity/activity-list/activity-list.component.spec.ts
src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.ts
+4
-4
...ponents/activity/activity-list/activity-list.component.ts
src/app/client/src/app/modules/learn/components/batch/enroll-batch/enroll-batch.component.ts
+1
-3
...n/components/batch/enroll-batch/enroll-batch.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.html
+1
-1
...course-consumption/consent-pii/consent-pii.component.html
src/app/client/src/app/modules/learn/components/course-consumption/consent-pii/consent-pii.component.spec.ts
+27
-5
...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
+10
-4
...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.html
+1
-1
...se-consumption/course-player/course-player.component.html
src/app/client/src/app/modules/learn/components/course-consumption/course-player/course-player.component.spec.ts
+2
-10
...consumption/course-player/course-player.component.spec.ts
src/app/client/src/app/modules/learn/components/course-consumption/course-player/course-player.component.ts
+3
-6
...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
with
232 additions
and
54 deletions
+232
-54
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
