umasoodch
|
d4dccd6dff
|
fixed basic details issue
|
5 years ago |
Sultan Khan
|
7671eb7f14
|
design and address
|
5 years ago |
umasoodch
|
86f8a25bee
|
Merge branch 'sultan26April' into umar-q2-branch
# Conflicts:
# Mohem/src/app/profile/home/home.component.html
# Mohem/src/app/profile/home/home.component.ts
# Mohem/src/app/profile/profile.module.ts
# Mohem/src/app/profile/service/profile.service.ts
|
5 years ago |
umasoodch
|
7b75303583
|
added logic for eit basic details
|
5 years ago |
Sultan Khan
|
9e509e143f
|
user profile
|
5 years ago |
umasoodch
|
aa8d2e3d85
|
commited my profile code
|
5 years ago |
Fatimah Alshammari
|
ab0f37ca12
|
fixed issues in mowdafi HR
|
5 years ago |
Fatimah Alshammari
|
22afd6fb15
|
Merge branch 'MOHEMM-Q2-DEV' into Fatima-Q2-June
# Conflicts:
# Mohem/src/app/app-routing.module.ts
|
5 years ago |
Fatimah Alshammari
|
68371b371a
|
fixed mowadhafi
|
5 years ago |
Sultan Khan
|
977be243ce
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
a9dcd3eb0b
|
ERM Channel design
|
5 years ago |
enadhilal
|
512465964d
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
enadhilal
|
5e7f7a6c9c
|
added backend integrations module
|
5 years ago |
Fatimah Alshammari
|
6f7bd0847b
|
fixed conflicts
|
5 years ago |
enadhilal
|
57467ea800
|
Item Creation page added
|
5 years ago |
umasoodch
|
33d55363bb
|
Merge branch 'mohemm-wifi-feature' into ZohaibIqbalKambrani
# Conflicts:
# Mohem/package-lock.json
|
5 years ago |
Zohaib Iqbal Kambrani
|
7ee282c9fc
|
no message
|
5 years ago |
umasoodch
|
c6ee3e798c
|
fixed worklist and icon issue. Also removed unused plugins.
|
5 years ago |
umasoodch
|
b9e58a3739
|
deleted unused code
|
5 years ago |
umasoodch
|
b7fc960ce7
|
completed NFC for CS Mohemm
|
5 years ago |
ashwaq
|
0f84f35d5a
|
fix sms text, RFC Empty,Notifi-P_information
|
6 years ago |
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 |