Commit Graph

125 Commits (fabf4a079730956b10daa0b67e3fe9cea5b49f5f)

Author SHA1 Message Date
choudhry masood fabf4a0797 Conflicts resolved 3 years ago
Sultan Khan b309efb375 push notification added 3 years ago
Sultan Khan 09cebc6a82 Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into enad-pre-live 4 years ago
Sultan Khan df7c53059e concorrent report changes 4 years ago
umasoodch ad45089c70 fixed issues 4 years ago
Sultan Khan 39c45d840c worklist count changes 4 years ago
Sultan Khan 10a90c0c25 Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into enad-pre-live 4 years ago
Sultan Khan aa38a94005 worklist count fix 4 years ago
umasoodch 1ac6a9abbd Merge branch 'MOHEMM-Q3-DEV-LATEST' into enad-pre-live
# Conflicts:
#	Mohem/src/app/home/home.page.ts
4 years ago
Sultan Khan c99edac162 bug fix 4 years ago
umasoodch e87da5e2fd fixed all issues 4 years ago
umasoodch ed4673a32d fixed sfh issues 4 years ago
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 3529b60ebc Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into enad-pre-live 4 years ago
Sultan Khan 96cf60fecf q3 bug fixes change updates 4 years ago
enadhilal f96cf769a2 toast msg top 4 years ago
Sultan Khan 5eb2a68831 worklist-done 4 years ago
enadhilal 8587ba279f add total count from mohemm page to show it in worklist home page 4 years ago
umasoodch ef73fc8bc3 fixed child education 4 years ago
umasoodch 3cc9048098 CE new component added 4 years ago
enadhilal 91361f87d3 fixed worklist issue 4 years ago
Sultan Khan b30bfa9a0b q3 fixes 4 years ago
Sultan Khan e7755c1ef4 Merge branch 'MOHEMM-Q3-DEV' into sultan-q3
# Conflicts:
#	Mohem/src/assets/localization/i18n.json
4 years ago
Sultan Khan d4c09d7eb7 Q3 changes 4 years ago
umasoodch 59747d1780 fixed loading issue 4 years ago
umasoodch d67491a04a added sit 4 years ago
Sultan Khan 1201adb5ed Q3 CHANGES 4 years ago
enadhilal 4aa50bbfda fixing bugs 4 years ago
enadhilal e414ba95e3 toast red 5 years ago
umasoodch ded927bf6a fixed basic details issue 5 years ago
umasoodch d4dccd6dff fixed basic details issue 5 years ago
Sultan Khan 7671eb7f14 design and address 5 years ago
umasoodch 86f8a25bee Merge branch 'sultan26April' into umar-q2-branch
# Conflicts:
#	Mohem/src/app/profile/home/home.component.html
#	Mohem/src/app/profile/home/home.component.ts
#	Mohem/src/app/profile/profile.module.ts
#	Mohem/src/app/profile/service/profile.service.ts
5 years ago
umasoodch 7b75303583 added logic for eit basic details 5 years ago
Sultan Khan 9e509e143f user profile 5 years ago
umasoodch aa8d2e3d85 commited my profile code 5 years ago
Fatimah Alshammari ab0f37ca12 fixed issues in mowdafi HR 5 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 512465964d Merge branch 'MOHEMM-Q2-DEV' into enad-Q1 5 years ago
enadhilal 5e7f7a6c9c added backend integrations module 5 years ago
Fatimah Alshammari 6f7bd0847b fixed conflicts 5 years ago
enadhilal 57467ea800 Item Creation page added 5 years ago
umasoodch 33d55363bb Merge branch 'mohemm-wifi-feature' into ZohaibIqbalKambrani
# Conflicts:
#	Mohem/package-lock.json
5 years ago
Zohaib Iqbal Kambrani 7ee282c9fc no message 5 years ago
umasoodch c6ee3e798c fixed worklist and icon issue. Also removed unused plugins. 5 years ago
umasoodch b9e58a3739 deleted unused code 5 years ago
umasoodch b7fc960ce7 completed NFC for CS Mohemm 5 years ago