Commit Graph

199 Commits (eb4f064ca714f5fa5f0b7159634d0909bb959a9a)

Author SHA1 Message Date
Zohaib Iqbal Kambrani e67ade154f Mohemm Wifi Attendance, Fix 5 years ago
Zohaib Iqbal Kambrani 95d608fca8 Wifi Attendance 5 years ago
Zohaib Iqbal Kambrani 424d02c9e1 no message 5 years ago
umasoodch 2c99326146 fixed css issues at worklist page 5 years ago
umasoodch 965229d132 fixed worklist slider issue 5 years ago
umasoodch 077538efe5 fixed nfc issues 5 years ago
umasoodch 1424c27008 added changes for NFC 5 years ago
haroon amjad 1f3fd3d032 fixed ios issue for nfc 5 years ago
umasoodch b7fc960ce7 completed NFC for CS Mohemm 5 years ago
umasoodch e4525ea728 fixed timer issue login forgot password disable issue and handled version issue 5 years ago
umasoodch e1a2a9840f fixed location issue for ios and separated code for 5 years ago
umasoodch a813addd92 completed location for cloud solutions mohemm 5 years ago
umasoodch 85b5416703 added backgroundgeo location 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 561428ee62 fixed timer issues 6 years ago
Salman Afzal 9ff40c0e1e fixed attendance issues ios and android 6 years ago
umasoodch 39ade4effe fixed refresh issue 6 years ago
umasoodch 06226c89e7 fixed issues 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
Mohamed Mekawy 8e6c0b18ad merge master-newdesign 6 years ago
Mohamed Mekawy 27561b686d edit header css 6 years ago
umasoodch df9a283100 fixed conflicts 6 years ago
umasoodch bcf8443157 fixed header issue in application 6 years ago
Mohamed Mekawy e191b21e44 fix issues 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
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
Mohamed Mekawy 97525a2854 Merge branch 'master-newdesign' into my-requests 6 years ago
Mohamed Mekawy 3651f5a04a edit math floor 6 years ago
Fatimah.Alshammari 0871a67480 all conflicting issues are resolved 6 years ago
Mohamed Mekawy 215084f797 edit payment info & employee profile update 6 years ago
enadhilal 8d1ad091e9 add image and fix text and chaneg the BG color for any page did not have data 6 years ago
Fatimah.Alshammari d2843a8a86 Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version 6 years ago
Fatimah.Alshammari 7a30805e71 add arabic version + fix bugs 6 years ago
enadhilal 11dd7e56e4 fix profile in arabic and translate 6 years ago
Mohamed Mekawy c6409c4620 Merge branch 'home' into master-newdesign 6 years ago
enadhilal f82ac02174 Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version 6 years ago
enadhilal 10ec3c4ec8 fixing payslip in arabic version 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
ashwaq 4a0ca75f6d fix login 6 years ago
Mohamed Mekawy cceb434cf4 merge master-newdesign 6 years ago
Mohamed Mekawy afed126eaf edit my team icon 6 years ago
enadhilal 3740606bd2 add translate and fix design in Home, worklist, myLeave and Ticket Request 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 c3339148ed fix my team request for employee list 6 years ago
Mohamed Mekawy 1f044cfb3e Merge branch 'master-newdesign' into work-list 6 years ago
umasoodch 7ed63baf68 added myteam navigation 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
Mohamed Mekawy 08c8ea71b1 Merge branch 'master-newdesign' into home 6 years ago
Mohamed Mekawy 05387d81d4 merge master-newdesign 6 years ago
Fatimah.Alshammari d2940a70d0 add ticket balance 6 years ago
Mohamed Mekawy c37d469ea7 add new design for EIT & Absence subpage 6 years ago
ashwaq 18dabcb13e add vacation rule 6 years ago
Fatimah.Alshammari e71dd383da finish leave balance chart 6 years ago
umasoodch bf825662a9 fixed attendance tracking and removed unnecessary code 6 years ago
enadhilal a3109bc0a8 create and design ITG form 6 years ago
umasoodch 7ecc3e5048 removed unnecessary code 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
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
umasoodch 09afc19dbb fixed multiple swipe alert issue 6 years ago
Mohamed Mekawy 396241bc83 merge emp-profile branch 6 years ago
umasoodch 7bd0701d75 fixed design issues for attendance tracking 6 years ago
umasoodch 9177721b59 completed worklist task 6 years ago
Mohamed Mekawy 594e875156 add open time card function 6 years ago
enadhilal f3fdc1454f monthly-attendance design 6 years ago
umasoodch d2fac5c4d5 added header for worklist 6 years ago
umasoodch f7002f3eae completed dashboard and attendance timer work 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 d1fbd34330 added logic for attendance 6 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
umasoodch a8f9640f68 added remaining services for dashboard 6 years ago
umasoodch ffc3bca0a6 added navigation at home page 6 years ago