Commit Graph

2238 Commits (1dcfe44e969014aae019024d9008600bb68f64e7)
 

Author SHA1 Message Date
Sultan Khan a39658206d my family 3 years ago
haroon amjad 40cbca565a fixes 3 years ago
haroon amjad e1f5eb8b83 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 8ea6a5de04 localization fix 3 years ago
Sultan khan f2397246f9 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!439
3 years ago
Sultan Khan 160049973e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan e3a7c08e7c blood type changes 3 years ago
Sikander Saleem 54c3beadf2 improvements. 3 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 58c78656bf Rating dialog updates 3 years ago
Mirza.Shafique dde16a13fe General page in profile 3 years ago
Sikander Saleem 21863cfe06 improvements. 3 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
3 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 3 years ago
haroon amjad 32e5f43e96 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
HarHaroon new design

See merge request Cloud_Solution/diplomatic-quarter!438
3 years ago
haroon amjad 4a2e01b8b1 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad b475adb5c3 Updates & fixes 3 years ago
Sultan khan c88399c751 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family file fixes

See merge request Cloud_Solution/diplomatic-quarter!436
3 years ago
Sultan Khan 5c8b809e39 family file fixes 3 years ago
Fatimah Alshammari d8db5ad590 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/pharmacies/screens/cart-order-page.dart
3 years ago
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 3 years ago
hussam al-habibeh a8fb7152b1 add to cart fix 3 years ago
hussam al-habibeh 75ef3fde80 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
 Conflicts:
	lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
3 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 3 years ago
Mohammad Aljammal 0590642854 Merge branch 'cart' into 'development'
Cart

See merge request Cloud_Solution/diplomatic-quarter!434
3 years ago
hussam al-habibeh 66acda38a3 add to cart fix 3 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 3 years ago
Elham Rababh 2526d6bc6f fix issue in cart page 3 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 3 years ago
haroon amjad 6902e6529c Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan khan 5dbb257194 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!433
3 years ago
Sikander Saleem f6b96dcb7b Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByDoctor.dart
3 years ago
Sultan Khan 3b4e03c618 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan b5cd6afa4b family file fixs 3 years ago
Sikander Saleem c9662c7451 schedule appointment navigation fix. 3 years ago
haroon amjad 0a9d0e5eaa fixes 3 years ago
Mirza.Shafique 6261f01ab6 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
Mirza.Shafique 9c7e8e3637 Back Button on Landing Page 1 3 years ago
haroon amjad 6d725f807b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!432
3 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
3 years ago
Mohammad Aljammal 26c83cd93d Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!430
3 years ago
Sikander Saleem f509679173 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
haroon amjad cbf2e84959 fixes 3 years ago
Sikander Saleem 1346eab593 h2o today page, prescription & schedule appointment improvements. 3 years ago
Sultan khan c99e32e129 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!431
3 years ago
haroon amjad 022b1bd000 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan Khan 02f5b43b64 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan ca70926050 family file fixes 3 years ago
haroon amjad cb220031dd Updates & fixes 3 years ago
mosazaid b779c250a4 pharmacy cart and wishlist fixes 3 years ago