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 |
Mohamed Mekawy
|
dd7cf45685
|
edit design
|
6 years ago |
umasoodch
|
a9128c93e2
|
completed my-team
|
6 years ago |
umasoodch
|
4bf4d4fc24
|
fixed merging conflicts
|
6 years ago |
enadhilal
|
b27f976bc9
|
push to merge with worklist work
|
6 years ago |
enadhilal
|
2f55272c91
|
new-time-card
|
6 years ago |
umasoodch
|
96971a6b68
|
resolved conflict issues with master branch
|
6 years ago |
umasoodch
|
9177721b59
|
completed worklist task
|
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
|
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 |
Fatimah.Alshammari
|
cb1aad91f9
|
edit side menue new design
|
6 years ago |
Mohamed Mekawy
|
a6fe8c183a
|
merdge dashbored services to new 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
|
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 |
Mohamed Mekawy
|
1555ad5c91
|
edit change password page
|
6 years ago |
Mohamed Mekawy
|
2a1ca91daa
|
OpenPayslip from dashboard
|
6 years ago |
Mohamed Mekawy
|
6d99285451
|
handle build error by removin backgroud location plugin
|
6 years ago |
Mohamed Mekawy
|
5c4377034f
|
enhance
|
6 years ago |
Mohamed Mekawy
|
c9e7e5a851
|
general enhancments
|
6 years ago |
enadhilal
|
0d05073e71
|
push Enad code workList page
|
6 years ago |
enadhilal
|
22f9a0ac56
|
update on workList page
|
6 years ago |
Mohamed Mekawy
|
7046c7fa43
|
edit my team & erp issues
|
6 years ago |
Mohamed Mekawy
|
2d03ed75f3
|
clean projest &will start phase 2
|
6 years ago |
Mohamed Mekawy
|
2117526e5f
|
my team enhancment
|
6 years ago |
haroon amjad
|
9b35e22a98
|
new Al Habib Mohemm App
|
6 years ago |
haroon amjad
|
8b6259723f
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/package.json
|
6 years ago |
haroon amjad
|
7288c37bcb
|
no message
|
6 years ago |
mohamed.mekawy
|
7034aef571
|
add barcode scanner
|
6 years ago |
mohamed.mekawy
|
ce88e72248
|
solve bugs
|
6 years ago |
haroon amjad
|
e15574f1a2
|
style changes
|
7 years ago |
haroon amjad
|
7fe2bef41e
|
EIT Form fixes ongoing
|
7 years ago |
haroon amjad
|
08f588c302
|
EIT Flow completed
|
7 years ago |
haroon amjad
|
700d871dca
|
EIT Forms implementation In-Progress
|
7 years ago |
haroon amjad
|
892082fb78
|
My Request Menu implemented
|
7 years ago |
ansariakhtar
|
d94be71a2b
|
Solving conflict
|
7 years ago |
ansariakhtar
|
66e33ed55f
|
Attendance
|
7 years ago |
mohamed.mekawy
|
075cf2a01f
|
configure app plugin
|
7 years ago |
mohamed.mekawy
|
92160a42f4
|
add google service and build configuration
|
7 years ago |
haroon amjad
|
c255bebef9
|
Vacation Rule Going on
|
7 years ago |
Sultan Khan
|
dc8a66b206
|
home page update
|
7 years ago |
Sultan Khan
|
c5bd2b5693
|
config added
|
7 years ago |
ansariakhtar
|
62f2cfcda3
|
Mohem Ionic 4 project created
|
7 years ago |