Commit Graph

966 Commits (ff508de9f78e295f331e3c3ce1d4d2e7b3d4dc2e)

Author SHA1 Message Date
Haroon Amjad 1cb7eb2afb CS branch changes 4 years ago
haroon amjad 19dadd2b35 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad a6c6651363 Updates & fixes 4 years ago
Zohaib Iqbal 259e27d4a7 Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/landing/fragments/home_page_fragment2.dart
#   lib/uitl/app_shared_preferences.dart
#   lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
haroon amjad 7f5f3ababe Registration fix 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 4 years ago
haroon amjad eb6b0aefc0 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!580
4 years ago
haroon amjad 7dbc00a864 ancillary orders update 4 years ago
haroon amjad 693f8cb090 Updates & fixes 4 years ago
Fatimah Alshammari f83adbc6ff Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari 0b21252ae7 fix category issue 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad e53ba65ddd Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
Fatimah Alshammari 0985436a10 fix translation issue 4 years ago
haroon amjad 4e3d99b007 Updates & fixes 4 years ago
haroon amjad 6d88607631 Updates & fixes 4 years ago
haroon amjad b15bd2362b Updates & fixes 4 years ago
haroon amjad 4c2410cfd5 Health plugin updated 4 years ago
haroon amjad 2670d0be57 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 330f2d6c86 Fixes & updates 4 years ago
Fatimah Alshammari b09b1e4732 six issues 4 years ago
Fatimah Alshammari ff7146e259 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
#	lib/pages/pharmacy/pharmacyContacts.dart
4 years ago
Fatimah Alshammari de86cffb8c fix lakum issues 4 years ago
haroon amjad 207525e31a Fixes 4 years ago
Fatimah Alshammari a55ca33c1b Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
Elham Rababh 16c1064a45 PMAU-19 4 years ago
haroon amjad 14b0c4c125 Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design

See merge request Cloud_Solution/diplomatic-quarter!550
4 years ago
Elham Rababh d6eeb02c91 fix on design 4 years ago
haroon amjad d1fcdcc898 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 4 years ago
Elham Rababh c6be53d800 first step from product details 4 years ago
Elham Rababh a71e7e4075 first step from product details 4 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Elham Rababh 12e47aba82 fix as first step 4 years ago
haroon amjad 17d569216d Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!539
4 years ago
Fatimah Alshammari d25f888c3e Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari a858d8764a fixed issues 4 years ago
devmirza121 f9e98c5fa4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 4 years ago
haroon amjad 4b446bb6d0 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sikander Saleem 407fb81038 Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Sikander Saleem 7df0fc59df laser images change & offer and packages 4 years ago
haroon amjad 5f0985adaa Updates 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
haroon amjad 68294690a1 prescription reminders added 4 years ago
devmirza121 f3b7a5c318 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 69b1dd6533 Medical Reminder 4 years ago