umasoodch
|
bcf8443157
|
fixed header issue in application
|
6 years ago |
umasoodch
|
d31b76bc44
|
fixed all issues while making prod build
|
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 |
umasoodch
|
05ea5e349f
|
fixed tslint issues
|
6 years ago |
umasoodch
|
a9128c93e2
|
completed my-team
|
6 years ago |
umasoodch
|
4bf4d4fc24
|
fixed merging conflicts
|
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 |
enadhilal
|
2f55272c91
|
new-time-card
|
6 years ago |
umasoodch
|
96971a6b68
|
resolved conflict issues with master branch
|
6 years ago |
Mohamed Mekawy
|
f316629cb0
|
merge master-newdesign 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 |
enadhilal
|
f3fdc1454f
|
monthly-attendance design
|
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
|
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
|
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 |
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
|
7779a2ed61
|
fix conflict
|
6 years ago |
ashwaq
|
335758fbd0
|
add login design
|
6 years ago |
ashwaq
|
4bdc08b42d
|
add dashbored
|
6 years ago |
ashwaq
|
b02743ead1
|
PO+MO+PR+Payslip+customAccordin
|
6 years ago |
Mohamed Mekawy
|
6d99285451
|
handle build error by removin backgroud location plugin
|
6 years ago |
ashwaq
|
1db1a031ba
|
fix conflict
|
6 years ago |
ashwaq
|
c52ee53b99
|
change profile Image
|
6 years ago |
Mohamed Mekawy
|
2d03ed75f3
|
clean projest &will start phase 2
|
6 years ago |
Mohamed Mekawy
|
2117526e5f
|
my team enhancment
|
6 years ago |
Sultan Khan
|
8b5436ced6
|
notification page
|
7 years ago |
Sultan Khan
|
ef0c8a7b8a
|
absence update
|
7 years ago |
Sultan Khan
|
dc8a66b206
|
home page update
|
7 years ago |
Sultan Khan
|
b967536b26
|
update home
|
7 years ago |
Sultan Khan
|
48a4360ac1
|
application skeleton
|
7 years ago |