Commit Graph

177 Commits (4dca22bec1fc3700f03a8ef65bca87c1e5a83d4e)

Author SHA1 Message Date
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
haroon amjad 43a672cc68 Updates & fixes 3 years ago
Sultan Khan e3a7c08e7c blood type changes 3 years ago
Sultan Khan 5c8b809e39 family file fixes 3 years ago
haroon amjad 2c4ff16f0c updates & fixes 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
mosazaid c1f3d3cc1c fixes 3 years ago
mosazaid acdd19eeed calling cart from pharmacy home and add provider to it 3 years ago
Sultan Khan 76e16594ba FAMILY FILES 3 years ago
mosazaid 185d66e342 fix bugs pharmacy home 3 years ago
Sikander Saleem f63293ef3e login input rtl 3 years ago
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
3 years ago
Sultan Khan 2ebfdcfdd7 login issue fixed 3 years ago
haroon amjad 298a8f4cff Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
#	lib/pages/DrawerPages/family/my-family.dart
3 years ago
Sultan Khan dd58b8637b bug fixs 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
haroon amjad f795ba24c5 updates & fixes 3 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 3 years ago
Sikander Saleem 120e6c166d Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem c84707ba3f monthly report request & sick leaves ui redesigned. 3 years ago
haroon amjad 9ffe064a3b updates & fixes 3 years ago
haroon amjad a10253736a Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
3 years ago
haroon amjad 44d59ed01a updates & fixes 3 years ago
Sultan Khan 52665fe217 login issue fixed 3 years ago
Sikander Saleem bf920d4188 find us redesigned. 3 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
3 years ago
mosazaid a2e60e7584 fix bugs pharmacy 3 years ago
Sikander Saleem ca363adee2 merge & improvements 3 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
3 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 3 years ago
Sikander Saleem 970887b0c5 changes 3 years ago
Sikander Saleem e9db30d3da otp clear when wrong code entered. 3 years ago
Sikander Saleem 5647ab75e5 improvements. 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
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
3 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 3 years ago
Zohaib Iqbal Kambrani c215b22cf7 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fixes
  registration
3 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 3 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 3 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 3 years ago
Sultan Khan b1453b52e3 registration 3 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 years ago
Sikander Saleem 70614d3555 merge improvements-1. 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 c07a8f54c7 merge changes-2 3 years ago
Sultan Khan 7c398ba40d bug fix 3 years ago