Commit Graph

293 Commits (0052bb98ffd65a30d6576946a418ab0befbfaa75)
 

Author SHA1 Message Date
Fatimah.Alshammari 0052bb98ff merge master-newdesign 6 years ago
Fatimah.Alshammari 0871a67480 all conflicting issues are resolved 6 years ago
Fatimah.Alshammari dc1749e48e edit performance appraisal 6 years ago
Fatimah.Alshammari 80ab9a5c80 general 6 years ago
Mohamed Mekawy 215084f797 edit payment info & employee profile update 6 years ago
Mohamed Mekawy f00e63f49d remove image from confirmlogin and sms 6 years ago
Fatimah.Alshammari d2843a8a86 Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version 6 years ago
Fatimah.Alshammari 7a30805e71 add arabic version + fix bugs 6 years ago
enadhilal 11dd7e56e4 fix profile in arabic and translate 6 years ago
umasoodch d26cea9024 fixed attendance and calendar issues 6 years ago
umasoodch 98eae4cc7f Merge branch 'master-newdesign' into myteam 6 years ago
umasoodch 536e8a9c5a handled multiple shifts and added slider. 6 years ago
Mohamed Mekawy c6409c4620 Merge branch 'home' into master-newdesign 6 years ago
enadhilal f82ac02174 Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version 6 years ago
enadhilal 10ec3c4ec8 fixing payslip in arabic version 6 years ago
Mohamed Mekawy 8f9ef27ee1 add my team to side menu & handle accural balance in absence page 6 years ago
Fatimah.Alshammari 25826f900d header translate and quick walkthrouh to test design and translate 6 years ago
ashwaq 4a0ca75f6d fix login 6 years ago
enadhilal 3eb8914986 Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version 6 years ago
enadhilal 785538983f adding translate and fixing desgin in worklist and myleave and ticket request 6 years ago
Fatimah.Alshammari 43bc72b9b8 update translate and fix design 6 years ago
Fatimah.Alshammari 5421842188 add pull 6 years ago
Mohamed Mekawy 0928d55171 edit home last login way 6 years ago
Fatimah.Alshammari 79feab44e3 design dynamic form and translate 6 years ago
Mohamed Mekawy cceb434cf4 merge master-newdesign 6 years ago
Mohamed Mekawy afed126eaf edit my team icon 6 years ago
enadhilal 3740606bd2 add translate and fix design in Home, worklist, myLeave and Ticket Request 6 years ago
Mohamed Mekawy 024ed04baf merge master-newdesign 6 years ago
Mohamed Mekawy b0b76cd5e0 add vacation rule icon 6 years ago
umasoodch 1aa290f627 fixed attendance issue 6 years ago
Mohamed Mekawy ae3a2e4995 merge master-newdesign 6 years ago
umasoodch f1157f48f6 fixed timecard module 6 years ago
Mohamed Mekawy 5557f7d3ba add vacation rule to service list 6 years ago
Mohamed Mekawy 8c55d3995a edit time input 6 years ago
Mohamed Mekawy c3339148ed fix my team request for employee list 6 years ago
Mohamed Mekawy 1f044cfb3e Merge branch 'master-newdesign' into work-list 6 years ago
Mohamed Mekawy 5d41967ed7 edit login token 6 years ago
umasoodch 7ed63baf68 added myteam navigation 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 fee59fb259 fix 6 years ago
ashwaq a4ad4e9d49 fix static value 6 years ago
ashwaq e7e9ec7b63 fix conflict 6 years ago
ashwaq 527ee02627 add get login last info 6 years ago
Mohamed Mekawy dd7cf45685 edit design 6 years ago
umasoodch 69ea2637d6 my-team attendance issues resolved 6 years ago
Mohamed Mekawy f781cd8eae Merge branch 'master-newdesign' into accural-balance 6 years ago
Mohamed Mekawy a694396f82 add click to status button & add icon to service buttons & fix issues 6 years ago
enadhilal 36c4bf322b add translate for header and fix the position back arrow in arabic version 6 years ago
Fatimah.Alshammari c1e72539de edit ticketbalance &absense home &payslip header 6 years ago
Mohamed Mekawy 08c8ea71b1 Merge branch 'master-newdesign' into home 6 years ago