Commit Graph

3163 Commits (7fc47ebf341f6aaa6b8f61ba8c676799e09fa7d6)
 

Author SHA1 Message Date
hussam al-habibeh cb2b9db0ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago
Mirza.Shafique bc246b2f9f Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique f0566fb069 CMC Images 4 years ago
Mohammad Aljammal 767a4fc835 Merge branch 'fix_product_tile' into 'development'
Fix product tile

See merge request Cloud_Solution/diplomatic-quarter!399
4 years ago
Mohammad Aljammal b53bd5fd62 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago
Mohammad Aljammal 7cc5ec58d1 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!398
4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
hussam al-habibeh 2265487ccd remove cart cout & icon from AppBar 4 years ago
Elham Rababh 769dc4e0ac first step of ProductDetailPage refactor 4 years ago
Elham Rababh a269b514a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
haroon amjad ab8030416c Updates & fixes 4 years ago
hussam al-habibeh 806e07e4e6 products categories page fix 4 years ago
Mirza.Shafique 9b160958bb Covid New Design 3 4 years ago
mosazaid f329eea798 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid 01a77d5352 fix bugs pharmacy 4 years ago
Mohammad Aljammal d64e2a469f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Mohammad Aljammal 8ecd4a24d8 fix product tile 4 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
Mohammad Aljammal edffa96925 Merge branch 'brands' into 'development'
Brands

See merge request Cloud_Solution/diplomatic-quarter!396
4 years ago
Elham Rababh db277a62f5 fix brand design 4 years ago
Elham Rababh a6a7ed4e1b remove cart from product details 4 years ago
Elham Rababh 9b42d411ca remove cart from product details 4 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad fa8c739b2c updates & fixes 4 years ago
Mirza.Shafique 6e244a55f5 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique 7563a2870b Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique b80e2ea16e Covid New Design 2 4 years ago
Sikander Saleem 74432b6bbb cmc order log ui changes 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
4 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 4 years ago
Elham Rababh cc88f0f81e first step of fixing 4 years ago
Sikander Saleem 9f8bcc63f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/prescriptions/prescriptions_history_details_page.dart
4 years ago
Sikander Saleem 4ce941e01e prescription order log detail view change on arabic 4 years ago
Sikander Saleem c96fa62363 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem e36e0ce0b7 h20 bottom nav bar bug fix (happen in release mode) 4 years ago
hussam al-habibeh 7427cd68ff fix bottom nav bar ui 4 years ago
haroon amjad 19e6954bc8 updates 4 years ago
haroon amjad c3feed771c merge conflicts resolved 4 years ago
haroon amjad 5c64ce4795 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/MyAppointments/SchedulePage.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan khan 2ae5c8f657 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!395
4 years ago
haroon amjad b0f4cfcff3 Family file fixes 4 years ago
Sultan Khan e48d4e5eb2 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan c54146b3ba sechedule fix 4 years ago
haroon amjad 2fc5425884 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad f55fbd1cc2 UI fixes 4 years ago