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
Grievance-Redressal-App
Commits
fb6ec735
Commit
fb6ec735
authored
1 year ago
by
Roopashree L
Browse files
Options
Download
Plain Diff
resolved merge conflicts
parents
6426fb4d
895f0929
main
APi_Integration6thAug
FilterUI
Grievances_issues
Raiser-form_UI
RoleBasedBtn
UAT
Ui_Form_Refinement
atachdocsUI
css-fixes
dashboard_and_common_fixes
dashboard_integration
dashboard_ui
dateFilterModification
dev_fixes_v2
dev_issue_fixes
dev_issue_fixes_v1
development
env_variable_fix
feature/search_filter
file_upload_fixes
filter_Reset
grievance-nodal
grievances_integration
grievnce-api-inteegration
login_flow_integration
nodal_officer_screens
payload_modification
responsiveness_addition
revert-133-environment_configs
revert-59-dev_issue_fixes
secretory_flow
tickets_api_integration
toastr_service
uat-release-1.0
uat_issue_fix
updateApiIntegration9thAug
update_TicketIntegartion
user-management-api
userProfileUI
user_management_integration
2 merge requests
!46
Grievance version 1
,
!13
Dashboard and common fixes
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
src/app/app-routing.module.ts
+4
-1
src/app/app-routing.module.ts
src/app/app.module.ts
+3
-1
src/app/app.module.ts
src/app/modules/auth-modules/auth-modules.module.ts
+6
-1
src/app/modules/auth-modules/auth-modules.module.ts
src/app/modules/auth-modules/login-page/login-page.component.css
+0
-0
.../modules/auth-modules/login-page/login-page.component.css
src/app/modules/auth-modules/login-page/login-page.component.html
+89
-1
...modules/auth-modules/login-page/login-page.component.html
src/app/modules/auth-modules/login-page/login-page.component.scss
+60
-0
...modules/auth-modules/login-page/login-page.component.scss
src/app/modules/auth-modules/login-page/login-page.component.ts
+48
-1
...p/modules/auth-modules/login-page/login-page.component.ts
src/app/modules/grievance-modules/grievance-modules-routing.module.ts
+1
-3
...les/grievance-modules/grievance-modules-routing.module.ts
src/app/modules/shared/components/confirmation-popup/confirmation-popup.component.css
+28
-0
...nents/confirmation-popup/confirmation-popup.component.css
src/app/modules/shared/components/confirmation-popup/confirmation-popup.component.html
+24
-0
...ents/confirmation-popup/confirmation-popup.component.html
src/app/modules/shared/components/confirmation-popup/confirmation-popup.component.spec.ts
+23
-0
...s/confirmation-popup/confirmation-popup.component.spec.ts
src/app/modules/shared/components/confirmation-popup/confirmation-popup.component.ts
+21
-0
...onents/confirmation-popup/confirmation-popup.component.ts
src/app/modules/shared/components/shared-table/shared-table.component.html
+7
-2
...hared/components/shared-table/shared-table.component.html
src/app/modules/shared/components/shared-table/shared-table.component.ts
+12
-0
.../shared/components/shared-table/shared-table.component.ts
src/app/modules/shared/shared.module.ts
+3
-1
src/app/modules/shared/shared.module.ts
src/app/modules/user-modules/components/manage-user/manage-user.component.html
+1
-1
...modules/components/manage-user/manage-user.component.html
src/app/modules/user-modules/components/manage-user/manage-user.component.ts
+22
-1
...r-modules/components/manage-user/manage-user.component.ts
src/app/modules/user-modules/components/user-form/user-form.component.css
+1
-1
...user-modules/components/user-form/user-form.component.css
with
353 additions
and
14 deletions
+353
-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