Commit Graph

54 Commits (8e6c0b18ad08323cd2d1e11a9a690ead0dfe80db)

Author SHA1 Message Date
umasoodch bcf8443157 fixed header issue in application 6 years ago
umasoodch bf317e7274 fixed merged issues with master-newdesign 6 years ago
umasoodch e7d476fc2e fixed MM-139 MM-134 MM-123 MM-47 6 years ago
umasoodch fcbeae462e fixed MM-134 6 years ago
Fatimah.Alshammari 0871a67480 all conflicting issues are resolved 6 years ago
enadhilal 11dd7e56e4 fix profile in arabic and translate 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
Mohamed Mekawy cceb434cf4 merge master-newdesign 6 years ago
Mohamed Mekawy afed126eaf edit my team icon 6 years ago
Mohamed Mekawy 024ed04baf merge master-newdesign 6 years ago
Mohamed Mekawy b0b76cd5e0 add vacation rule icon 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 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
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
ashwaq 18dabcb13e add vacation rule 6 years ago
umasoodch a78477c192 fixed attendance tracking issue 6 years ago
umasoodch 6eeca7479d my team new design componentes created 6 years ago
umasoodch d2fac5c4d5 added header for worklist 6 years ago
umasoodch f7002f3eae completed dashboard and attendance timer work 6 years ago
umasoodch dcf6bd5d79 no message 6 years ago
umasoodch d1fbd34330 added logic for attendance 6 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
umasoodch ffc3bca0a6 added navigation at home page 6 years ago
umasoodch 11432b633e timer added according to the shift hours 6 years ago
umasoodch c955a19ae8 pushed timer code 6 years ago
umasoodch 338205b305 Removed onw signal and added firebasex plugin 6 years ago
Mohamed Mekawy 2a1ca91daa OpenPayslip from dashboard 6 years ago
enadhilal 22f9a0ac56 update on workList page 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
mohamed.mekawy ad56814966 fix notification & home 6 years ago
haroon amjad 9b35e22a98 new Al Habib Mohemm App 6 years ago
Sultan Khan 3327ad4d29 notification added 7 years ago
haroon amjad 3b5da38b09 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/src/app/app-routing.module.ts
#	Mohem/src/assets/localization/i18n.json
7 years ago
haroon amjad c255bebef9 Vacation Rule Going on 7 years ago
Sultan Khan c63489d935 profile page added 7 years ago
Sultan Khan e083d0c783 dashboard changes 7 years ago
haroon amjad 7609feb6ae Merge branches 'master' and 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/src/assets/localization/i18n.json
7 years ago
Sultan Khan 0bf7dbd72e dashboard update 7 years ago
haroon amjad b5f3b6f767 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/src/app/home/home.page.ts
#	Mohem/src/assets/localization/i18n.json
7 years ago
Sultan Khan b967536b26 update home 7 years ago