Commit Graph

76 Commits (a0f5beb4df50f5b80cfc1287a357f0519e19add3)

Author SHA1 Message Date
Sultan Khan a0f5beb4df update and change address, design updates 4 years ago
umasoodch 91791a2827 disabled button at home page 4 years ago
enadhilal 6dc48c5750 fix icon issue 5 years ago
enadhilal f692fe9d33 add announcement icon 5 years ago
Sultan Khan ca96419ca1 ui issues for all designs 5 years ago
Sultan Khan a9dcd3eb0b ERM Channel design 5 years ago
Sultan Khan df3abc660a new design added with worklist and others 5 years ago
umasoodch 965229d132 fixed worklist slider issue 5 years ago
umasoodch a813addd92 completed location for cloud solutions mohemm 5 years ago
Mohamed Mekawy 73099ddcc9 merge all branches 6 years ago
Fatimah.Alshammari 54f29cf345 fix issu 6 years ago
Fatimah.Alshammari 5a9c337dd6 fix issue 6 years ago
umasoodch 3fe4c73492 fixed prod issues 6 years ago
umasoodch 5784bead37 fixed prod issues 6 years ago
Salman Afzal 9ff40c0e1e fixed attendance issues ios and android 6 years ago
Mohamed Mekawy 997b7d3a88 Merge branch 'master-newdesign' into fatma-issu 6 years ago
Fatimah.Alshammari 4deaf4dc38 fix bugs 6 years ago
Fatimah.Alshammari bd0208919c fix bugs 6 years ago
enadhilal 0d83f70fde fixing rememberMy and remove user name and password text when click athor user 6 years ago
Mohamed Mekawy d42ba46ea2 edit side menu conflict 6 years ago
Mohamed Mekawy be27e4143d edit home vacation rule issue & my team side menu 6 years ago
umasoodch 88cabac92f fixed header and production build issues 6 years ago
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