Commit Graph

34 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
Sultan Khan d4c09d7eb7 Q3 changes 4 years ago
umasoodch d67491a04a added sit 4 years ago
Sultan Khan 1201adb5ed Q3 CHANGES 4 years ago
Fatimah Alshammari 22afd6fb15 Merge branch 'MOHEMM-Q2-DEV' into Fatima-Q2-June
# Conflicts:
#	Mohem/src/app/app-routing.module.ts
5 years ago
Fatimah Alshammari 68371b371a fixed mowadhafi 5 years ago
Sultan Khan 977be243ce Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April 5 years ago
Sultan Khan a9dcd3eb0b ERM Channel design 5 years ago
enadhilal 5e7f7a6c9c added backend integrations module 5 years ago
Sultan Khan df3abc660a new design added with worklist and others 5 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
Mohamed Mekawy c9e7e5a851 general enhancments 7 years ago
Mohamed Mekawy 7f8a37897c Add Time card Module 7 years ago
ashwaq 061c740c55 Add payslip + Fix vacation rule 7 years ago
mohamed.mekawy ce88e72248 solve bugs 7 years ago
haroon amjad 22a11a3214 My Subordinate Page implemented 7 years ago
haroon amjad 7af8b9c791 My Specialist Page Implemented 7 years ago
Sultan Khan faad878c87 worklist main page added 7 years ago
haroon amjad 08f588c302 EIT Flow completed 7 years ago
Sultan Khan a3d58d4b1c absence list added 7 years ago
haroon amjad 892082fb78 My Request Menu implemented 7 years ago
Sultan Khan 7d973b62e2 my-team page update 7 years ago
Sultan Khan 41f804e672 my-team page update 7 years ago
ansariakhtar 2d58a2ab10 Attendance 7 years ago
Sultan Khan 40679c2509 accrual balances page added 7 years ago
Sultan Khan 7282366c03 accrual balances page added 7 years ago
haroon amjad 3b5da38b09 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/src/app/app-routing.module.ts
#	Mohem/src/assets/localization/i18n.json
7 years ago
Sultan Khan c63489d935 profile page added 7 years ago
haroon amjad f24b082f7c working on vacation rule 7 years ago
Sultan Khan fe7e62bbe6 home page update 7 years ago
Sultan Khan cad200261e updated home page 7 years ago
ansariakhtar a787f6797d Login API 7 years ago
Sultan Khan 48a4360ac1 application skeleton 7 years ago
ansariakhtar 62f2cfcda3 Mohem Ionic 4 project created 7 years ago