 umasoodch
|
bf317e7274
|
fixed merged issues with master-newdesign
|
7 years ago |
|
umasoodch
|
b3fae94a1c
|
MM-96
MM-95 issues fixed
|
7 years ago |
Mohamed Mekawy
|
0c0cffb75e
|
edit payslip
|
7 years ago |
|
umasoodch
|
cb67e2670a
|
issues resolved
|
7 years ago |
ashwaq
|
021e53da26
|
fix worlist
|
7 years ago |
|
ashwaq
|
ffc298d123
|
fix conflict worlist
|
7 years ago |
|
umasoodch
|
d6dc300cf6
|
Merge branch 'master-newdesign' into work-list
|
7 years ago |
|
Mohamed Mekawy
|
97525a2854
|
Merge branch 'master-newdesign' into my-requests
|
7 years ago |
|
ashwaq
|
929844d1ef
|
fix worklist issue
|
7 years ago |
Fatimah.Alshammari
|
0871a67480
|
all conflicting issues are resolved
|
7 years ago |
|
umasoodch
|
b9f22f4eef
|
Merge branch 'master-newdesign' into work-list
|
7 years ago |
|
umasoodch
|
68357f35b2
|
fixed worklist flow
|
7 years ago |
enadhilal
|
8d1ad091e9
|
add image and fix text and chaneg the BG color for any page did not have data
|
7 years ago |
|
enadhilal
|
11dd7e56e4
|
fix profile in arabic and translate
|
7 years ago |
|
umasoodch
|
d26cea9024
|
fixed attendance and calendar issues
|
7 years ago |
|
umasoodch
|
536e8a9c5a
|
handled multiple shifts and added slider.
|
7 years ago |
|
Fatimah.Alshammari
|
5421842188
|
add pull
|
7 years ago |
|
Mohamed Mekawy
|
0928d55171
|
edit home last login way
|
7 years ago |
|
Fatimah.Alshammari
|
79feab44e3
|
design dynamic form and translate
|
7 years ago |
|
Mohamed Mekawy
|
cceb434cf4
|
merge master-newdesign
|
7 years ago |
|
enadhilal
|
3740606bd2
|
add translate and fix design in Home, worklist, myLeave and Ticket Request
|
7 years ago |
|
Mohamed Mekawy
|
ae3a2e4995
|
merge master-newdesign
|
7 years ago |
|
Mohamed Mekawy
|
1f044cfb3e
|
Merge branch 'master-newdesign' into work-list
|
7 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
|
7 years ago |
|
ashwaq
|
e7e9ec7b63
|
fix conflict
|
7 years ago |
|
ashwaq
|
527ee02627
|
add get login last info
|
7 years ago |
|
umasoodch
|
69ea2637d6
|
my-team attendance issues resolved
|
7 years ago |
|
Mohamed Mekawy
|
5fcde27564
|
merge master-newdesign
|
7 years ago |
|
ashwaq
|
18dabcb13e
|
add vacation rule
|
7 years ago |
|
Mohamed Mekawy
|
d1d3a307b7
|
finish replacement modal
|
7 years ago |
|
Mohamed Mekawy
|
2ee9d51f7e
|
finish Eit new design
|
7 years ago |
|
enadhilal
|
a3109bc0a8
|
create and design ITG form
|
7 years ago |
|
Mohamed Mekawy
|
4d6167d6e8
|
finish confirmation page
|
7 years ago |
|
Mohamed Mekawy
|
2b5265243e
|
add history&RequestPage
|
7 years ago |
|
umasoodch
|
4bf4d4fc24
|
fixed merging conflicts
|
7 years ago |
|
Fatimah.Alshammari
|
32e33e655b
|
edit style
|
7 years ago |
|
Fatimah.Alshammari
|
2a71811ca2
|
edit monthley attendance
|
7 years ago |
|
ashwaq
|
838e7cf99b
|
add worklist+ fix conflict
|
7 years ago |
|
ashwaq
|
eb9413edb9
|
add worklist fix conflict
|
7 years ago |
|
ashwaq
|
ece6e45d97
|
add worklist new design
|
7 years ago |
|
umasoodch
|
6eeca7479d
|
my team new design componentes created
|
7 years ago |
|
enadhilal
|
2f55272c91
|
new-time-card
|
7 years ago |
|
umasoodch
|
7bd0701d75
|
fixed design issues for attendance tracking
|
7 years ago |
|
enadhilal
|
a2acf0dcbd
|
update monthly-attendance
|
7 years ago |
|
enadhilal
|
f3fdc1454f
|
monthly-attendance design
|
7 years ago |
|
umasoodch
|
d2fac5c4d5
|
added header for worklist
|
7 years ago |
|
umasoodch
|
e629aab07a
|
merged and fixed all the conflicting issues and also removed unnecessary code
|
7 years ago |
|
umasoodch
|
86e96c11d0
|
added search modal and its CSS
|
7 years ago |
|
umasoodch
|
2e6dd95004
|
completed work list ui part
|
7 years ago |
|
umasoodch
|
ecbdf62c74
|
merged and resolved conflicts
|
7 years ago |