Commit Graph

250 Commits (ae3a2e499566cbb06a60f5854b9b36e8d1d99b93)

Author SHA1 Message Date
umasoodch 7406d6f990 completed my-team except attendance one 6 years ago
Fatimah.Alshammari 2a71811ca2 edit monthley attendance 6 years ago
ashwaq 2c5c0599d8 fix conflict worklist 6 years ago
ashwaq 93f973022c fix conflict 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 93e59d2618 added about data for team member 6 years ago
umasoodch 6eeca7479d my team new design componentes created 6 years ago
umasoodch 5208584999 added worklist filters logic 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 f316629cb0 merge master-newdesign branch 6 years ago
Mohamed Mekawy 396241bc83 merge emp-profile branch 6 years ago
umasoodch 7bd0701d75 fixed design issues for attendance tracking 6 years ago
Fatimah.Alshammari afc8c99639 add new design to payslip 6 years ago
umasoodch 9177721b59 completed worklist task 6 years ago
Mohamed Mekawy 52d9e04dac merge master-newdesign with emp-profile 6 years ago
enadhilal a2acf0dcbd update monthly-attendance 6 years ago
Mohamed Mekawy 594e875156 add open time card function 6 years ago
Mohamed Mekawy a09bac4b6e Merge remote-tracking branch 'origin/timecard' into new-time-card 6 years ago
Fatimah.Alshammari b9e1a95601 Add new profile page & years of experience & Performance appraisal 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 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 9b58f9e9e0 add 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
umasoodch d1fbd34330 added logic for attendance 6 years ago
ashwaq 6d3dd907a6 fix attend-tracking 6 years ago
ashwaq 81504b0491 fix merge conflit 6 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
Mohamed Mekawy 5b7e435a31 fix login type issue 6 years ago
umasoodch a8f9640f68 added remaining services for dashboard 6 years ago
umasoodch ffc3bca0a6 added navigation at home page 6 years ago
umasoodch c7decd88a0 fixed home ts file 6 years ago
umasoodch 1c62b10486 merged master-newdesign with home branch and resolved all conflicts 6 years ago
umasoodch 11432b633e timer added according to the shift hours 6 years ago
umasoodch c955a19ae8 pushed timer code 6 years ago
ashwaq c069ae5282 Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into login 6 years ago
ashwaq f23d6e7bf4 fix login localstorge 6 years ago
Fatimah.Alshammari ab30d50808 Merge branch 'master-newdesign' into side-menu 6 years ago
Fatimah.Alshammari cb1aad91f9 edit side menue new design 6 years ago
ashwaq 7779a2ed61 fix conflict 6 years ago
Mohamed Mekawy e90be39807 edit code 6 years ago
ashwaq a670c06790 fix design 6 years ago
ashwaq e6642a29e8 fix conflit 6 years ago
Mohamed Mekawy 213648a9ed Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into Dashbored 6 years ago
ashwaq 335758fbd0 add login design 6 years ago
umasoodch 338205b305 Removed onw signal and added firebasex plugin 6 years ago
umasoodch 4c5153c69d Merge branch 'master' into firebasex 6 years ago
ashwaq bdab18c114 fix infiniteScroll payslip 6 years ago
ashwaq 8a4ab39623 fix infiniteScroll 6 years ago
ashwaq 1d9652ca4c Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq 31a3b0a823 fix my team load more 6 years ago
umasoodch 9218d02195 Merge branch 'master' into firebasex
# Conflicts:
#	Mohem/package.json
6 years ago
umasoodch 3c637df2d5 Merge branch 'master' into timecard 6 years ago
umasoodch 5c7a30f308 added firebase token instead of one signal 6 years ago
umasoodch 8dc3f5a57e Merge branch 'master' into timecard
# Conflicts:
#	Mohem/src/theme/styles.scss
6 years ago
umasoodch 976961e9ee completed time card module 6 years ago
Fatimah.Alshammari 13df9b7b75 add dachboard services 6 years ago
Fatimah.Alshammari d5407c8f90 add dachboard services 6 years ago
ashwaq 7456ab6e0a add dashbored services 6 years ago
ashwaq 4bdc08b42d add dashbored 6 years ago
Mohamed Mekawy 02e618c8bd Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
Mohamed Mekawy 1555ad5c91 edit change password page 6 years ago
ashwaq 10458f2e0f fix page P_PAGE_LIMIT 6 years ago
ashwaq 53746fc95f add infinite Scroll 6 years ago
umasoodch e01c73a092 completed functionality of time card module 6 years ago
Mohamed Mekawy 15b317b5ed call payslip on init 6 years ago
umasoodch 167973cedb added time card detail and its summary 6 years ago
ashwaq ee7ac90c18 fix conflict 6 years ago
ashwaq b02743ead1 PO+MO+PR+Payslip+customAccordin 6 years ago
Mohamed Mekawy ba0d53011b Add Time card & Edit date element & change icons 6 years ago
Mohamed Mekawy 2a1ca91daa OpenPayslip from dashboard 6 years ago
ashwaq fefdc5b8c3 PR no data 6 years ago
ashwaq 6407421ccd Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq a8457cc11e PR fix design 6 years ago
Mohamed Mekawy e59db729a7 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
Mohamed Mekawy 6d99285451 handle build error by removin backgroud location plugin 6 years ago
ashwaq 594a67cc96 fix Error 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
Mohamed Mekawy 5c4377034f enhance 6 years ago
Mohamed Mekawy c9e7e5a851 general enhancments 6 years ago
Ashwaq Hasan Jaafar 0b4a7090ae fix `Finger/FaceID login 6 years ago
enadhilal 0d05073e71 push Enad code workList page 6 years ago
enadhilal 22f9a0ac56 update on workList page 6 years ago
ashwaq 8cc0a3fff7 fix device token issue 6 years ago
ashwaq 2a75920565 Confirm Login by SMS,Whatsapp,fingerprint and faceID 6 years ago
Mohamed Mekawy 7f8a37897c Add Time card Module 6 years ago
ashwaq 53fe3813b0 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq 061c740c55 Add payslip + Fix vacation rule 6 years ago