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
c42e4b01
Commit
c42e4b01
authored
2 years ago
by
unknown
Browse files
Options
Download
Plain Diff
conflict resolved
parents
2284bfa2
025b8aef
master
dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/express-4.17.3
dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3
dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3
dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/express-4.17.3
dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/qs-6.10.3
filters_5.1.1
gcp_test
release-5.0.0
release-5.0.0.1
release-5.0.0.2
release-5.0.0.3
release-5.0.1
release-5.0.2
release-5.1.0
release-5.1.1
sharathkashyap-patch-1
Tags unavailable
No related merge requests found
Changes
86
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
README.md
+3
-4
README.md
src/app/client/README.md
+22
-5
src/app/client/README.md
src/app/client/package.json
+8
-7
src/app/client/package.json
src/app/client/src/app/app.component.ts
+3
-3
src/app/client/src/app/app.component.ts
src/app/client/src/app/modules/core/components/content-type/content-type.component.ts
+6
-1
...es/core/components/content-type/content-type.component.ts
src/app/client/src/app/modules/dashboard/components/filter/filter.component.spec.data.ts
+6
-0
...dashboard/components/filter/filter.component.spec.data.ts
src/app/client/src/app/modules/dashboard/components/filter/filter.component.spec.ts
+122
-14
...ules/dashboard/components/filter/filter.component.spec.ts
src/app/client/src/app/modules/dashboard/components/filter/filter.component.ts
+43
-14
...p/modules/dashboard/components/filter/filter.component.ts
src/app/client/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.ts
+3
-2
...components/list-all-reports/list-all-reports.component.ts
src/app/client/src/app/modules/dashboard/components/report/report.component.ts
+4
-2
...p/modules/dashboard/components/report/report.component.ts
src/app/client/src/app/modules/dashboard/dashboard.module.ts
+1
-1
src/app/client/src/app/modules/dashboard/dashboard.module.ts
src/app/client/src/app/modules/dashboard/services/report/report.service.ts
+6
-1
...c/app/modules/dashboard/services/report/report.service.ts
src/app/client/src/app/modules/discussion/components/forum/forum.component.spec.ts
+108
-0
...dules/discussion/components/forum/forum.component.spec.ts
src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.component.html
+27
-22
...nsumption-header/course-consumption-header.component.html
src/app/client/src/app/modules/manage/components/user-role-assign/user-role-assign.component.spec.ts
+368
-0
...nents/user-role-assign/user-role-assign.component.spec.ts
src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.spec.ts
+102
-0
...rge-account-status/merge-account-status.component.spec.ts
src/app/client/src/app/modules/observation/components/observation-details/observation-details.component.html
+2
-2
...ts/observation-details/observation-details.component.html
src/app/client/src/app/modules/observation/components/observation-details/observation-details.component.ts
+5
-0
...ents/observation-details/observation-details.component.ts
src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.ts
+3
-1
...ents/observation-listing/observation-listing.component.ts
src/app/client/src/app/modules/observation/components/submissions/submission.component.spec.ts
+76
-0
...ation/components/submissions/submission.component.spec.ts
with
918 additions
and
79 deletions
+918
-79
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