haroon amjad
|
6c9ab32d98
|
Native changes
|
1 year ago |
Aamir Muhammad
|
77651f9652
|
Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/project_view_model.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/login/confirm-login.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/push-notification-handler.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/uitl/utils_new.dart
# lib/widgets/avatar/large_avatar.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/bottom_options/BottomSheet.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
haroon amjad
|
f2bf57f8cc
|
updates
|
2 years ago |
haroon amjad
|
128bd2ec54
|
Inpatient services implementation
|
3 years ago |
haroon amjad
|
4ecab57173
|
Pharma LiveCare updates
|
3 years ago |
haroon amjad
|
52070c8f94
|
Updates & fixes
|
3 years ago |
haroon amjad
|
3709ebcb32
|
Updates
|
3 years ago |
haroon amjad
|
21cf9da900
|
HMS Core & LiveCare Schedule fixes
|
3 years ago |
haroon amjad
|
b641f5b6a3
|
Laser Male back image added
|
3 years ago |
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
4 years ago |
haroon amjad
|
907181a56c
|
Merge branch 'development_v2.5' into haroon_development_2.5
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
742d06976f
|
no message
|
4 years ago |
Haroon Amjad
|
1cb7eb2afb
|
CS branch changes
|
4 years ago |
haroon amjad
|
ea8d700d22
|
updates & fixes
|
4 years ago |
haroon amjad
|
efced34ffa
|
Updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
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
|
9d9377d59f
|
fix issues
|
4 years ago |
haroon amjad
|
75423e5501
|
Updates
|
4 years ago |
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
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 |
Sikander Saleem
|
53e0165286
|
improvements.
|
4 years ago |
Sikander Saleem
|
7df0fc59df
|
laser images change & offer and packages
|
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 |
devmirza121
|
0b8600605b
|
Health Calculator 1.0
|
4 years ago |
haroon amjad
|
8c99bba17b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mohammad Aljammal
|
f9e33e7212
|
Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0
See merge request Cloud_Solution/diplomatic-quarter!467
|
4 years ago |
haroon amjad
|
5692bc66a9
|
Removing anatomy pub from project
|
4 years ago |
haroon amjad
|
0853ecdc27
|
Body added
|
4 years ago |
Zohaib Iqbal Kambrani
|
94a5cac27d
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
LiveCare Schedule fixes
improvements.
live care design 3.0
dialog ui changes in wallet & improvements.
LiveCare Schedule API fix
live care design 2.0
Health converters UI done
Health Calculators APIs updated
Translation updates
SessionID update
live care design 1.0
Updates & fixes
blood sugar dialog improvement.
# Conflicts: Rseloved
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
9d71793e88
|
no message
|
4 years ago |
Mirza.Shafique
|
cacdd5907c
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
fd26a59b2d
|
live care design 1.0
|
4 years ago |
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
9fd2304d33
|
tamara.
|
4 years ago |
haroon amjad
|
e58b925382
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
|
4 years ago |
Fatimah Alshammari
|
a4f404386b
|
fixed issues
|
4 years ago |
haroon amjad
|
1fff2dad25
|
Smartwatch updates
|
4 years ago |
Mirza.Shafique
|
0ba4e9047b
|
design fixes 1.0
|
4 years ago |
Sikander Saleem
|
706832a1cb
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
Mirza.Shafique
|
ab6f7b8915
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Mirza.Shafique
|
eeaf7d9d2f
|
HMG Services Detail View
|
4 years ago |
Sultan Khan
|
4780039cc7
|
family file change
|
4 years ago |
haroon amjad
|
58c78656bf
|
Rating dialog updates
|
4 years ago |
haroon amjad
|
b475adb5c3
|
Updates & fixes
|
4 years ago |
Mirza.Shafique
|
06c5ee269b
|
Bug Fixes
|
4 years ago |