Commit Graph

180 Commits (693f8cb09005f2ae21d97d03ca88005f426b79cc)

Author SHA1 Message Date
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
Sikander Saleem 3ad90f1a01 Merge branch 'development_new_design_2.0' into development_v2.5 4 years ago
haroon amjad 7733c74f00 Updates & fixes 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
haroon amjad 207525e31a Fixes 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 years ago
haroon amjad 90b821a37d Offers & packages UI completed 4 years ago
Haroon Amjad d5c68c5032 Packages & offers design 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
Fatimah Alshammari 42e74759e4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
4 years ago
haroon amjad cb69684bb8 SessionID update 4 years ago
Elham Rababh 2c30b5a494 fix issues 4 years ago
haroon amjad 6f92a093ab Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
Zohaib Iqbal Kambrani 8b1ac05012 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
  app bar back icon issue
  improvements
  emergency nearest ui changes
  Zoom Avatar implementation
  no message
  Child Vaccine 3
  register
  register page
  Working on Health data
  Child Vaccine 2
  registration
  Ereferral fixed, HHC moved to new APIs, Notification new design implemented
  registration done
  Child Vaccine 1.0
  In App Review
  In App Review
  oder log merge fix
  design fixes 3
  Chart fix & In-App update implemented
  design fixes 1.1
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad 1fff2dad25 Smartwatch updates 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad d409875741 Smartwatch updates 4 years ago
haroon amjad 1f077f71f8 no message 4 years ago
haroon amjad 2032053cb7 Working on Health data 4 years ago
Haroon Amjad 59dac89118 updates 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
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
haroon amjad babb48b1db base app client changes 4 years ago
haroon amjad 03882c166c Translation & UI updates 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 years ago
haroon amjad 7264d03818 Family Files previleges fix 4 years ago
haroon amjad 2c4ff16f0c updates & fixes 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
haroon amjad a4a2389a78 updates & fixes 4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
haroon amjad 304ba8afa4 bas app client fixes 4 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
4 years ago
Sultan Khan dd58b8637b bug fixs 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 4 years ago
hussam al-habibeh 981e78936e jira bugs 5 years ago
Sikander Saleem 3128810fb0 improvements. 5 years ago
Sultan Khan 724e0098fb bug fixes 5 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 5 years ago
Mohammad Aljammal 126fad61c0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
 Conflicts:
	lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago