Skip to content
GitLab
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
cb7c2db8
Commit
cb7c2db8
authored
2 years ago
by
5Amogh
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'upstream/release-5.1.0' into release-5.0.1
parents
e2852001
d5a40f7c
Changes
462
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.github/pull_request_template.md
+31
-0
.github/pull_request_template.md
.gitignore
+3
-2
.gitignore
.vscode/settings.json
+0
-7
.vscode/settings.json
README.md
+33
-5
README.md
src/app/client/README.md
+16
-5
src/app/client/README.md
src/app/client/angular.json
+2
-2
src/app/client/angular.json
src/app/client/package.json
+11
-11
src/app/client/package.json
src/app/client/src/app/app.component.html
+2
-2
src/app/client/src/app/app.component.html
src/app/client/src/app/app.component.scss
+1
-1
src/app/client/src/app/app.component.scss
src/app/client/src/app/app.component.ts
+10
-10
src/app/client/src/app/app.component.ts
src/app/client/src/app/app.module.ts
+2
-2
src/app/client/src/app/app.module.ts
src/app/client/src/app/modules/certificate/certificate.module.ts
+1
-1
.../client/src/app/modules/certificate/certificate.module.ts
src/app/client/src/app/modules/certificate/components/browse-image-popup/browse-image-popup.component.scss
+24
-26
...ents/browse-image-popup/browse-image-popup.component.scss
src/app/client/src/app/modules/certificate/components/certificate-configuration/certificate-configuration.component.scss
+1
-1
...te-configuration/certificate-configuration.component.scss
src/app/client/src/app/modules/certificate/components/certificate-details/certificate-details.component.scss
+1
-2
...ts/certificate-details/certificate-details.component.scss
src/app/client/src/app/modules/certificate/components/create-template/create-template.component.scss
+1
-2
...components/create-template/create-template.component.scss
src/app/client/src/app/modules/certificate/components/svg-editor/svg-editor.component.scss
+1
-2
...rtificate/components/svg-editor/svg-editor.component.scss
src/app/client/src/app/modules/content-search/components/data-driven-filter/data-driven-filter.component.scss
+2
-3
...ents/data-driven-filter/data-driven-filter.component.scss
src/app/client/src/app/modules/content-search/components/global-search-filter/global-search-filter.component.html
+0
-1
.../global-search-filter/global-search-filter.component.html
src/app/client/src/app/modules/content-search/components/global-search-filter/global-search-filter.component.scss
+3
-5
.../global-search-filter/global-search-filter.component.scss
with
145 additions
and
90 deletions
+145
-90
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
