Commit Graph

163 Commits (a0e265ba550a4baab02eceba5e138cf08c3efe21)

Author SHA1 Message Date
ashwaq a0e265ba55 fix merge 6 years ago
ashwaq 18f54941ee fix update/continue notification + action name 6 years ago
Mohamed Mekawy 0c0cffb75e edit payslip 6 years ago
umasoodch ab2ace51b9 MM-112 FIXED - worklist and home loader issue resolved 6 years ago
umasoodch cb67e2670a issues resolved 6 years ago
umasoodch d6dc300cf6 Merge branch 'master-newdesign' into work-list 6 years ago
Mohamed Mekawy 289e5f1452 enhance login 6 years ago
Fatimah.Alshammari 0052bb98ff merge master-newdesign 6 years ago
ashwaq 9d4bd2f592 fix login conflict 6 years ago
ashwaq 14e2654ae4 fix login 6 years ago
Fatimah.Alshammari 0871a67480 all conflicting issues are resolved 6 years ago
Fatimah.Alshammari 80ab9a5c80 general 6 years ago
umasoodch b9f22f4eef Merge branch 'master-newdesign' into work-list 6 years ago
umasoodch 68357f35b2 fixed worklist flow 6 years ago
Fatimah.Alshammari 7a30805e71 add arabic version + fix bugs 6 years ago
umasoodch d26cea9024 fixed attendance and calendar issues 6 years ago
umasoodch 536e8a9c5a handled multiple shifts and added slider. 6 years ago
Fatimah.Alshammari 25826f900d header translate and quick walkthrouh to test design and translate 6 years ago
Mohamed Mekawy 0928d55171 edit home last login way 6 years ago
Mohamed Mekawy afed126eaf edit my team icon 6 years ago
Mohamed Mekawy 024ed04baf merge master-newdesign 6 years ago
Mohamed Mekawy ae3a2e4995 merge master-newdesign 6 years ago
umasoodch f1157f48f6 fixed timecard module 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 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
Mohamed Mekawy a694396f82 add click to status button & add icon to service buttons & fix issues 6 years ago
ashwaq 18dabcb13e add vacation rule 6 years ago
umasoodch 05ea5e349f fixed tslint issues 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 a78477c192 fixed attendance tracking issue 6 years ago
umasoodch a9128c93e2 completed my-team 6 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 6 years ago
enadhilal b27f976bc9 push to merge with worklist work 6 years ago
umasoodch 7406d6f990 completed my-team except attendance one 6 years ago
Fatimah.Alshammari 2a71811ca2 edit monthley attendance 6 years ago
ashwaq 93f973022c fix conflict 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 93e59d2618 added about data for team member 6 years ago
umasoodch 6eeca7479d my team new design componentes created 6 years ago
enadhilal 2f55272c91 new-time-card 6 years ago
umasoodch 96971a6b68 resolved conflict issues with master branch 6 years ago
Mohamed Mekawy f316629cb0 merge master-newdesign branch 6 years ago