Commit Graph

190 Commits (05647d71efe3c3ebe13c842ec7d7f9cf67613e8d)

Author SHA1 Message Date
Mohamed Mekawy 68fff95219 Merge branch 'master-newdesign' into ashwaq-fix-bug 6 years ago
Mohamed Mekawy 997b7d3a88 Merge branch 'master-newdesign' into fatma-issu 6 years ago
Fatimah.Alshammari 4deaf4dc38 fix bugs 6 years ago
ashwaq aca37f628f inhacment 6 years ago
Fatimah.Alshammari bd0208919c fix bugs 6 years ago
ashwaq 30ba667bb4 fix VR select , txt confirm, type last login 6 years ago
enadhilal 432c95ab1b fix placeholder and lang issue 6 years ago
Mohamed Mekawy a928d525bc merge master-newdesign 6 years ago
Mohamed Mekawy 3139188e00 Merge branch 'master-newdesign' into ashwaq-fix-bug 6 years ago
Mohamed Mekawy 41472e61a3 merge master-newdesign 6 years ago
enadhilal 3a64980a69 fix app direction and itg all segment 6 years ago
umasoodch df50c472a0 Fixed MM-227 6 years ago
enadhilal 3b3d06ea8a fixing attachment bug and translator issues 6 years ago
enadhilal 3f24fa63a7 fixing attachment bug and translator issues 6 years ago
ashwaq a3281cb7e9 fix tranlate in work list 6 years ago
Fatimah.Alshammari d4fdf76d18 Merge branch 'fatma-issu' of https://hmg.git.cloudforge.com/mohemmionic5 into fatma-issu 6 years ago
Fatimah.Alshammari d74b491dd9 Fix issu 6 years ago
ashwaq 788b3bfb6e fix pr load more + missing AMU 6 years ago
ashwaq d706ece7b6 fix 6 years ago
Mohamed Mekawy 7d8927c1cf merge master-newdesign 6 years ago
Mohamed Mekawy a3300453d9 merge master-newdesign 6 years ago
Mohamed Mekawy 25799a7c78 merge master-newdesign 6 years ago
Fatimah.Alshammari 0a0c583053 fix bugs 6 years ago
enadhilal 7c4d3327d6 fixing menu and scrolling in EIT 6 years ago
Fatimah.Alshammari 35781357d3 merge master-newdesign 6 years ago
Fatimah.Alshammari 043b57383b edit issues 6 years ago
ashwaq c7eb6c97a2 fix merge ashwaq issue + work-list branch 6 years ago
Fatimah.Alshammari 7c17cb0913 add fix bug 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
ashwaq 5aeab4b08c add MO item History 6 years ago
Fatimah.Alshammari 821811c8e2 edit worklist main page 6 years ago
umasoodch cb67e2670a issues resolved 6 years ago
Fatimah.Alshammari 0052bb98ff merge master-newdesign 6 years ago
Fatimah.Alshammari 0871a67480 all conflicting issues are resolved 6 years ago
Fatimah.Alshammari dc1749e48e edit performance appraisal 6 years ago
Fatimah.Alshammari 80ab9a5c80 general 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 7a30805e71 add arabic version + fix bugs 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
enadhilal 3740606bd2 add translate and fix design in Home, worklist, myLeave and Ticket Request 6 years ago
Mohamed Mekawy b0b76cd5e0 add vacation rule icon 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
enadhilal 36c4bf322b add translate for header and fix the position back arrow in arabic version 6 years ago
Mohamed Mekawy 05387d81d4 merge master-newdesign 6 years ago
Mohamed Mekawy 5fcde27564 merge master-newdesign 6 years ago
Fatimah.Alshammari d2940a70d0 add ticket balance 6 years ago
ashwaq 18dabcb13e add vacation rule 6 years ago
Fatimah.Alshammari e71dd383da finish leave balance chart 6 years ago
Mohamed Mekawy d1d3a307b7 finish replacement modal 6 years ago
umasoodch 0e17984b20 fixed conflict issues 6 years ago
Fatimah.Alshammari e37311f726 edit translation 6 years ago
enadhilal a3109bc0a8 create and design ITG form 6 years ago
umasoodch 55f5b391e1 Merge branch 'new-time-card' into myteam 6 years ago
Fatimah.Alshammari 573941941f edit monthly attendance 6 years ago
Mohamed Mekawy c85a5ef82a design confirmation page 6 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 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
umasoodch 96971a6b68 resolved conflict issues with master branch 6 years ago
Mohamed Mekawy f316629cb0 merge master-newdesign 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
Mohamed Mekawy 52d9e04dac merge master-newdesign with emp-profile 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
umasoodch dcf6bd5d79 no message 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 1c62b10486 merged master-newdesign with home branch and resolved all conflicts 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
Fatimah.Alshammari cb1aad91f9 edit side menue new design 6 years ago
ashwaq 335758fbd0 add login design 6 years ago
umasoodch 8dc3f5a57e Merge branch 'master' into timecard
# Conflicts:
#	Mohem/src/theme/styles.scss
6 years ago
ashwaq 53746fc95f add infinite Scroll 6 years ago
umasoodch 167973cedb added time card detail and its summary 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 0d05073e71 push Enad code workList page 6 years ago
enadhilal 22f9a0ac56 update on workList page 6 years ago
ashwaq 2a75920565 Confirm Login by SMS,Whatsapp,fingerprint and faceID 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