Commit Graph

207 Commits (680dcfc255de48abc64d1d492824729c2639946c)

Author SHA1 Message Date
Mirza.Shafique 0ba4e9047b design fixes 1.0 3 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
3 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 3 years ago
Sultan Khan 4780039cc7 family file change 3 years ago
haroon amjad 58c78656bf Rating dialog updates 3 years ago
haroon amjad b475adb5c3 Updates & fixes 3 years ago
Mirza.Shafique 06c5ee269b Bug Fixes 3 years ago
Haroon Amjad 19edcc210e Rate appointment UI implemented 3 years ago
Mohammad Aljammal 6339e30369 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!412
3 years ago
mosazaid a9d0b7a14b fix bugs pharmacy home 3 years ago
hussam al-habibeh d4fd95606e add pharmacy icons for bottom nav 3 years ago
Mirza.Shafique f0566fb069 CMC Images 3 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
3 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 3 years ago
haroon amjad 0a90791aca Push notification fixes 3 years ago
Mirza.Shafique 275b95be99 Images deleted from assets 3 years ago
haroon amjad f795ba24c5 updates & fixes 3 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
3 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 3 years ago
Zohaib Iqbal Kambrani d33432d238 Covid Drive-Thru Questions Screen 3 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
3 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 3 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 11ffed2ae3 bug fixes 3 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 3 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
3 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 3 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 3 years ago
haroon amjad a32501f3dc My invoices implementation continued 3 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 3 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 3 years ago
Mirza.Shafique 99c6318410 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 2d62822536 Medical Profile Page improvements 3 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Sikander Saleem 889ae24f07 merge changes-3 3 years ago
Sikander Saleem a5d40f090a improvements-test 3 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 53e4815866 no auth ui modifications 3 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 3 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 3 years ago
Sultan Khan 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
mosazaid 2e33c2b240 fix bugs 3 years ago
Mirza.Shafique b0dfbef52a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique d37f225c1b Home page 1.2 3 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 3 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 9acb5b087d bug fixes 3 years ago