Commit Graph

120 Commits (9d4bd2f59296554fda17d6ec6f2baf6d875c3406)

Author SHA1 Message Date
Mohamed Mekawy afed126eaf edit my team icon 6 years ago
Mohamed Mekawy 1f044cfb3e Merge branch 'master-newdesign' into work-list 6 years ago
Mohamed Mekawy 5d41967ed7 edit login token 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 a3109bc0a8 create and design ITG form 6 years ago
umasoodch a78477c192 fixed attendance tracking issue 6 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 6 years ago
enadhilal b27f976bc9 push to merge with worklist work 6 years ago
umasoodch 7406d6f990 completed my-team except attendance one 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
enadhilal 2f55272c91 new-time-card 6 years ago
umasoodch 96971a6b68 resolved conflict issues with master branch 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 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 2e6dd95004 completed work list ui part 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 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 81504b0491 fix merge conflit 6 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
umasoodch a8f9640f68 added remaining services for dashboard 6 years ago
ashwaq 7779a2ed61 fix conflict 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 5c7a30f308 added firebase token instead of one signal 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
umasoodch e01c73a092 completed functionality of time card module 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