umasoodch
98ff18d8b9
Merge branch 'MOHEMM-Q3-DEV-LATEST' into sultan-q3
4 years ago
umasoodch
069fe5abef
fixed css issues
4 years ago
Sultan Khan
d81bae290d
bug fixes
4 years ago
Sultan Khan
2567bc2c8b
updated auto sms
4 years ago
Sultan Khan
7968b3e4ad
Merge branch 'sultan-q3' of https://gitlab.com/haroon6138/mohemmionic5 into sultan-q3
4 years ago
Sultan Khan
a59adb2107
item for sale udated
4 years ago
umasoodch
124836aa25
fixed fav issue
4 years ago
umasoodch
1642e9df1c
Merge branch 'MOHEMM-Q3-DEV-LATEST' into enad-pre-live
4 years ago
enadhilal
f597f56f00
stamp next is not working
...
success message should be
"Your action has been executed successfully!"
if in case while approve reject delegate service gives error it should not move to next one
4 years ago
umasoodch
1322cad9fe
fixed worklist issue
4 years ago
umasoodch
50da1bd202
fixed issue
4 years ago
umasoodch
828bf5097f
fixed cei issue
4 years ago
umasoodch
69cff1476d
Merge branch 'MOHEMM-Q3-DEV-LATEST' into enad-pre-live
4 years ago
umasoodch
81e7d6c1ad
added mac function
4 years ago
enadhilal
06346f6b09
fixed forgot password
...
fixed performance evaluation design
fixed business card design in one line
fixed my profile design
fixed my favourites in a way that nothing should be selected by default
fixed worklist HR after delegate issue
4 years ago
enadhilal
090f78df52
fixing disable btn and input placeholder
4 years ago
enadhilal
c05f5c4725
added validation to forget password component
4 years ago
umasoodch
08ce0228b7
fixed prod build issues
4 years ago
umasoodch
f8f6fb49cb
remove comments
4 years ago
umasoodch
baad1c874f
fixed business card
4 years ago
umasoodch
f5168648ab
fixed CEI
4 years ago
Sultan Khan
5e21b1178b
Merge branch 'MOHEMM-Q3-DEV-LATEST' of https://gitlab.com/haroon6138/mohemmionic5 into sultan-q3
4 years ago
Sultan Khan
b826abff73
arabic version fixes
4 years ago
enadhilal
30e89f04ec
fixing desing
4 years ago
umasoodch
744740ac44
Merge branch 'MOHEMM-Q3-DEV-LATEST' into enad-pre-live
...
# Conflicts:
# Mohem/src/app/eit/cei-homepage/cei-homepage.component.html
# Mohem/src/app/eit/cei-homepage/cei-homepage.component.ts
4 years ago
umasoodch
ef73fc8bc3
fixed child education
4 years ago
enadhilal
e306628867
added validation in change password and redsign CEI component
4 years ago
Sultan Khan
2042a208a0
sms page change
4 years ago
Sultan Khan
06edf6da79
Merge branch 'MOHEMM-Q3-DEV-LATEST' of https://gitlab.com/haroon6138/mohemmionic5 into sultan-q3
...
# Conflicts:
# Mohem/src/app/hmg-common/services/connector/connector.service.ts
4 years ago
Sultan Khan
de93db93d5
auto sms android IOS
4 years ago
umasoodch
7ab6e0e46a
added cei list functionality
4 years ago
umasoodch
3cc9048098
CE new component added
4 years ago
umasoodch
2e84d853de
fixed worklist issues
4 years ago
umasoodch
6648091b82
Merge branch 'MOHEMM-Q3-DEV-LATEST' into enad-pre-live
4 years ago
enadhilal
91361f87d3
fixed worklist issue
4 years ago
Sultan Khan
e765d81711
auto sms read feature
4 years ago
Sultan Khan
985103bdb5
Merge branch 'sultan-q3' of https://gitlab.com/haroon6138/mohemmionic5 into sultan-q3
4 years ago
Sultan Khan
1ca6158b1f
my profile and accural balance
4 years ago
umasoodch
e7745d8da3
Merge branch 'MOHEMM-Q3-DEV-LATEST' into sultan-q3
...
# Conflicts:
# Mohem/src/app/hmg-common/services/connector/connector.service.ts
4 years ago
Sultan Khan
918d30f04b
item for sale q3
4 years ago
umasoodch
f5d0f0fd68
Merge branch 'MOHEMM-Q3-DEV-LATEST' into enad-pre-live
4 years ago
enadhilal
57be247a0a
fixed change password in welcome page and added CONTACT request type in worklist
4 years ago
umasoodch
14fb8f7ba7
added child education
4 years ago
umasoodch
b5b37abd73
Merge branch 'sultan-q3' into worklist-umar-Q3
4 years ago
Sultan Khan
b3ae4c96f7
contact
4 years ago
Sultan Khan
b30bfa9a0b
q3 fixes
4 years ago
enadhilal
718ec53b2a
fixing reselect letter after favourite is selected
4 years ago
enadhilal
aaa18bfce1
Merge branch 'worklist-umar-Q3' into enad-pre-live
4 years ago
enadhilal
27fc8ebb72
fixed itg
4 years ago
umasoodch
4a25fea675
fixed issues
4 years ago
umasoodch
d23c52d460
fixed worklist styling issue
4 years ago
umasoodch
e939892c54
fixed worklist issues
4 years ago
umasoodch
a22d3c64de
added changes for worklist
4 years ago
Sultan Khan
e7755c1ef4
Merge branch 'MOHEMM-Q3-DEV' into sultan-q3
...
# Conflicts:
# Mohem/src/assets/localization/i18n.json
4 years ago
Sultan Khan
d4c09d7eb7
Q3 changes
4 years ago
enadhilal
f1e2251a7a
add Stamp and remove the replacment loading.
4 years ago
umasoodch
dab7e7a26c
Merge branch 'MOHEMM-Q3-DEV' into enad-Q3
4 years ago
umasoodch
59747d1780
fixed loading issue
4 years ago
enadhilal
f7c23eb8d4
added notification service for worklist
4 years ago
enadhilal
d5dfc27004
add service for worklist notification and STAMP
4 years ago
umasoodch
b6aa95741b
added code for timer
4 years ago
enadhilal
eee3f27cec
fixed loading div in worklist
4 years ago
enadhilal
44585ad9bd
add loadder in worklist
4 years ago
enadhilal
7bb37d3f47
no message
4 years ago
Sultan Khan
3be79111d2
Merge branch 'MOHEMM-Q3-DEV' into sultan-q3
...
# Conflicts:
# Mohem/src/app/profile/home/home.component.scss
# Mohem/src/app/profile/home/home.component.ts
4 years ago
Sultan Khan
1201adb5ed
Q3 CHANGES
4 years ago
umasoodch
7715595ab2
fixed plugin text issue
4 years ago
enadhilal
0d72c3be24
business card test 1
4 years ago
enadhilal
69330e48bb
added translate
4 years ago
enadhilal
6a34981c9b
added toast MSG and confirm dialog for update and delete btn in profile family member segment
4 years ago
enadhilal
3ce01fc610
added family member segment and design
4 years ago
enadhilal
47b9209497
fixed vacation rule issue
4 years ago
enadhilal
e7f39ba02f
added page to turn on or off worklist notification and add indecator in my profile
4 years ago
umasoodch
99cdc67d56
Merge branch 'MOHEMM-Q3-DEV' into enad-Q3
4 years ago
enadhilal
1c315cd621
hmg business card
4 years ago
enadhilal
1cee785d88
fixing business card desgin
4 years ago
enadhilal
016bd83b81
fixed css for business card
4 years ago
umasoodch
dba1286f42
business card text changed
4 years ago
enadhilal
d624f0794c
FIXED MERG ISSUES
4 years ago
haroon amjad
ab708d629f
fixed business card issues
4 years ago
umasoodch
ff95ad7c36
fixed business card issue
4 years ago
umasoodch
67089be74f
Merge branch 'MOHEMM-HUAWEI-RELEASE' into enad-Q3
4 years ago
umasoodch
bfb683fe1d
fixed issues
4 years ago
enadhilal
c8c7c88af7
fixing search by name in itg
4 years ago
enadhilal
23dc5814ef
Merge branch 'enad-Q3' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q3
...
# Conflicts:
# Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
4 years ago
enadhilal
8cf9005678
fav isues in ITG
4 years ago
umasoodch
2ab708f451
fixed css issue
4 years ago
umasoodch
74d15d8086
Merge branch 'MOHEMM-HUAWEI-RELEASE' into enad-Q3
4 years ago
enadhilal
ca9d714612
replace ion-button to be button
4 years ago
umasoodch
019d72ce4c
fixed swipe issue
4 years ago
enadhilal
de11c08182
Merge branch 'enad-Q3' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q3
4 years ago
enadhilal
76cbb8451c
search btn in worklist
4 years ago
umasoodch
e856ff834a
Merge branch 'MOHEMM-HUAWEI-RELEASE' into enad-Q3
4 years ago
umasoodch
26fabe3261
fixed business card css
4 years ago
enadhilal
1618d123c1
fixed fav issue
4 years ago
umasoodch
57324d0584
Merge branch 'MOHEMM-HUAWEI-RELEASE' into enad-Q3
4 years ago
umasoodch
ac20d1f121
rearranged worklist tabs
4 years ago
enadhilal
beda780d50
fixing business card design and worklist basic info & address info
4 years ago
enadhilal
138f75a9af
PO Total amount with Tax, baisc info and addres request to show in work list and business card to use local storage
4 years ago
umasoodch
aa7bc510f0
fixed live url
4 years ago
umasoodch
20ab54d69e
Merge branch 'MOHEMM-HUAWEI-RELEASE' into enad-Q3
4 years ago
enadhilal
a161484198
fixing issues
4 years ago
umasoodch
0e64bf212b
fixed welcome page issue
4 years ago
umasoodch
25f6a99372
fixed scroll issue
4 years ago
umasoodch
5f31778d22
fixed text
4 years ago
umasoodch
9a6e4b0bfa
fixed business card spelling
4 years ago
umasoodch
7a2007aba5
fixed login issue
4 years ago
umasoodch
948a83aa38
Merge branch 'enad-Q3' into MOHEMM-HUAWEI-RELEASE
4 years ago
umasoodch
d2045776ba
fixed wifi issue
4 years ago
enadhilal
00ef78271c
fixing design issues in bussines card for all mobile type, favorite issues fixed in worklist and itg worklist
4 years ago
umasoodch
7f0b90bf6f
Merge branch 'enad-Q3' into MOHEMM-HUAWEI-RELEASE
4 years ago
umasoodch
14a28b52fe
added right versionID
4 years ago
enadhilal
4ce2fb486a
Merge branch 'enad-Q3' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q3
4 years ago
enadhilal
a03b32a2b0
fixing favruite in worklist and my team
4 years ago
umasoodch
52d16d77e8
fixed app update issue
4 years ago
umasoodch
2f9e24c332
Merge branch 'MOHEMM-HUAWEI-RELEASE' into enad-Q3
4 years ago
umasoodch
e9b8119169
Fixed address flow issues
4 years ago
enadhilal
b12eeb4a1a
fixing design issue for update page and translate for business card
4 years ago
enadhilal
c6712f6bfe
Merge branch 'enad-Q3' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q3
4 years ago
enadhilal
e260ea3684
fix
4 years ago
umasoodch
e21ff86a49
Merge branch 'MOHEMM-HUAWEI-RELEASE' into enad-Q3
4 years ago
enadhilal
bde07ce350
add submit btn in asnwer modal
4 years ago
umasoodch
f00643dbf6
fixed production abscence issue
4 years ago
enadhilal
231b3586d7
fix i18
4 years ago
enadhilal
4aa50bbfda
fixing bugs
4 years ago
umasoodch
5411a068bf
added check code for huawei device
4 years ago
umasoodch
438a8dce03
added hmg_utils file
4 years ago
enadhilal
ff0492718e
Merge branch 'MOHEMM-Q2-DEV' into enad-Q3
4 years ago
umasoodch
fa9f2cd1a1
fixe param issue
4 years ago
enadhilal
4ade4f8b9f
fixed itg issues
4 years ago
enadhilal
b9f691e76f
fixing delegate itg
4 years ago
umasoodch
5fbaed162b
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
22906f09ae
fixed firestore logic
4 years ago
enadhilal
3b5743a549
fixing ITG issues
4 years ago
enadhilal
e58be0d5fc
pushed for business card
4 years ago
umasoodch
d7d46a83f5
fixed arabic offer text issue
4 years ago
enadhilal
a1aadd14be
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
enadhilal
e414ba95e3
toast red
4 years ago
enadhilal
004b4d2c3f
toast red
4 years ago
umasoodch
436e85873f
fixed basic details modal issue
4 years ago
enadhilal
6a07e1d7b7
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
4 years ago
enadhilal
95d6aa09dd
fix
4 years ago
umasoodch
5436a660ba
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
enadhilal
bc3b3616a7
fixing workflow list and fixing search in offer page
4 years ago
umasoodch
fb23143ed5
fixed offers issue
4 years ago
umasoodch
3b830772ab
fixed toFixed issue
4 years ago
umasoodch
a2e99b0829
fixed po issue
4 years ago
umasoodch
b146c90abf
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
ef4dca8753
fixed css issue
4 years ago
enadhilal
6ba6cb2d11
fixing
4 years ago
enadhilal
bbe151ba59
fixing radio design
4 years ago
enadhilal
a8d7c919a8
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
112269a5e4
fixed image sharing issue
4 years ago
enadhilal
1a26c68f33
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
...
# Conflicts:
# Mohem/src/theme/styles.scss
4 years ago
enadhilal
1644a903d0
add filter and change icon in replacement modal
4 years ago
umasoodch
464bca6a7a
added params according to backend team
4 years ago
umasoodch
bc4927f4ab
fixed connector service
4 years ago
umasoodch
7b3d5624ed
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
cf52d46d47
fixed feedback issues
4 years ago
enadhilal
56aeec21d2
fixing date time in worklist
4 years ago
umasoodch
eb4f064ca7
fixed svg issue
4 years ago
umasoodch
26f47c2608
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
267ab249c6
fixed offers and discount images rendering issue
4 years ago
enadhilal
f926dc5708
fixing show more in worklist and added no data if there is no data
4 years ago
umasoodch
5e389beb98
fixed feedback issues
4 years ago
enadhilal
622dccee66
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
4 years ago
enadhilal
3b3c704bae
fixing worklist design and announcement seacrch function
4 years ago
umasoodch
9dfeaeae90
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
cdd82fc774
fixed issues of feedback
4 years ago
umasoodch
7c3e6501cc
fixed job title throughout the application
4 years ago
enadhilal
332732f619
fixed feedback issues
4 years ago
umasoodch
4011346cdd
fixed opacity issue
4 years ago
umasoodch
906f405457
commented code
4 years ago
umasoodch
076b52116f
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
08ad2e9667
fixed feedback issues
4 years ago
enadhilal
0fc835cd87
fixing announcement list
4 years ago
enadhilal
ed07f19848
fixing announsment design and add pageination, SMS page added label
4 years ago
enadhilal
c145d7b60d
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
4 years ago
enadhilal
a408bf0206
fixing the home page icon in AR
4 years ago
umasoodch
eed0700356
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
fe20eb8c3b
remove unused code
4 years ago
enadhilal
3fa494a7ac
fixing design offer
4 years ago
enadhilal
8aba418842
fxing design issue in offer and announ. page
4 years ago
enadhilal
367db27cf1
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
a02b05ee26
fixed html issue
4 years ago
enadhilal
25e75953ec
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
enadhilal
1183fb594d
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
4 years ago
enadhilal
c485808a41
swap faces in survey page
4 years ago
umasoodch
2e399e151a
disable items for sale
4 years ago
umasoodch
a93ccdebc4
fixed ios issues
4 years ago
umasoodch
66d193815a
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
umasoodch
6ecc9d27e4
fixed ui issue in ios
4 years ago
enadhilal
93e67bd505
design in login page
4 years ago
enadhilal
c59c5133b0
done
4 years ago
enadhilal
77144b7162
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
4 years ago
enadhilal
c7d080107e
fixing radio button in hr-request-form
4 years ago
umasoodch
e76a8f9d8e
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
enadhilal
729702f681
Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1
4 years ago
enadhilal
b42d72bd81
fixing search bar in my team
4 years ago
umasoodch
3f491f0fbc
revert changes
4 years ago
umasoodch
265e60edbe
Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
4 years ago
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