Commit Graph

250 Commits (ae3a2e499566cbb06a60f5854b9b36e8d1d99b93)

Author SHA1 Message Date
Mohamed Mekawy ae3a2e4995 merge master-newdesign 7 years ago
Mohamed Mekawy 5557f7d3ba add vacation rule to service list 7 years ago
Mohamed Mekawy 8c55d3995a edit time input 7 years ago
Mohamed Mekawy c3339148ed fix my team request for employee list 7 years ago
Mohamed Mekawy 1f044cfb3e Merge branch 'master-newdesign' into work-list 7 years ago
Mohamed Mekawy 5d41967ed7 edit login token 7 years ago
umasoodch 7ed63baf68 added myteam navigation 7 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
7 years ago
ashwaq fee59fb259 fix 7 years ago
ashwaq a4ad4e9d49 fix static value 7 years ago
ashwaq e7e9ec7b63 fix conflict 7 years ago
ashwaq 527ee02627 add get login last info 7 years ago
Mohamed Mekawy dd7cf45685 edit design 7 years ago
umasoodch 69ea2637d6 my-team attendance issues resolved 7 years ago
Mohamed Mekawy f781cd8eae Merge branch 'master-newdesign' into accural-balance 7 years ago
Mohamed Mekawy a694396f82 add click to status button & add icon to service buttons & fix issues 7 years ago
Fatimah.Alshammari c1e72539de edit ticketbalance &absense home &payslip header 7 years ago
Mohamed Mekawy 08c8ea71b1 Merge branch 'master-newdesign' into home 7 years ago
Mohamed Mekawy 05387d81d4 merge master-newdesign 7 years ago
Mohamed Mekawy 70fd9e5ebc edit ticket balance design 7 years ago
Mohamed Mekawy 5fcde27564 merge master-newdesign 7 years ago
Fatimah.Alshammari d2940a70d0 add ticket balance 7 years ago
Mohamed Mekawy c37d469ea7 add new design for EIT & Absence subpage 7 years ago
ashwaq 18dabcb13e add vacation rule 7 years ago
enadhilal 1f50906684 make segment active when first open & fixing skip function 7 years ago
Fatimah.Alshammari e71dd383da finish leave balance chart 7 years ago
umasoodch bf825662a9 fixed attendance tracking and removed unnecessary code 7 years ago
Mohamed Mekawy d1d3a307b7 finish replacement modal 7 years ago
umasoodch 05ea5e349f fixed tslint issues 7 years ago
umasoodch 8f83946c48 Merge branch 'itg-new-design' into work-list
# Conflicts:
#	Mohem/src/app/notification/home/home.component.html
#	Mohem/src/app/notification/home/home.component.scss
#	Mohem/src/app/notification/home/home.component.ts
7 years ago
umasoodch 0e17984b20 fixed conflict issues 7 years ago
umasoodch 14e1c27591 added item-type in search 7 years ago
Fatimah.Alshammari e37311f726 edit translation 7 years ago
Mohamed Mekawy 6385c93e56 edit background color 7 years ago
Mohamed Mekawy e3cdfa31eb finish submit absence request 7 years ago
Mohamed Mekawy 721066c859 finish absence history page 7 years ago
Mohamed Mekawy 69db29931f finish absence confirmation page & add absence submit modal 7 years ago
Mohamed Mekawy 2ee9d51f7e finish Eit new design 7 years ago
enadhilal a3109bc0a8 create and design ITG form 7 years ago
Mohamed Mekawy 4d6167d6e8 finish confirmation page 7 years ago
umasoodch 55f5b391e1 Merge branch 'new-time-card' into myteam 7 years ago
umasoodch 7ecc3e5048 removed unnecessary code 7 years ago
Fatimah.Alshammari 573941941f edit monthly attendance 7 years ago
umasoodch a78477c192 fixed attendance tracking issue 7 years ago
Mohamed Mekawy c85a5ef82a design confirmation page 7 years ago
Mohamed Mekawy 2b5265243e add history&RequestPage 7 years ago
umasoodch a9128c93e2 completed my-team 7 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 7 years ago
enadhilal b27f976bc9 push to merge with worklist work 7 years ago
Fatimah.Alshammari 32e33e655b edit style 7 years ago