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
|
25d66bb984
|
package json
|
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
|
1cd876d173
|
added ionic4-rating module in package.json
|
5 years ago |
umasoodch
|
1f0c78d504
|
pushed package.json
|
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
|
4695e5e9b2
|
ERM channel design
|
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
|
782ed41226
|
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 |
Fatimah Alshammari
|
4de91ab935
|
Merge branch 'MOHEMM-Q2-DEV' into Fatima-Q2-June
|
5 years ago |
umasoodch
|
f92bcf4c32
|
fixed config files issue
|
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 |
Zohaib Iqbal Kambrani
|
e67ade154f
|
Mohemm Wifi Attendance, Fix
|
5 years ago |
umasoodch
|
c6ee3e798c
|
fixed worklist and icon issue. Also removed unused plugins.
|
5 years ago |
Zohaib Iqbal Kambrani
|
95d608fca8
|
Wifi Attendance
|
5 years ago |
Zohaib Iqbal Kambrani
|
424d02c9e1
|
no message
|
5 years ago |
umasoodch
|
2c99326146
|
fixed css issues at worklist page
|
5 years ago |
umasoodch
|
0a6633c74b
|
fixed splash issues and network issue
|
5 years ago |
umasoodch
|
965229d132
|
fixed worklist slider issue
|
5 years ago |
umasoodch
|
88e3796bc3
|
Merge branch 'mohemm-issues-18-jan' into mohemm-issues-jan-31
|
5 years ago |
umasoodch
|
b9e58a3739
|
deleted unused code
|
5 years ago |
enadhilal
|
e209c632dd
|
fixed mohemm assigned issues
|
5 years ago |
umasoodch
|
077538efe5
|
fixed nfc issues
|
5 years ago |
umasoodch
|
1424c27008
|
added changes for NFC
|
5 years ago |
umasoodch
|
0816b3af40
|
nfc completed on production
|
5 years ago |
haroon amjad
|
1f3fd3d032
|
fixed ios issue for nfc
|
5 years ago |
umasoodch
|
b7fc960ce7
|
completed NFC for CS Mohemm
|
5 years ago |
umasoodch
|
3e6e2a9353
|
changed splash for CS
|
5 years ago |
umasoodch
|
e4525ea728
|
fixed timer issue login forgot password disable issue and handled version issue
|
5 years ago |
Salman Afzal
|
f602e27e49
|
added code for ios before making ios apps live
|
5 years ago |
umasoodch
|
e1a2a9840f
|
fixed location issue for ios and separated code for
|
5 years ago |
umasoodch
|
6f92708417
|
mohemm dev for background location android completed
|
5 years ago |
umasoodch
|
2c2be66cb9
|
updated config xml
|
5 years ago |
umasoodch
|
a813addd92
|
completed location for cloud solutions mohemm
|
5 years ago |
umasoodch
|
85b5416703
|
added backgroundgeo location
|
5 years ago |
enadhilal
|
0a7bb4c641
|
fixed google service file
|
5 years ago |
Mohamed Mekawy
|
0cdfa51048
|
edit version no
|
6 years ago |
Mohamed Mekawy
|
671021bd79
|
edit direction
|
6 years ago |
Mohamed Mekawy
|
333b4e7f80
|
Merge branch 'master-newdesign' into fatma-issu
|
6 years ago |
Fatimah.Alshammari
|
b42c1981fe
|
fix issue
|
6 years ago |
ashwaq
|
21dd0e0985
|
fix design
|
6 years ago |
ashwaq
|
5cc9e272c5
|
add fix design
|
6 years ago |
ashwaq
|
24dc54c55d
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
f3f1e6c8d0
|
add fix ok button
|
6 years ago |
Mohamed Mekawy
|
73099ddcc9
|
merge all branches
|
6 years ago |
Mohamed Mekawy
|
0cb4b1d43e
|
Merge branch 'ashwaq-fix-bug' into master-newdesign
|
6 years ago |
Mohamed Mekawy
|
24468df6a4
|
Merge branch 'mekawy-issues' into master-newdesign
|
6 years ago |
Mohamed Mekawy
|
736d2782ab
|
edit eit-list
|
6 years ago |
Salman Afzal
|
5e2857051c
|
fixed keyboard issue
|
6 years ago |
Mohamed Mekawy
|
0b268a7995
|
edit stsus button
|
6 years ago |
Mohamed Mekawy
|
6b2208cf4a
|
Merge branch 'master-newdesign' into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
60206ffddd
|
fix workist issue
|
6 years ago |
Fatimah.Alshammari
|
54f29cf345
|
fix issu
|
6 years ago |
Fatimah.Alshammari
|
5a9c337dd6
|
fix issue
|
6 years ago |
Salman Afzal
|
5edb4a9e83
|
MM-460 Fixed.
|
6 years ago |
umasoodch
|
06a99db85a
|
fixed mark attendance issue
|
6 years ago |
umasoodch
|
3fe4c73492
|
fixed prod issues
|
6 years ago |