Commit Graph

2238 Commits (1dcfe44e969014aae019024d9008600bb68f64e7)
 

Author SHA1 Message Date
haroon amjad 1dcfe44e96 Translations 3 years ago
haroon amjad 2ed8008790 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
haroon amjad 832d48971f updates 3 years ago
Mirza.Shafique 4cf9a9b2c2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique 3dbef4095f Payment page design 3 years ago
Sikander Saleem ba4792cd38 merge improvements. 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
haroon amjad a4800ce7ca Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!446
3 years ago
haroon amjad 43a672cc68 Updates & fixes 3 years ago
haroon amjad 5d44fff28d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 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
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 3 years ago
haroon amjad ed4fca2d4c Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!444
3 years ago
haroon amjad 2709b177c6 Merge branch 'pharmacy_fix' into 'development'
add to cart fix

See merge request Cloud_Solution/diplomatic-quarter!435
3 years ago
haroon amjad babb48b1db base app client changes 3 years ago
haroon amjad 68642c3ba4 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!445
3 years ago
haroon amjad cf7291e379 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 03882c166c Translation & UI updates 3 years ago
haroon amjad 90843252c3 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
#	lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 3 years ago
Sultan khan e4c8575a7f Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!443
3 years ago
Sultan Khan 18f35a22bb FAMILY FILE 3 years ago
Sultan Khan 5a9ab457e5 family files 3 years ago
haroon amjad 6d3ead24e1 localisation update 3 years ago
Sultan Khan a31f55aaa7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 4780039cc7 family file change 3 years ago
Mirza.Shafique 05a6860081 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique e1b79ef5c1 E-Refreal design 3 years ago
Sikander Saleem ecb6315f9c blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). 3 years ago
haroon amjad 2db050a228 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad e564cdc7e5 Updates & fixes 3 years ago
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 3 years ago
haroon amjad fc67d0d14d Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!442
3 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 3 years ago
Sultan Khan 448a3aaa48 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 881644a22e family files changes 3 years ago
Fatimah Alshammari e2763a5bd5 fixed cart shopping issues 3 years ago
haroon amjad 6cd2f65ce8 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 9d30bf63d0 Notification page fix 3 years ago
Sikander Saleem ae85f75e81 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/feedback/status_feedback_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 43c67a5a84 Notifications UI fix 3 years ago
Sikander Saleem a026fbf940 feedback status added. 3 years ago
haroon amjad f60684ad08 Notifications UI redesigned 3 years ago
haroon amjad 8cf6642c79 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 803f5a786b Blood pressure chart fix 3 years ago
Sultan khan f5b17444fe Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family

See merge request Cloud_Solution/diplomatic-quarter!441
3 years ago
haroon amjad a996f83ee1 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!440
3 years ago
haroon amjad 07a98d75c6 My tracker fixes 3 years ago