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
a21ea6e0
Commit
a21ea6e0
authored
2 years ago
by
princegupta1131
Browse files
Options
Download
Plain Diff
Issue #SB-0000 fix: Merge conflicts resolved
parents
57287211
b4a69d51
release-5.1.1
filters_5.1.1
gcp_test
release-5.1.0
Tags unavailable
No related merge requests found
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/app/client/package.json
+3
-3
src/app/client/package.json
src/app/client/src/app/app.module.ts
+2
-2
src/app/client/src/app/app.module.ts
src/app/client/src/app/modules/content-search/components/global-search-filter/global-search-filter.component.ts
+1
-1
...ts/global-search-filter/global-search-filter.component.ts
src/app/client/src/app/modules/content-search/components/search-filter/search-filter.component.ts
+1
-1
...earch/components/search-filter/search-filter.component.ts
src/app/client/src/app/modules/content-search/content-search.module.ts
+1
-1
...t/src/app/modules/content-search/content-search.module.ts
src/app/client/src/app/modules/core/components/content-type/content-type.component.scss
+1
-1
.../core/components/content-type/content-type.component.scss
src/app/client/src/app/modules/core/components/main-header/main-header.component.scss
+1
-1
...es/core/components/main-header/main-header.component.scss
src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.scss
+4
-33
...-page/components/explore-page/explore-page.component.scss
src/app/client/src/app/modules/notification/notification.module.ts
+1
-1
...lient/src/app/modules/notification/notification.module.ts
src/app/client/src/app/modules/notification/services/notification/notification-service-impl.ts
+1
-1
...cation/services/notification/notification-service-impl.ts
src/app/client/src/app/modules/public/module/help/help.module.ts
+1
-1
.../client/src/app/modules/public/module/help/help.module.ts
src/app/client/src/app/modules/public/module/sign-in/sso/components/update-contact/update-contact.component.spec.ts
+399
-0
...omponents/update-contact/update-contact.component.spec.ts
src/app/client/src/app/modules/shared-feature/shared-feature.module.ts
+1
-1
...t/src/app/modules/shared-feature/shared-feature.module.ts
src/app/client/src/app/modules/shared/services/activity-dashboard/activity-dashboard.service.spec.ts
+26
-0
...ces/activity-dashboard/activity-dashboard.service.spec.ts
src/app/client/src/app/plugins/location/components/delegate/sb-form-location-options.factory.ts
+1
-1
...n/components/delegate/sb-form-location-options.factory.ts
src/app/client/src/app/plugins/location/components/delegate/sb-form-location-selection.delegate.ts
+1
-1
...omponents/delegate/sb-form-location-selection.delegate.ts
src/app/client/src/app/plugins/location/location.module.ts
+1
-1
src/app/client/src/app/plugins/location/location.module.ts
src/app/client/src/app/plugins/profile/components/account-recovery-info/account-recovery-info.component.spec.ts
+217
-0
...unt-recovery-info/account-recovery-info.component.spec.ts
src/app/client/src/app/plugins/profile/components/profile-page/profile-page.component.ts
+1
-1
...profile/components/profile-page/profile-page.component.ts
src/app/client/src/app/plugins/profile/components/submit-teacher-details/submit-teacher-details.component.spec.data.ts
+1
-1
...her-details/submit-teacher-details.component.spec.data.ts
with
665 additions
and
52 deletions
+665
-52
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