Commit Graph

458 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 0acc134e6e Updates & fixes 4 years ago
haroon amjad 7dbc00a864 ancillary orders update 4 years ago
haroon amjad 40d649dfa4 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 330f2d6c86 Fixes & updates 4 years ago
Elham Rababh 16c1064a45 PMAU-19 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 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
devmirza121 7d2a6c794b Clinic Search Dialog 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
Sikander Saleem 014074c414 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Elham Rababh 275871bc39 fix addcustomeraddress 4 years ago
hussam al-habibeh b09bc3bef9 merge dev to hussam pharmacy fix 4 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
haroon amjad 70304427f9 Doc specialty fix 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
devmirza121 e13d64dbf7 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 0b8600605b Health Calculator 1.0 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
haroon amjad e1e31de818 Lakum fixes 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
Fatimah Alshammari 28678633e7 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 4 years ago
haroon amjad 585e26b091 Registration fix 4 years ago
Sikander Saleem d6a5f68312 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Sikander Saleem cd81f05a8d laser clinic design (cont.) 4 years ago
Mirza.Shafique fa986476ee feedback status bar 4 years ago
Mohammad Aljammal 60d2496f0a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!472
4 years ago
Elham Rababh d486b76116 fix merge issue 4 years ago
Elham Rababh c97c39ea11 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
 Conflicts:
	lib/config/config.dart
	lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
4 years ago
haroon amjad fa5fd8e323 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 0853ecdc27 Body added 4 years ago
Mirza.Shafique 69db41364f icon fixs 4 years ago
Elham Rababh 616748dc6f fix proceed button 4 years ago
Mirza.Shafique 6af1747f12 live care design 3.0 4 years ago
Mirza.Shafique 4a8fc38626 live care design 2.0 4 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad b08dfb117c Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 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