haroon amjad
|
32edb2e71e
|
updates
|
4 years ago |
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
4 years ago |
haroon amjad
|
ac5077e9e7
|
Translation fixes
|
4 years ago |
haroon amjad
|
736edad018
|
OB Gyne appo updates
|
4 years ago |
haroon amjad
|
4b4ac4819f
|
no message
|
4 years ago |
haroon amjad
|
7f5f3ababe
|
Registration fix
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
4 years ago |
haroon amjad
|
e45c2c5652
|
covid & pharmacy updates
|
4 years ago |
haroon amjad
|
eb6b0aefc0
|
Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!580
|
4 years ago |
haroon amjad
|
693f8cb090
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
f83adbc6ff
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
4 years ago |
Fatimah Alshammari
|
0b21252ae7
|
fix category issue
|
4 years ago |
haroon amjad
|
e53ba65ddd
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
Fatimah Alshammari
|
0985436a10
|
fix translation issue
|
4 years ago |
haroon amjad
|
4e3d99b007
|
Updates & fixes
|
4 years ago |
haroon amjad
|
b15bd2362b
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
b09b1e4732
|
six issues
|
4 years ago |
Fatimah Alshammari
|
ff7146e259
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
# lib/pages/pharmacy/pharmacyContacts.dart
|
4 years ago |
Fatimah Alshammari
|
de86cffb8c
|
fix lakum issues
|
4 years ago |
haroon amjad
|
207525e31a
|
Fixes
|
4 years ago |
Fatimah Alshammari
|
a55ca33c1b
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
Fatimah Alshammari
|
bc9fc5a878
|
fix issue
|
4 years ago |
haroon amjad
|
14b0c4c125
|
Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design
See merge request Cloud_Solution/diplomatic-quarter!550
|
4 years ago |
Elham Rababh
|
d6eeb02c91
|
fix on design
|
4 years ago |
haroon amjad
|
d1fcdcc898
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
4 years ago |
Elham Rababh
|
c6be53d800
|
first step from product details
|
4 years ago |
Elham Rababh
|
a71e7e4075
|
first step from product details
|
4 years ago |
Fatimah Alshammari
|
d25f888c3e
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/lakum-main-page.dart
|
4 years ago |
Fatimah Alshammari
|
a858d8764a
|
fixed issues
|
4 years ago |
haroon amjad
|
4b446bb6d0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sikander Saleem
|
407fb81038
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
4 years ago |
Sikander Saleem
|
7df0fc59df
|
laser images change & offer and packages
|
4 years ago |
haroon amjad
|
5f0985adaa
|
Updates
|
4 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
4 years ago |
haroon amjad
|
68294690a1
|
prescription reminders added
|
4 years ago |
Sikander Saleem
|
00f63cd288
|
Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
9a82b9c369
|
laser clinic added.
|
4 years ago |
Fatimah Alshammari
|
adfa707eda
|
fix issue
|
4 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
4 years ago |
haroon amjad
|
a74a6d5bc8
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!499
|
4 years ago |
devmirza121
|
dc3d3bc772
|
Health Calculator 5.0
|
4 years ago |
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
4 years ago |
devmirza121
|
590b795356
|
Health Calculator 4.0 marge
|
4 years ago |
devmirza121
|
a131f24952
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
# lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
# lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
# lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
# lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
# lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
devmirza121
|
1d1708bdcc
|
Health Calculator 4.0
|
4 years ago |
haroon amjad
|
75989bdc01
|
Health Calculators translations
|
4 years ago |
haroon amjad
|
ea745f1b9f
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
efe8dea9a9
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!489
|
4 years ago |
haroon amjad
|
502c7fd3de
|
Offers & discounts UI updating
|
4 years ago |