Elham Rababh
|
db277a62f5
|
fix brand design
|
3 years ago |
|
Elham Rababh
|
a6a7ed4e1b
|
remove cart from product details
|
3 years ago |
|
Elham Rababh
|
9b42d411ca
|
remove cart from product details
|
3 years ago |
|
Elham Rababh
|
cc88f0f81e
|
first step of fixing
|
3 years ago |
Mohammad Aljammal
|
cfe9e35c38
|
Merge branch 'blood_pressure' into 'development'
parent product and sub product update
See merge request Cloud_Solution/diplomatic-quarter!389
|
3 years ago |
hussam al-habibeh
|
e4d54f0c0b
|
parent product and sub product update
|
3 years ago |
|
hussam al-habibeh
|
f1c2dbbbfc
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
Conflicts:
lib/pages/parent_categorise_page.dart
lib/pages/sub_categorise_page.dart
|
3 years ago |
|
hussam al-habibeh
|
0a1db70229
|
parent product and sub product update
|
3 years ago |
|
Mohammad Aljammal
|
1d7e97a9af
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!386
|
3 years ago |
Fatimah Alshammari
|
7ebeb8cb4b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/parent_categorise_page.dart
# lib/pages/sub_categorise_page.dart
|
3 years ago |
|
Fatimah Alshammari
|
bcfbca98a1
|
fixed arabic version
|
3 years ago |
|
Mohammad Aljammal
|
473f372a85
|
Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering
See merge request Cloud_Solution/diplomatic-quarter!388
|
3 years ago |
|
hussam al-habibeh
|
cb9d8cb9d9
|
fix pharmacy products filtering
|
3 years ago |
|
hussam al-habibeh
|
b0165c0d29
|
fix pharmacy products filtering
|
3 years ago |
|
Fatimah Alshammari
|
2caf4d4837
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
3 years ago |
|
Mohammad Aljammal
|
9fb4e79c34
|
Merge branch 'sep_fixes' into 'development'
Sep fixes
See merge request Cloud_Solution/diplomatic-quarter!387
|
3 years ago |
|
Elham Rababh
|
bb372210e0
|
PAP-938: fix Referral sent
|
3 years ago |
|
Elham Rababh
|
bff7020b78
|
PAP-939: fixes
|
3 years ago |
|
Fatimah Alshammari
|
62167baec5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
3 years ago |
haroon amjad
|
ab0e388cbe
|
Merge branch 'Haroon' into 'development'
updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!385
|
3 years ago |
haroon amjad
|
4469ae1209
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
e679c7df0d
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
b90c189b6d
|
Merge branch 'Haroon' into 'development'
updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!384
|
3 years ago |
|
haroon amjad
|
75c0de091f
|
Merge branch 'Haroon' into 'development'
updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!383
|
3 years ago |
|
haroon amjad
|
44d59ed01a
|
updates & fixes
|
3 years ago |
|
Mohammad Aljammal
|
55f9bbcba4
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!379
|
3 years ago |
|
haroon amjad
|
b83318faf8
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!382
|
3 years ago |
|
haroon amjad
|
f8c295defe
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!381
|
3 years ago |
|
haroon amjad
|
8cb9a5e619
|
updates
|
3 years ago |
|
haroon amjad
|
faff3b90cb
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/core/service/er/am_service.dart
|
3 years ago |
|
haroon amjad
|
e9ec2e2faf
|
Ambulance request APIs revamped
|
3 years ago |
Zohaib Iqbal Kambrani
|
d9672c47a0
|
Merge branch 'development' into ZohaibIqbalKambrani
* development:
BUG FIXES
fix issues PAP-910,PAP-911
fix bugs pharmacy
Dental procedures implemented
Revert "Merge branch 'foote_in_all_pages' into 'development'"
fixed products issues
calendar events changes
Covid passport CR implemented in Covid test flow
doctor schedule
Covid certificate passport CR implemented
Covid Lab result generate certificate implemented
return bottom sheet inside appointments list
fix issues related to footer
remove unused code
remove footer from pharmacy pages
first step from add footer for all pages
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Fatimah Alshammari
|
f09cdd944d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Fatimah Alshammari
|
827d8733a1
|
fixed shopping cart issue
|
3 years ago |
Sultan khan
|
ba245fdfef
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!378
|
3 years ago |
Sultan Khan
|
1726f8cc11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
d1fc4751ad
|
BUG FIXES
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
d1c99d1d82
|
ER Average waiting time label applied
|
3 years ago |
|
haroon amjad
|
4c2b70fcb5
|
Merge branch 'development' into Haroon
|
3 years ago |
|
haroon amjad
|
21c3686e05
|
Ambulance request services revamping
|
3 years ago |
|
Mohammad Aljammal
|
d2d27631ac
|
Merge branch 'fix_30_Aug' into 'development'
fix issues PAP-910,PAP-911
See merge request Cloud_Solution/diplomatic-quarter!376
|
3 years ago |
|
Elham Rababh
|
2e2f7334d5
|
fix issues PAP-910,PAP-911
|
3 years ago |
|
Fatimah Alshammari
|
b6981299d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
239ad530ce
|
fixed isuues
|
3 years ago |
|
Mohammad Aljammal
|
36142f0f6d
|
Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
|
3 years ago |
|
Mohammad Aljammal
|
8abbb04f02
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!373
|
3 years ago |
mosazaid
|
a2e60e7584
|
fix bugs pharmacy
|
3 years ago |
|
haroon amjad
|
e9c26ee85f
|
Dental procedures implemented
|
3 years ago |