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
bf7e10ae
Commit
bf7e10ae
authored
5 years ago
by
vinodkumar303
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'upstream/release-2.4.0' into SB-14973-update
parents
54a3e3e2
c0508b3e
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.html
+10
-4
.../merge-account-status/merge-account-status.component.html
src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.ts
+2
-0
...ts/merge-account-status/merge-account-status.component.ts
src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.html
+2
-2
...-in/sso/components/auth-failed/auth-failed.component.html
src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.spec.ts
+2
-2
.../sso/components/auth-failed/auth-failed.component.spec.ts
src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.ts
+3
-0
...gn-in/sso/components/auth-failed/auth-failed.component.ts
src/app/helpers/crypto.js
+2
-1
src/app/helpers/crypto.js
src/app/helpers/environmentVariablesHelper.js
+1
-0
src/app/helpers/environmentVariablesHelper.js
src/app/resourcebundles/data/consumption/en.properties
+4
-1
src/app/resourcebundles/data/consumption/en.properties
src/app/resourcebundles/json/en.json
+1
-2
src/app/resourcebundles/json/en.json
src/app/routes/accountMergeRoute.js
+2
-2
src/app/routes/accountMergeRoute.js
with
29 additions
and
14 deletions
+29
-14
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