enadhilal
|
a0ad116530
|
fixing My-Team and Hr-Request pages design
|
4 years ago |
umasoodch
|
2a898aa80d
|
fixed dropdown css issue
|
4 years ago |
umasoodch
|
dc60f42e73
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
4 years ago |
umasoodch
|
160a7437be
|
fixed empty array issue
|
4 years ago |
enadhilal
|
0242d2a6ca
|
design issue
|
4 years ago |
umasoodch
|
59b08a15b2
|
fixed firestore issues
|
4 years ago |
umasoodch
|
7c45935cb5
|
added firestore check in attendance
|
4 years ago |
haroon amjad
|
f326278951
|
fixed css ios issues
|
4 years ago |
umasoodch
|
6eca298b99
|
fixed typo in wifi
|
4 years ago |
umasoodch
|
cee1d0e6c2
|
fixed wifi issue
|
4 years ago |
haroon amjad
|
eb12d1672b
|
fixed ios issues
|
4 years ago |
umasoodch
|
b7767be9a1
|
fixed tracking firestore issue
|
4 years ago |
umasoodch
|
5f0ca11547
|
changed server URL
|
5 years ago |
umasoodch
|
e400a02c5c
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
# Conflicts:
# Mohem/src/app/my-team/details/details.component.html
|
5 years ago |
umasoodch
|
2833749d2f
|
fixed qa issues
|
5 years ago |
enadhilal
|
1bcb19f183
|
add new icon and fixing ui issue
|
5 years ago |
umasoodch
|
1aafd62e4a
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
umasoodch
|
8cb9014423
|
fixed firebase issue
|
5 years ago |
enadhilal
|
4f9d6e1085
|
fixing bug in announcement and confirm login pages
|
5 years ago |
enadhilal
|
fad90f9588
|
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
|
5 years ago |
enadhilal
|
d2abcbb620
|
fixing bug UI issue
|
5 years ago |
umasoodch
|
53bc9d067e
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
# Conflicts:
# Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
# Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
|
5 years ago |
enadhilal
|
3d986ca77d
|
no message
|
5 years ago |
enadhilal
|
abf9368fe1
|
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
# Conflicts:
# Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
|
5 years ago |
enadhilal
|
0964ff43ff
|
fixing bugs
|
5 years ago |
umasoodch
|
9c71c154ff
|
fixed prod build issues
|
5 years ago |
umasoodch
|
6099309649
|
Merge branch 'MOHEMM-Q2-DEV' into sultan26April
# Conflicts:
# Mohem/src/app/offersdiscount/home/home.component.ts
# Mohem/src/app/offersdiscount/services/service.ts
|
5 years ago |
umasoodch
|
ded927bf6a
|
fixed basic details issue
|
5 years ago |
umasoodch
|
23eb5652e8
|
added analytics code
|
5 years ago |
Sultan Khan
|
3e1aec52ec
|
Merge branch 'sultan26April' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
umasoodch
|
b91f0a8044
|
Merge branch 'MOHEMM-Q2-DEV' into umar-q2-branch
|
5 years ago |
umasoodch
|
d4dccd6dff
|
fixed basic details issue
|
5 years ago |
enadhilal
|
b0da97573c
|
adding filter, pagination and enhance calling services in service.ts file
|
5 years ago |
enadhilal
|
1dd858101a
|
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
|
5 years ago |
enadhilal
|
b6e109db56
|
changes
|
5 years ago |
Sultan Khan
|
af34fda486
|
bug fixes
|
5 years ago |
Fatimah Alshammari
|
6861cdee9c
|
fixed qa issues
|
5 years ago |
Sultan Khan
|
79a8fd1743
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
8f9ea0b949
|
filter still not fixed
|
5 years ago |
umasoodch
|
6131859e76
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
umasoodch
|
23d926db90
|
Merge branch 'sultan26April' into Fatima-Q2-June
|
5 years ago |
umasoodch
|
c62fe19805
|
Merge branch 'MOHEMM-Q2-DEV' into sultan26April
|
5 years ago |
umasoodch
|
7ae9bb1b5b
|
fixed dependencies issues and updated firebase plugin
|
5 years ago |
Sultan Khan
|
72756d812d
|
fixes
|
5 years ago |
Fatimah Alshammari
|
ca25bfb05a
|
resolved merge issues
|
5 years ago |
Sultan Khan
|
9a8176fe7b
|
offers and discount fixes
|
5 years ago |
Sultan Khan
|
bed5d7457e
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
0e19eb555f
|
design fixes and change correct address
|
5 years ago |
enadhilal
|
301dafbf3f
|
design announcement image for item
|
5 years ago |
enadhilal
|
32f2900a90
|
design issue fixed
|
5 years ago |
enadhilal
|
f9b1dade17
|
resolved merged issues
|
5 years ago |
Sultan Khan
|
675cdc06b6
|
design fixes
|
5 years ago |
Sultan Khan
|
dc9e16bc5f
|
share
|
5 years ago |
Sultan Khan
|
e14d89fdb3
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
a0f5beb4df
|
update and change address, design updates
|
5 years ago |
umasoodch
|
2a08425cf2
|
Merge branch 'MOHEMM-Q2-DEV' into sultan26April
|
5 years ago |
umasoodch
|
42cece4367
|
fixed prod issues
|
5 years ago |
Sultan Khan
|
76231343c9
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
79dc17215a
|
social sharing
|
5 years ago |
umasoodch
|
beb714c0ad
|
fixed social sharing issue
|
5 years ago |
Fatimah Alshammari
|
4e6702dbf6
|
added new fonts
|
5 years ago |
umasoodch
|
a30e9c3da2
|
Merge branch 'MOHEMM-Q2-DEV' into sultan26April
|
5 years ago |
umasoodch
|
91791a2827
|
disabled button at home page
|
5 years ago |
Sultan Khan
|
a707c46952
|
design fixes share
|
5 years ago |
Sultan Khan
|
f9576048a0
|
design fixes share
|
5 years ago |
Sultan Khan
|
a03e879395
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
7671eb7f14
|
design and address
|
5 years ago |
Fatimah Alshammari
|
a6a6f17652
|
fixed testing issues
|
5 years ago |
umasoodch
|
670980886a
|
fixed data issue
|
5 years ago |
umasoodch
|
c3f63b78e7
|
fixed prod build issues
|
5 years ago |
umasoodch
|
5ae2c2f170
|
fixed structure issues
|
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
|
392d898e21
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
9e509e143f
|
user profile
|
5 years ago |
umasoodch
|
a945acd441
|
Merge branch 'MOHEMM-Q2-DEV' into umar-q2-branch
|
5 years ago |
umasoodch
|
0f56883b37
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
enadhilal
|
46914e104d
|
fixing ReportGenerated in itg work list
|
5 years ago |
Fatimah Alshammari
|
c4846138ed
|
fixed issues
|
5 years ago |
umasoodch
|
25a920b3ef
|
added new comps
|
5 years ago |
umasoodch
|
aa8d2e3d85
|
commited my profile code
|
5 years ago |
Fatimah Alshammari
|
5e53ec783f
|
fixed testing issues
|
5 years ago |
Fatimah Alshammari
|
3080d0bb74
|
fixed merge issues
|
5 years ago |
umasoodch
|
93762ccfe8
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
enadhilal
|
f6451974ee
|
fix the logo image in menu
|
5 years ago |
enadhilal
|
5561ca7e97
|
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
# Conflicts:
# Mohem/src/app/mowadhafi/my-request/my-request.component.ts
|
5 years ago |
enadhilal
|
8db6786515
|
fixing desing in profile page
|
5 years ago |
Sultan Khan
|
51ae41ea41
|
ERM added
|
5 years ago |
Sultan Khan
|
ac167aae53
|
back button
|
5 years ago |
Sultan Khan
|
b6162bb894
|
hr request
|
5 years ago |
Sultan Khan
|
3f096133ed
|
back button
|
5 years ago |
Sultan Khan
|
2d3d92f69b
|
header issue
|
5 years ago |
Sultan Khan
|
8a5e9f25e7
|
hr request
|
5 years ago |
Sultan Khan
|
cdc81881f5
|
Merge branch 'sultan26April' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
1e48969f43
|
header updated
|
5 years ago |
Fatimah Alshammari
|
ab0f37ca12
|
fixed issues in mowdafi HR
|
5 years ago |
Fatimah Alshammari
|
ad151091d0
|
added reuqest hr component
|
5 years ago |
umasoodch
|
745287b3f4
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
Sultan Khan
|
5cc00cb79d
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
b9baa8b12e
|
offers and discount and ERM
|
5 years ago |
enadhilal
|
1d1c0bfb6a
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
enadhilal
|
84625ecff7
|
format document
|
5 years ago |
umasoodch
|
7341177275
|
Merge branch 'MOHEMM-Q2-DEV' into sultan26April
|
5 years ago |
Sultan Khan
|
bce8df964f
|
offers and discount
|
5 years ago |
Sultan Khan
|
d5c946370d
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
6f4f998700
|
offers and discount
|
5 years ago |
Sultan Khan
|
ea93212ad1
|
offers and discount
|
5 years ago |
enadhilal
|
e64fbfeada
|
add design for arabic and call API
|
5 years ago |
umasoodch
|
e0a02c254f
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
enadhilal
|
f21fe520e0
|
updated profile/home and the modal to meet the design style
|
5 years ago |
Fatimah Alshammari
|
8ccb01f1ac
|
fixed my team
|
5 years ago |
Sultan Khan
|
23bcf583fb
|
Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Sultan Khan
|
fcd9ff9b89
|
service added
|
5 years ago |
enadhilal
|
344bc11ab9
|
add icons in profile/home
|
5 years ago |
enadhilal
|
5f9260d111
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
|
5 years ago |
enadhilal
|
3787a18560
|
swipe component between profile/home and profile/edit and change the design
|
5 years ago |
umasoodch
|
900be32d1c
|
Merge branch 'MOHEMM-Q2-DEV' into sultan26April
|
5 years ago |
Sultan Khan
|
5b5f9b2cfd
|
my team calendar change
|
5 years ago |
Sultan Khan
|
7bb565af80
|
design updated
|
5 years ago |
umasoodch
|
d086e9ebff
|
Merge branch 'Fatima-Q2-June' into MOHEMM-Q2-DEV
|
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 |
enadhilal
|
6dc48c5750
|
fix icon issue
|
5 years ago |
enadhilal
|
f692fe9d33
|
add announcement icon
|
5 years ago |
enadhilal
|
da138859fb
|
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
# Conflicts:
# Mohem/src/app/hmg-common/services/connector/connector.service.ts
|
5 years ago |
enadhilal
|
5d14466b49
|
update
|
5 years ago |
umasoodch
|
e6109e95d5
|
fixed live URL
|
5 years ago |
Sultan Khan
|
ca96419ca1
|
ui issues for all designs
|
5 years ago |
enadhilal
|
780f515449
|
add announcement service
|
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
|
94af746ae2
|
UI/UX enhancment
|
5 years ago |
enadhilal
|
5e7f7a6c9c
|
added backend integrations module
|
5 years ago |
Fatimah Alshammari
|
6f7bd0847b
|
fixed conflicts
|
5 years ago |
Fatimah Alshammari
|
f00547e37f
|
Merge branch 'MOHEMM-Q2-DEV' into Fatima-Q2-June
# Conflicts:
# Mohem/src/app/hmg-common/services/connector/connector.service.ts
|
5 years ago |
Sultan Khan
|
671bd53ca1
|
worklist for IC
|
5 years ago |
Sultan Khan
|
3e4d046818
|
Merge branch 'umar-q2-branch' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
enadhilal
|
5619ad7ba8
|
add translate in IC
|
5 years ago |
umasoodch
|
385c5c0d73
|
Merge branch 'enad-Q1' into umar-q2-branch
|
5 years ago |
enadhilal
|
57467ea800
|
Item Creation page added
|
5 years ago |
umasoodch
|
d07e18b657
|
added new category for Item Creation
|
5 years ago |
Sultan Khan
|
821f1ea696
|
worklist changes
|
5 years ago |
Sultan Khan
|
7881d3db33
|
Merge branch 'master-newdesign-15-Dec-location' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April
|
5 years ago |
Fatimah Alshammari
|
c42b043b93
|
Merge branch 'master-newdesign-15-Dec-location' into Fatima-Q2-June
|
5 years ago |
Fatimah Alshammari
|
bc3251b525
|
fixed my team design
|
5 years ago |
Sultan Khan
|
df3abc660a
|
new design added with worklist and others
|
5 years ago |
umasoodch
|
ae4d017126
|
increases version id for mohemm CS
|
5 years ago |
enadhilal
|
5a5e6bc0be
|
no message
|
5 years ago |
umasoodch
|
0aafef42ea
|
fixed eit issue
|
5 years ago |
umasoodch
|
426bfb86ca
|
fixed session issue
|
5 years ago |
enadhilal
|
05647d71ef
|
ITG rearrange tabs and skip button fixed
|
5 years ago |
enadhilal
|
f75b3b26a3
|
fixed digital id image size in all screen
|
5 years ago |
enadhilal
|
15566e4361
|
change the connector to be in production
|
5 years ago |
enadhilal
|
54e75b1dee
|
fixed image size
|
5 years ago |
enadhilal
|
3e84cedd4c
|
fixed the login button
|
5 years ago |
enadhilal
|
d811c446e8
|
digital ID update
|
5 years ago |
enadhilal
|
65f7385630
|
add digital id and fixed worklist issues.
|
5 years ago |
enadhilal
|
b3bffd09c8
|
Merge branch 'master-newdesign-15-Dec-location' into enad-Q1
|
5 years ago |
umasoodch
|
e287b6a215
|
enads work from umar machine
|
5 years ago |
enadhilal
|
9169088da2
|
fixed wifi lat long issues
|
5 years ago |
enadhilal
|
b2d06f40bf
|
my laptop work
|
5 years ago |
umasoodch
|
ff4f7cc922
|
added location for wifi as well
|
5 years ago |
umasoodch
|
0379ee4e89
|
removed wifi issue checks
|
5 years ago |
umasoodch
|
97846ad8b4
|
Merge branch 'enad-Q1' into master-newdesign-15-Dec-location
|
5 years ago |
umasoodch
|
0b07d88af0
|
increased version id
|
5 years ago |
enadhilal
|
714e718ec9
|
add empty image for digital ID if the image return with null
|
5 years ago |
enadhilal
|
979ffda40f
|
fixed UI in my profile and change the icon for digital ID in menu
|
5 years ago |
umasoodch
|
99ce9e5f17
|
fixed UI issue at profile
|
5 years ago |
umasoodch
|
41d5faacca
|
Merge branch 'master-newdesign-15-Dec-location' into enad-Q1
|
5 years ago |
umasoodch
|
0e4193b4c4
|
fixed wifi issue
|
5 years ago |
enadhilal
|
c66905865e
|
fixed digital ID issues
|
5 years ago |
enadhilal
|
c0d4ab610d
|
Merge branch 'master-newdesign-15-Dec-location' into enad-Q1
|
5 years ago |
enadhilal
|
1a2be62897
|
fixed id ui issues
|
5 years ago |
umasoodch
|
b792048a8f
|
fixed wifi issue
|
5 years ago |
umasoodch
|
0da64271fc
|
fixed mohemm Q1 issues
|
5 years ago |
enadhilal
|
84abf319ac
|
finished all assigned tasks
|
5 years ago |
umasoodch
|
f119467787
|
removed unused code
|
5 years ago |
umasoodch
|
cf55355fb5
|
fixed message error for WIFI.
|
5 years ago |
umasoodch
|
4d1f9ec92f
|
fixed slider issue and added css fixes
|
5 years ago |
enadhilal
|
a80cef47f9
|
fixed slider issue
|
5 years ago |
haroon amjad
|
4223a00609
|
fixed ios wifi timer issue
|
5 years ago |
umasoodch
|
c9dce385dd
|
fixed issues found during demo
|
5 years ago |
umasoodch
|
df47d4d2ed
|
fixed wifi issues
|
5 years ago |
umasoodch
|
0749cfafbd
|
refactor code
|
5 years ago |
Zohaib Iqbal Kambrani
|
49554e4ff7
|
Wifi attendance Attached Native code @src/app/home/wifi-model/customized_native_code@wifi-wizard2.java
|
5 years ago |
Zohaib Iqbal Kambrani
|
6808c5783a
|
Wifi attendance Attached Native code @src/app/home/wifi-model/customized_native_code@wifi-wizard2.java
|
5 years ago |
Zohaib Iqbal Kambrani
|
316ce130fc
|
Android Wifi Attendance Completed...
|
5 years ago |
umasoodch
|
5af213dcf8
|
fixed images issue
|
5 years ago |
Zohaib Iqbal Kambrani
|
6b8984d4ce
|
Wifi translation
|
5 years ago |
Zohaib Iqbal Kambrani
|
01cdde313a
|
Merge branch 'mohemm-wifi-feature' of https://gitlab.com/haroon6138/mohemmionic5 into mohemm-wifi-feature
|
5 years ago |
Zohaib Iqbal Kambrani
|
d65940dc64
|
no message
|
5 years ago |
umasoodch
|
5e08d8489b
|
removed unused code
|
5 years ago |
umasoodch
|
73aa088c04
|
fixed indentation issue
|
5 years ago |
umasoodch
|
839f752a58
|
fixed wifi check
|
5 years ago |
umasoodch
|
33d55363bb
|
Merge branch 'mohemm-wifi-feature' into ZohaibIqbalKambrani
# Conflicts:
# Mohem/package-lock.json
|
5 years ago |
Zohaib Iqbal Kambrani
|
b7d1b04ce1
|
Apply privilages to wifi attendance
|
5 years ago |
Zohaib Iqbal Kambrani
|
3c9ed6c674
|
Update gif Icon and platform
|
5 years ago |
umasoodch
|
67713290d1
|
fixed issues of nfc blank screen back issue
|
5 years ago |
Zohaib Iqbal Kambrani
|
7ee282c9fc
|
no message
|
5 years ago |