Commit Graph

79 Commits (d2843a8a86aa493b502d7db6bb2303bfc089af54)

Author SHA1 Message Date
Fatimah.Alshammari 7a30805e71 add arabic version + fix bugs 6 years ago
Fatimah.Alshammari 25826f900d header translate and quick walkthrouh to test design and translate 6 years ago
Mohamed Mekawy cceb434cf4 merge master-newdesign 6 years ago
enadhilal 3740606bd2 add translate and fix design in Home, worklist, myLeave and Ticket Request 6 years ago
Mohamed Mekawy ae3a2e4995 merge master-newdesign 6 years ago
Mohamed Mekawy 1f044cfb3e Merge branch 'master-newdesign' into work-list 6 years ago
umasoodch 561db9109f Merge branch 'master-newdesign' into myteam
# Conflicts:
#	Mohem/package-lock.json
#	Mohem/package.json
#	Mohem/src/app/eit/home/home.component.html
#	Mohem/src/app/hmg-common/hmg-common.module.ts
#	Mohem/src/app/home/home.page.ts
#	Mohem/src/app/notification/home/home.component.html
#	Mohem/src/theme/styles.scss
6 years ago
ashwaq e7e9ec7b63 fix conflict 6 years ago
ashwaq 527ee02627 add get login last info 6 years ago
umasoodch 69ea2637d6 my-team attendance issues resolved 6 years ago
enadhilal 36c4bf322b add translate for header and fix the position back arrow in arabic version 6 years ago
Mohamed Mekawy 05387d81d4 merge master-newdesign 6 years ago
Mohamed Mekawy 5fcde27564 merge master-newdesign 6 years ago
Fatimah.Alshammari d2940a70d0 add ticket balance 6 years ago
ashwaq 18dabcb13e add vacation rule 6 years ago
Fatimah.Alshammari e71dd383da finish leave balance chart 6 years ago
Mohamed Mekawy d1d3a307b7 finish replacement modal 6 years ago
umasoodch 0e17984b20 fixed conflict issues 6 years ago
Fatimah.Alshammari e37311f726 edit translation 6 years ago
enadhilal a3109bc0a8 create and design ITG form 6 years ago
umasoodch 55f5b391e1 Merge branch 'new-time-card' into myteam 6 years ago
Fatimah.Alshammari 573941941f edit monthly attendance 6 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 6 years ago
Fatimah.Alshammari 2a71811ca2 edit monthley attendance 6 years ago
ashwaq 838e7cf99b add worklist+ fix conflict 6 years ago
ashwaq eb9413edb9 add worklist fix conflict 6 years ago
ashwaq ece6e45d97 add worklist new design 6 years ago
umasoodch 96971a6b68 resolved conflict issues with master branch 6 years ago
Mohamed Mekawy f316629cb0 merge master-newdesign branch 6 years ago
umasoodch 7bd0701d75 fixed design issues for attendance tracking 6 years ago
Fatimah.Alshammari afc8c99639 add new design to payslip 6 years ago
Mohamed Mekawy 52d9e04dac merge master-newdesign with emp-profile 6 years ago
Fatimah.Alshammari b9e1a95601 Add new profile page & years of experience & Performance appraisal 6 years ago
ashwaq 81504b0491 fix merge conflit 6 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
ashwaq c069ae5282 Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into login 6 years ago
Fatimah.Alshammari cb1aad91f9 edit side menue new design 6 years ago
ashwaq 335758fbd0 add login design 6 years ago
ashwaq 53746fc95f add infinite Scroll 6 years ago
ashwaq b02743ead1 PO+MO+PR+Payslip+customAccordin 6 years ago
ashwaq a8457cc11e PR fix design 6 years ago
ashwaq 524b29193a Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq d09d251c71 PR Worklist 6 years ago
enadhilal 0d05073e71 push Enad code workList page 6 years ago
enadhilal 22f9a0ac56 update on workList page 6 years ago
ashwaq 2a75920565 Confirm Login by SMS,Whatsapp,fingerprint and faceID 6 years ago
ashwaq 061c740c55 Add payslip + Fix vacation rule 6 years ago
ashwaq 1db1a031ba fix conflict 6 years ago
ashwaq c52ee53b99 change profile Image 6 years ago
Mohamed Mekawy 2117526e5f my team enhancment 6 years ago