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
ff197e17
Commit
ff197e17
authored
4 years ago
by
“Rajnish
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'upstream/release-3.3.0' into SB-19720
parents
200b1951
d9ff64f5
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
src/app/client/src/app/modules/learn/components/batch/batch-details/batch-details.component.html
+1
-2
...mponents/batch/batch-details/batch-details.component.html
src/app/client/src/app/modules/learn/components/batch/batch-details/batch-details.component.spec.ts
+10
-2
...nents/batch/batch-details/batch-details.component.spec.ts
src/app/client/src/app/modules/learn/components/batch/batch-details/batch-details.component.ts
+3
-3
...components/batch/batch-details/batch-details.component.ts
src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.html
+4
-5
...components/batch/create-batch/create-batch.component.html
src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.ts
+2
-2
...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
+4
-5
...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
+1
-1
...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
+2
-3
...atch/update-course-batch/update-course-batch.component.ts
src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.component.spec.ts
+8
-2
...mption-header/course-consumption-header.component.spec.ts
src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.component.ts
+2
-2
...consumption-header/course-consumption-header.component.ts
src/app/client/src/app/modules/learn/services/course-consumption/course-consumption.service.spec.ts
+15
-0
...ces/course-consumption/course-consumption.service.spec.ts
src/app/client/src/app/modules/learn/services/course-consumption/course-consumption.service.ts
+7
-2
...services/course-consumption/course-consumption.service.ts
src/app/client/src/app/modules/search/components/home-search/home-search.component.spec.ts
+52
-1
...arch/components/home-search/home-search.component.spec.ts
src/app/package.json
+1
-1
src/app/package.json
src/app/resourcebundles/data/consumption/en.properties
+1
-0
src/app/resourcebundles/data/consumption/en.properties
src/app/resourcebundles/json/en.json
+1
-1
src/app/resourcebundles/json/en.json
with
114 additions
and
32 deletions
+114
-32
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
