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
f4222142
Commit
f4222142
authored
6 years ago
by
Lakhan Mandloi
Browse files
Options
Download
Plain Diff
Merge branch 'release-1.14-SP-2' of github.com:project-sunbird/sunbird-portal into SB-7871
parents
89de316c
74485196
No related merge requests found
Changes
53
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
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/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/dashboard/components/course-progress/course-progress.component.html
+231
-177
...components/course-progress/course-progress.component.html
src/app/client/src/app/modules/dashboard/components/course-progress/course-progress.component.scss
+16
-0
...components/course-progress/course-progress.component.scss
src/app/client/src/app/modules/dashboard/components/course-progress/course-progress.component.ts
+2
-1
...d/components/course-progress/course-progress.component.ts
src/app/client/src/app/modules/learn/components/batch/update-course-batch/update-course-batch.component.data.ts
+1570
-1566
...update-course-batch/update-course-batch.component.data.ts
src/app/client/src/app/modules/learn/components/batch/update-course-batch/update-course-batch.component.html
+8
-6
...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.spec.ts
+16
-2
...update-course-batch/update-course-batch.component.spec.ts
src/app/client/src/app/modules/learn/components/batch/update-course-batch/update-course-batch.component.ts
+36
-34
...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
src/app/client/src/app/modules/search/components/course-search/course-search.component.ts
+35
-23
...earch/components/course-search/course-search.component.ts
src/app/client/src/app/modules/search/components/home-search/home-search.component.html
+6
-5
.../search/components/home-search/home-search.component.html
src/app/client/src/app/modules/search/components/home-search/home-search.component.ts
+33
-23
...es/search/components/home-search/home-search.component.ts
with
2065 additions
and
1897 deletions
+2065
-1897
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
