Commit Graph

63 Commits (98eae4cc7fe5b0727010c712741e04b7a65720c8)

Author SHA1 Message Date
umasoodch 536e8a9c5a handled multiple shifts and added slider. 6 years ago
Mohamed Mekawy 0928d55171 edit home last login way 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
Mohamed Mekawy 5fcde27564 merge master-newdesign 6 years ago
ashwaq 18dabcb13e add vacation rule 6 years ago
Mohamed Mekawy d1d3a307b7 finish replacement modal 6 years ago
Mohamed Mekawy 2ee9d51f7e finish Eit new design 6 years ago
Mohamed Mekawy 2b5265243e add history&RequestPage 6 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 6 years ago
Fatimah.Alshammari 32e33e655b edit style 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 6eeca7479d my team new design componentes created 6 years ago
enadhilal 2f55272c91 new-time-card 6 years ago
umasoodch 7bd0701d75 fixed design issues for attendance tracking 6 years ago
enadhilal a2acf0dcbd update monthly-attendance 6 years ago
enadhilal f3fdc1454f monthly-attendance design 6 years ago
umasoodch d2fac5c4d5 added header for worklist 6 years ago
umasoodch e629aab07a merged and fixed all the conflicting issues and also removed unnecessary code 6 years ago
umasoodch 86e96c11d0 added search modal and its CSS 6 years ago
umasoodch 2e6dd95004 completed work list ui part 6 years ago
umasoodch ecbdf62c74 merged and resolved conflicts 6 years ago
umasoodch dcf6bd5d79 no message 6 years ago
ashwaq 4fe49bdb18 add attend scan service + fix design alert 6 years ago
umasoodch 884e518971 Merge branch 'master-newdesign' into home
# Conflicts:
#	Mohem/src/app/hmg-common/hmg-common.module.ts
6 years ago
ashwaq 81504b0491 fix merge conflit 6 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
umasoodch c955a19ae8 pushed timer code 6 years ago
ashwaq a670c06790 fix 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 20de05a7b4 PR Part 2 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 22f9a0ac56 update on workList page 6 years ago
Mohamed Mekawy 2117526e5f my team enhancment 6 years ago
mohamed.mekawy ce88e72248 solve bugs 6 years ago
haroon amjad e15574f1a2 style changes 7 years ago
haroon amjad 31af06d2c9 Worklist Main Page Changes 7 years ago
Sultan Khan faad878c87 worklist main page added 7 years ago
Sultan Khan ef0c8a7b8a absence update 7 years ago