Commit Graph

65 Commits (ed4673a32d87a46856b59ea8d77d144f3917edae)

Author SHA1 Message Date
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
enadhilal b60fd8be8a fixed bugs #:
MM-742
MM-743
and added show my password in forgot password and change password
4 years ago
Sultan Khan 96cf60fecf q3 bug fixes change updates 4 years ago
Sultan Khan 1313602ab3 q3 changes updates 4 years ago
Sultan Khan b30bfa9a0b q3 fixes 4 years ago
enadhilal 173ba6fd60 add digital id 4 years ago
Sultan Khan 1201adb5ed Q3 CHANGES 4 years ago
umasoodch 95009a1e80 pushed sfh changes 4 years ago
umasoodch 24d95b13b7 commented unwanted services in sfh 4 years ago
umasoodch 019d72ce4c fixed swipe issue 4 years ago
enadhilal a161484198 fixing issues 4 years ago
enadhilal 00ef78271c fixing design issues in bussines card for all mobile type, favorite issues fixed in worklist and itg worklist 4 years ago
enadhilal a03b32a2b0 fixing favruite in worklist and my team 4 years ago
enadhilal b12eeb4a1a fixing design issue for update page and translate for business card 4 years ago
enadhilal 4aa50bbfda fixing bugs 4 years ago
enadhilal e58be0d5fc pushed for business card 4 years ago
Fatimah Alshammari c4846138ed fixed issues 5 years ago
enadhilal f6451974ee fix the logo image in menu 5 years ago
Fatimah Alshammari ab0f37ca12 fixed issues in mowdafi HR 5 years ago
Fatimah Alshammari 8ccb01f1ac fixed my team 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
enadhilal 512465964d Merge branch 'MOHEMM-Q2-DEV' into enad-Q1 5 years ago
enadhilal 94af746ae2 UI/UX enhancment 5 years ago
enadhilal 5e7f7a6c9c added backend integrations module 5 years ago
Fatimah Alshammari 6f7bd0847b fixed conflicts 5 years ago
enadhilal 979ffda40f fixed UI in my profile and change the icon for digital ID in menu 5 years ago
enadhilal c66905865e fixed digital ID issues 5 years ago
umasoodch a813addd92 completed location for cloud solutions mohemm 5 years ago
Fatimah.Alshammari 4719af3b89 fix bugs 6 years ago
Mohamed Mekawy 56e25638bc handle side menu 6 years ago
Fatimah.Alshammari 4deaf4dc38 fix bugs 6 years ago
Fatimah.Alshammari bd0208919c fix bugs 6 years ago
Mohamed Mekawy d42ba46ea2 edit side menu conflict 6 years ago
Mohamed Mekawy be27e4143d edit home vacation rule issue & my team side menu 6 years ago
umasoodch 88cabac92f fixed header and production build issues 6 years ago
Mohamed Mekawy a3300453d9 merge master-newdesign 6 years ago
Mohamed Mekawy e191b21e44 fix issues 6 years ago
enadhilal 7c4d3327d6 fixing menu and scrolling in EIT 6 years ago
umasoodch d31b76bc44 fixed all issues while making prod build 6 years ago
Fatimah.Alshammari 0871a67480 all conflicting issues are resolved 6 years ago
enadhilal 11dd7e56e4 fix profile in arabic and translate 6 years ago
Mohamed Mekawy 8f9ef27ee1 add my team to side menu & handle accural balance in absence page 6 years ago
Mohamed Mekawy f316629cb0 merge master-newdesign branch 6 years ago
Fatimah.Alshammari afc8c99639 add new design to payslip 6 years ago
Fatimah.Alshammari b9e1a95601 Add new profile page & years of experience & Performance appraisal 6 years ago
Fatimah.Alshammari cb1aad91f9 edit side menue new design 6 years ago
enadhilal 22f9a0ac56 update on workList page 6 years ago
ashwaq c52ee53b99 change profile Image 6 years ago