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
5361bf47
Commit
5361bf47
authored
4 years ago
by
Vinu Kumar
Browse files
Options
Download
Plain Diff
SB-0000 merge: Merge conflicts R3.0 resolved
parents
32465ae3
d456d8e1
Changes
49
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/app/client/package-lock.json
+8621
-7234
src/app/client/package-lock.json
src/app/client/package.json
+2
-1
src/app/client/package.json
src/app/client/src/app/app.component.ts
+31
-1
src/app/client/src/app/app.component.ts
src/app/client/src/app/modules/core/services/search/search.service.spec.ts
+36
-3
...c/app/modules/core/services/search/search.service.spec.ts
src/app/client/src/app/modules/core/services/search/search.service.ts
+96
-2
...nt/src/app/modules/core/services/search/search.service.ts
src/app/client/src/app/modules/dashboard/components/usage-reports/usage-reports.component.html
+22
-9
...ard/components/usage-reports/usage-reports.component.html
src/app/client/src/app/modules/dashboard/components/usage-reports/usage-reports.component.ts
+2
-0
...board/components/usage-reports/usage-reports.component.ts
src/app/client/src/app/modules/groups/components/create-group/create-group.component.html
+4
-2
...roups/components/create-group/create-group.component.html
src/app/client/src/app/modules/groups/components/create-group/create-group.component.spec.ts
+9
-8
...ps/components/create-group/create-group.component.spec.ts
src/app/client/src/app/modules/groups/components/create-group/create-group.component.ts
+1
-1
.../groups/components/create-group/create-group.component.ts
src/app/client/src/app/modules/groups/components/group-form/group-form.component.html
+37
-30
...es/groups/components/group-form/group-form.component.html
src/app/client/src/app/modules/groups/components/group-form/group-form.component.spec.data.ts
+830
-0
...s/components/group-form/group-form.component.spec.data.ts
src/app/client/src/app/modules/groups/components/group-form/group-form.component.spec.ts
+136
-7
...groups/components/group-form/group-form.component.spec.ts
src/app/client/src/app/modules/groups/components/group-form/group-form.component.ts
+225
-22
...ules/groups/components/group-form/group-form.component.ts
src/app/client/src/app/modules/groups/components/my-groups/my-groups.component.spec.ts
+21
-6
...s/groups/components/my-groups/my-groups.component.spec.ts
src/app/client/src/app/modules/groups/components/my-groups/my-groups.component.ts
+10
-2
...odules/groups/components/my-groups/my-groups.component.ts
src/app/client/src/app/modules/groups/services/groups/groups.service.spec.data.ts
+1855
-0
...odules/groups/services/groups/groups.service.spec.data.ts
src/app/client/src/app/modules/groups/services/groups/groups.service.spec.ts
+73
-5
...app/modules/groups/services/groups/groups.service.spec.ts
src/app/client/src/app/modules/groups/services/groups/groups.service.ts
+81
-1
.../src/app/modules/groups/services/groups/groups.service.ts
src/app/client/src/app/modules/public/module/explore/components/explore-curriculum-courses/explore-curriculum-courses.component.html
+41
-0
...riculum-courses/explore-curriculum-courses.component.html
with
12133 additions
and
7334 deletions
+12133
-7334
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
