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
bbb8817f
Commit
bbb8817f
authored
6 years ago
by
Pradosh Kumar
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'upstream/release-1.14-SP-2' into SB-10240
parents
be3f8e16
93bfde8a
Changes
60
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/app/client/package-lock.json
+533
-24
src/app/client/package-lock.json
src/app/client/package.json
+3
-2
src/app/client/package.json
src/app/client/src/app/app.component.ts
+2
-2
src/app/client/src/app/app.component.ts
src/app/client/src/app/modules/core/components/main-footer/main-footer.component.html
+22
-6
...es/core/components/main-footer/main-footer.component.html
src/app/client/src/app/modules/core/interfaces/enrolledCourses.ts
+2
-0
...client/src/app/modules/core/interfaces/enrolledCourses.ts
src/app/client/src/app/modules/core/services/copy-content/copy-content.service.ts
+8
-6
...odules/core/services/copy-content/copy-content.service.ts
src/app/client/src/app/modules/core/services/course/course.service.ts
+27
-0
...nt/src/app/modules/core/services/course/course.service.ts
src/app/client/src/app/modules/core/services/player/player.service.ts
+1
-1
...nt/src/app/modules/core/services/player/player.service.ts
src/app/client/src/app/modules/core/services/user/user.service.ts
+56
-2
...client/src/app/modules/core/services/user/user.service.ts
src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.html
+1
-1
...components/batch/create-batch/create-batch.component.html
src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.ts
+1
-1
...n/components/batch/create-batch/create-batch.component.ts
src/app/client/src/app/modules/learn/components/batch/update-course-batch/update-course-batch.component.html
+2
-2
...ch/update-course-batch/update-course-batch.component.html
src/app/client/src/app/modules/learn/components/batch/update-course-batch/update-course-batch.component.ts
+6
-8
...atch/update-course-batch/update-course-batch.component.ts
src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-page/course-consumption-page.component.spec.ts
+9
-5
...onsumption-page/course-consumption-page.component.spec.ts
src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-page/course-consumption-page.component.ts
+4
-3
...rse-consumption-page/course-consumption-page.component.ts
src/app/client/src/app/modules/learn/components/learn-page/learn-page.component.html
+8
-8
...les/learn/components/learn-page/learn-page.component.html
src/app/client/src/app/modules/learn/components/learn-page/learn-page.component.spec.ts
+10
-10
.../learn/components/learn-page/learn-page.component.spec.ts
src/app/client/src/app/modules/learn/components/learn-page/learn-page.component.ts
+44
-27
...dules/learn/components/learn-page/learn-page.component.ts
src/app/client/src/app/modules/learn/learn-routing.module.ts
+1
-1
src/app/client/src/app/modules/learn/learn-routing.module.ts
src/app/client/src/app/modules/search/components/course-search/course-search.component.html
+6
-5
...rch/components/course-search/course-search.component.html
with
746 additions
and
114 deletions
+746
-114
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
