umasoodch
|
06f7cfa0fa
|
MM-280
MM-160
MM-202
|
6 years ago |
umasoodch
|
f44ddb6931
|
added generic header throughout the application
|
6 years ago |
Mohamed Mekawy
|
25799a7c78
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
e191b21e44
|
fix issues
|
6 years ago |
ashwaq
|
c7eb6c97a2
|
fix merge ashwaq issue + work-list branch
|
6 years ago |
ashwaq
|
18f54941ee
|
fix update/continue notification + action name
|
6 years ago |
ashwaq
|
5aeab4b08c
|
add MO item History
|
6 years ago |
ashwaq
|
2397fc1482
|
fix bug
|
6 years ago |
Mohamed Mekawy
|
289e5f1452
|
enhance login
|
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 |
enadhilal
|
a3109bc0a8
|
create and design ITG form
|
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 |
umasoodch
|
96971a6b68
|
resolved conflict issues with master branch
|
6 years ago |
Mohamed Mekawy
|
52d9e04dac
|
merge master-newdesign with emp-profile
|
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 |
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 |
ashwaq
|
5df30f114b
|
add attend-tracking
|
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
|
b02743ead1
|
PO+MO+PR+Payslip+customAccordin
|
6 years ago |
ashwaq
|
524b29193a
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
6 years ago |
ashwaq
|
d09d251c71
|
PR Worklist
|
6 years ago |
enadhilal
|
0d05073e71
|
push Enad code workList page
|
6 years ago |
enadhilal
|
22f9a0ac56
|
update on workList page
|
6 years ago |
ashwaq
|
2a75920565
|
Confirm Login by SMS,Whatsapp,fingerprint and faceID
|
6 years ago |
ashwaq
|
53fe3813b0
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
6 years ago |
ashwaq
|
061c740c55
|
Add payslip + Fix vacation rule
|
6 years ago |
Mohamed Mekawy
|
7046c7fa43
|
edit my team & erp issues
|
6 years ago |
Mohamed Mekawy
|
17246a58b8
|
add PO & MO & PR
|
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 |
mohamed.mekawy
|
ad56814966
|
fix notification & home
|
6 years ago |
mohamed.mekawy
|
ce88e72248
|
solve bugs
|
6 years ago |
haroon amjad
|
22a11a3214
|
My Subordinate Page implemented
|
7 years ago |
haroon amjad
|
7af8b9c791
|
My Specialist Page Implemented
|
7 years ago |
Sultan Khan
|
3327ad4d29
|
notification added
|
7 years ago |
Sultan Khan
|
a87afe1d8e
|
worklist main page update
|
7 years ago |
haroon amjad
|
f07de65e5c
|
work list replacement component implemented
|
7 years ago |