Commit Graph

68 Commits (ff55ae1908d13d0dee8dd2d4739f56eeb2ae73e6)

Author SHA1 Message Date
umasoodch 0431eb1ac8 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal 0d098def04 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
 Conflicts:
	assets/app_icons/config.json
	assets/app_icons/fonts/DQIcons.ttf
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/d_q_icons_icons.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/uitl/utils.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal 939840bbe7 fix master 5 years ago
Mohammad Aljammal 3c1257b379 fix Medicine Search 5 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 5 years ago
Mohammad Aljmma 20ece68ddb fix issue # 6 & 7 & 8 5 years ago
Zohaib Kambrani 0c71fbad5f no message 5 years ago
haroon amjad 9868a43e7b Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/home_page.dart
5 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 5 years ago
Elham Rababah fa88e9055f make loader center 5 years ago
enadhilal 7ca6e6caa7 fix widget of product_tile 5 years ago
enadhilal d6d1c26c9a add product_tile widget 5 years ago
enadhilal 068382e76f add call for backend service 5 years ago
enadhilal 815bc39268 add wishlist page 5 years ago
hussam al-habibeh e92cb2e1ac Design and return Pharmacy List 6 years ago
hussam al-habibeh 31d2816e64 design for search medicine and return medicine list 6 years ago