Commit Graph

2588 Commits (e67e17c2ba75dae9ab7dbe885d87b4168438183b)
 

Author SHA1 Message Date
haroon amjad e67e17c2ba Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7d29ee4468 cart order page fixes 4 years ago
haroon amjad 6d970800f9 Book Appo fix 4 years ago
haroon amjad e463b4fd25 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!533
4 years ago
Fatimah Alshammari a2a6da1527 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 5dc1561992 fixed notify issue 4 years ago
haroon amjad 7f3340cace Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!532
4 years ago
haroon amjad d0c96d245b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 009abd0440 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!530
4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Fatimah Alshammari 08a895732c Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 468d64a1e0 fix design issue 4 years ago
haroon amjad 7c6fa89d63 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7ffc467552 Lakum fixes 4 years ago
haroon amjad 91fd8f8078 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!529
4 years ago
Fatimah Alshammari 998c1af0f7 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari ae3bb1bb2d fix issues 4 years ago
haroon amjad ed65b38dd9 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!528
4 years ago
haroon amjad ab7162f164 Base app client updates 4 years ago
haroon amjad 68294690a1 prescription reminders added 4 years ago
haroon amjad ff0e878bf2 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a400bc965d Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!527
4 years ago
devmirza121 7f8a0320a7 Medical Reminder 1.0 4 years ago
haroon amjad 61a406085b lakum fixes 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
haroon amjad 975fe6ca7b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!525
4 years ago
haroon amjad 47b7b0db58 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
haroon amjad 943f9425cb Merge branch 'login_design_sikander' into 'development_new_design_2.0'
Laser & Clinic (Conflict Resolved)

See merge request Cloud_Solution/diplomatic-quarter!524
4 years ago
Sikander Saleem 044c442ce0 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/parent_categorise_page.dart
4 years ago
Sikander Saleem 5a8c887117 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
haroon amjad 615e39baf0 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!523
4 years ago
Fatimah Alshammari bdf3429502 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
haroon amjad 8c9ff27515 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 777d88be30 updates 4 years ago
haroon amjad 87a997d156 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

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

See merge request Cloud_Solution/diplomatic-quarter!520
4 years ago
Fatimah Alshammari 54ff9931cb fixed arrow issue order page 4 years ago
Sikander Saleem 084c82d7a8 improvements 4 years ago
Sikander Saleem 00f63cd288 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/uitl/translations_delegate_base.dart
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
hussam al-habibeh 7607631052 sub categories pagnation 4 years ago
hussam al-habibeh c0e86721f6 Merge branch 'nov_fixes' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
hussam al-habibeh db1820fda4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 4 years ago
haroon amjad fb6183a48b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 4 years ago
Fatimah Alshammari 3bfca80ab9 fixed issue 4 years ago
Elham Rababh 258e107e1b fix cart order page 4 years ago
hussam al-habibeh ff86dcbdc0 sub categories pagnation 4 years ago