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 |
Haroon Amjad
|
19edcc210e
|
Rate appointment UI implemented
|
4 years ago |
Mohammad Aljammal
|
6339e30369
|
Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!412
|
4 years ago |
mosazaid
|
a9d0b7a14b
|
fix bugs pharmacy home
|
4 years ago |
hussam al-habibeh
|
d4fd95606e
|
add pharmacy icons for bottom nav
|
4 years ago |
Mirza.Shafique
|
f0566fb069
|
CMC Images
|
4 years ago |
Mirza.Shafique
|
ef8006efd8
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
# lib/pages/Covid-DriveThru/covid-payment-alert.dart
# lib/pages/Covid-DriveThru/covid-payment-details.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
|
4 years ago |
Mirza.Shafique
|
5b330b2a25
|
Covid New Design
|
4 years ago |
haroon amjad
|
0a90791aca
|
Push notification fixes
|
4 years ago |
Mirza.Shafique
|
275b95be99
|
Images deleted from assets
|
4 years ago |
haroon amjad
|
f795ba24c5
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
6191377914
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
|
4 years ago |
Sikander Saleem
|
d605084a91
|
appointment list and detail ui changed
|
4 years ago |
Zohaib Iqbal Kambrani
|
d33432d238
|
Covid Drive-Thru Questions Screen
|
4 years ago |
Sikander Saleem
|
bb18645d85
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
5ab9dd1761
|
Appointment screen Changes & improvements.
|
4 years ago |
Sultan Khan
|
57d87dfc03
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Sultan Khan
|
11ffed2ae3
|
bug fixes
|
4 years ago |
haroon amjad
|
0121337d1b
|
LiveCare Flow from book appointment flow implemented
|
4 years ago |
Sikander Saleem
|
197e7d5742
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
4 years ago |
Mirza.Shafique
|
d865e97ce1
|
Vital Sings Home Page
|
4 years ago |
Mirza.Shafique
|
29fd552874
|
Weight, height and blood pressure on Home Page
|
4 years ago |