Commit Graph

399 Commits (7c4edf971af295a7c2e0dc8f2bdd0a741f127607)

Author SHA1 Message Date
Sikander Saleem 14ccae993e my tracker tabs switching issue fixed. 4 years ago
Mirza.Shafique 4cf9a9b2c2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mirza.Shafique 3dbef4095f Payment page design 4 years ago
Sikander Saleem ba4792cd38 merge improvements. 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
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 4 years ago
Sultan Khan a39658206d my family 4 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
4 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
haroon amjad 22c6a8ce42 no message 4 years ago
Sultan Khan 5fe0214e04 bug fixes 4 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
Sultan Khan c54146b3ba sechedule fix 4 years ago
Sultan Khan d535cb421d bug fixes 4 years ago
Sultan Khan 2ebfdcfdd7 login issue fixed 4 years ago
Sultan Khan 1d36076320 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan dd58b8637b bug fixs 4 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 4 years ago
Sultan Khan c6404a2a0b tracker services 4 years ago
haroon amjad 2669378da4 Insurance Approval API updated 4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
haroon amjad 9ffe064a3b updates & fixes 4 years ago
Sultan Khan c6e7c8cd37 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan 52665fe217 login issue fixed 4 years ago
Sikander Saleem a61fea551c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique e1e3741abf Event Reminder 4 years ago
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 4 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 4 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!375
4 years ago
mosazaid a2e60e7584 fix bugs pharmacy 4 years ago
haroon amjad e9c26ee85f Dental procedures implemented 4 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 4 years ago
haroon amjad 5f521556dc Dental flow fixes 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
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari 74d0826342 fixed issues 5 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 5 years ago
hussam al-habibeh 8f5fef87e9 add blood pressure translation issue 5 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
5 years ago
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
5 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 5 years ago
Zohaib Iqbal Kambrani c215b22cf7 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fixes
  registration
5 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 5 years ago
Sultan Khan 1586f02542 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 6b7eaaafb9 fixes 5 years ago