Commit Graph

2379 Commits (0d29ba70f5c4e5105264e46f79099f042f39e02b)
 

Author SHA1 Message Date
Mohammad Aljammal 0d29ba70f5 Merge branch 'Oct_fixes' into 'development_new_design_2.0'
fix proceed button

See merge request Cloud_Solution/diplomatic-quarter!471
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 0c2e3f772b Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!468
4 years ago
haroon amjad 89505510e3 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!469
4 years ago
Mirza.Shafique f547dc105c Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 69db41364f icon fixs 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
Fatimah Alshammari e6378b7ada fix issues 4 years ago
Elham Rababh 616748dc6f fix proceed button 4 years ago
haroon amjad c8e62e986c Merge branch 'haroon-new-design' into 'development_new_design_2.0'
LiveCare Schedule fixes

See merge request Cloud_Solution/diplomatic-quarter!466
4 years ago
haroon amjad 57ea450662 LiveCare Schedule fixes 4 years ago
Sikander Saleem 455f65a5e5 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem d2223da3c2 improvements. 4 years ago
Mirza.Shafique f56ae8ff5b Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 6af1747f12 live care design 3.0 4 years ago
Sikander Saleem 8c27773f7f Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 4 years ago
haroon amjad 853ca033d2 LiveCare Schedule API fix 4 years ago
Mirza.Shafique a805273049 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 4a8fc38626 live care design 2.0 4 years ago
haroon amjad ccc08c00ae Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!465
4 years ago
haroon amjad 3a7d5e3d66 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 2a212149ed Health converters UI done 4 years ago
haroon amjad 73822300f9 Health Calculators APIs updated 4 years ago
haroon amjad d4ffc76733 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Health Calculators APIs updated

See merge request Cloud_Solution/diplomatic-quarter!464
4 years ago
haroon amjad b7bf99c862 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!463
4 years ago
haroon amjad 7123ed34ab Translation updates 4 years ago
haroon amjad fd07d543fa Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad cb69684bb8 SessionID update 4 years ago
Mirza.Shafique cacdd5907c Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique fd26a59b2d live care design 1.0 4 years ago
haroon amjad 360acd487e Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!462
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 9c1f5ab465 Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!461
4 years ago
Zohaib Iqbal Kambrani 4c5b9b4244 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  Translation update
  Fixes & updates
  Blood donation fixes
  Pharmacy Payment method design fix, Blood Donation fix
  improvements
  blood donation dialog change & improvements.
  Pharmacy updates
  Pharmacy prescriptions page design
  LiveCare design fixes
4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 4 years ago
Sikander Saleem c1ce3a0489 blood sugar dialog improvement. 4 years ago
Elham Rababh 2c30b5a494 fix issues 4 years ago
Fatimah Alshammari c242910aa2 fixed issues 4 years ago
haroon amjad d38de8c494 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!460
4 years ago
haroon amjad 5474ecf2cc Translation update 4 years ago
haroon amjad b53d912996 Fixes & updates 4 years ago
haroon amjad df7d8a8603 Blood donation fixes 4 years ago
haroon amjad 924f685342 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
Sikander Saleem ebb4c026c6 improvements 4 years ago
Sikander Saleem d8476df6dd Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
4 years ago
Sikander Saleem 4858f8883a blood donation dialog change & improvements. 4 years ago