Mohamed Mekawy
|
f316629cb0
|
merge master-newdesign branch
|
6 years ago |
Mohamed Mekawy
|
396241bc83
|
merge emp-profile branch
|
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 |
Fatimah.Alshammari
|
b9e1a95601
|
Add new profile page & years of experience & Performance appraisal
|
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
|
a6fe8c183a
|
merdge dashbored services to new design
|
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
|
fd663493e6
|
fixed plugin firebase issue
|
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
|
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 |
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 |