Commit Graph

21 Commits (42ec226d4588fb15feb3d2461998d5cba32f18d6)

Author SHA1 Message Date
umasoodch 42ec226d45 Merge branch 'MOHEMM-Q3-DEV-LATEST' into MOHEMM-PHASE-2-SFH
# Conflicts:
#	Mohem/resources/android/icon/drawable-hdpi-icon.png
#	Mohem/resources/android/icon/drawable-ldpi-icon.png
#	Mohem/resources/android/icon/drawable-mdpi-icon.png
#	Mohem/resources/android/icon/drawable-xhdpi-icon.png
#	Mohem/resources/android/icon/drawable-xxhdpi-icon.png
#	Mohem/resources/android/icon/drawable-xxxhdpi-icon.png
#	Mohem/resources/android/splash/drawable-land-hdpi-screen.png
#	Mohem/resources/android/splash/drawable-land-ldpi-screen.png
#	Mohem/resources/android/splash/drawable-land-mdpi-screen.png
#	Mohem/resources/android/splash/drawable-land-xhdpi-screen.png
#	Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png
#	Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-hdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-ldpi-screen.png
#	Mohem/resources/android/splash/drawable-port-mdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-xhdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png
#	Mohem/src/app/app-routing.module.ts
#	Mohem/src/app/app.component.html
#	Mohem/src/app/app.component.ts
#	Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
#	Mohem/src/app/hmg-common/services/common/common.service.ts
#	Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss
#	Mohem/src/app/home/home.page.ts
#	Mohem/src/app/my-team/details/details.component.ts
#	Mohem/src/app/notification/home/home.component.html
#	Mohem/src/app/notification/home/home.component.ts
#	Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss
#	Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
#	Mohem/src/app/notification/worklist-main/worklist-main.component.html
#	Mohem/src/app/notification/worklist-main/worklist-main.component.ts
#	Mohem/src/app/profile/home/home.component.ts
#	Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
4 years ago
enadhilal c05f5c4725 added validation to forget password component 4 years ago
enadhilal 57be247a0a fixed change password in welcome page and added CONTACT request type in worklist 4 years ago
enadhilal 27fc8ebb72 fixed itg 4 years ago
enadhilal f7c23eb8d4 added notification service for worklist 4 years ago
enadhilal d5dfc27004 add service for worklist notification and STAMP 4 years ago
umasoodch 50505d3f07 fixed notify in worklist 4 years ago
enadhilal 138f75a9af PO Total amount with Tax, baisc info and addres request to show in work list and business card to use local storage 5 years ago
enadhilal 57467ea800 Item Creation page added 5 years ago
ashwaq 098f81b3c8 itg error text 6 years ago
ashwaq c7eb6c97a2 fix merge ashwaq issue + work-list branch 6 years ago
ashwaq 5aeab4b08c add MO item History 6 years ago
umasoodch ab2ace51b9 MM-112 FIXED - worklist and home loader issue resolved 6 years ago
enadhilal a3109bc0a8 create and design ITG form 6 years ago
enadhilal b27f976bc9 push to merge with worklist work 6 years ago
ashwaq b02743ead1 PO+MO+PR+Payslip+customAccordin 6 years ago
Mohamed Mekawy 5c4377034f enhance 7 years ago
enadhilal 22f9a0ac56 update on workList page 7 years ago
Mohamed Mekawy 7f8a37897c Add Time card Module 7 years ago
Mohamed Mekawy 17246a58b8 add PO & MO & PR 7 years ago
Sultan Khan 16e26719f0 worklist-main added 7 years ago