2629 Commits (dev_3.3_AmbulanceRequestCR)

Author	SHA1	Message	Date
haroon amjad	a20d6c7c28	Livecare updates	3 years ago
haroon amjad	4ecab57173	Pharma LiveCare updates	3 years ago
haroon amjad	da423fe12a	Pharma LiveCare updates	3 years ago
haroon amjad	f686013692	Pharma LiveCare updates	3 years ago
haroon amjad	4f50c3ff8e	Pharmacy LiveCare revamped	3 years ago
haroon amjad	74b0acefd3	Updates & fixes	3 years ago
haroon amjad	8e14084467	updates	3 years ago
haroon amjad	98abc5a069	updates	3 years ago
Sultan khan	9683b3f42f	Dubai Reminder fixed.	3 years ago
haroon amjad	6bdb7a3305	Updates & fixes	3 years ago
haroon amjad	0e01835327	Target SDK & Compile SDK bumped to 33	3 years ago
haroon amjad	e50a67ea12	Vida Plus changes	3 years ago
haroon amjad	2e72d6a550	LiveCare contact added	3 years ago
haroon amjad	aafdf3760d	added sick leave status text & color	3 years ago
haroon amjad	c8ec536267	Sickleave CR done	3 years ago
haroon amjad	e5e5bb5352	Dental book appointment changes	3 years ago
haroon amjad	25af2c23ef	Sick leave CR, LiveCare support call, Appo calendar changes	3 years ago
haroon amjad	c289afb186	Opentok fixes	3 years ago
haroon amjad	22274ebbb0	updates & fixes	3 years ago
Zohaib Iqbal Kambrani	35b129fb68	migrated project to latest flutter sdk	3 years ago
haroon amjad	22a0e456bc	Manual Insurance Updates, Service ID fixes, Tamara Fixes	3 years ago
haroon amjad	52070c8f94	Updates & fixes	3 years ago
haroon amjad	e80ac2481a	Ancillary order & manual insurance update	3 years ago
haroon amjad	442a94ac08	Updates & fixes	3 years ago
haroon amjad	3709ebcb32	Updates	3 years ago
haroon amjad	f6191d9bf7	updates & fixes	3 years ago
haroon amjad	7ae4e7d616	updates & fixes	3 years ago
haroon amjad	d75615a2eb	Updates & fixes	3 years ago
haroon amjad	e03412214e	Ambulance request fixes	3 years ago
haroon amjad	106334c9cf	updates & fixes	3 years ago
haroon amjad	dfa88b7de7	Updates, fixes & release VersionID 9.1	3 years ago
haroon amjad	21cf9da900	HMS Core & LiveCare Schedule fixes	3 years ago
haroon amjad	58a6dc6a6f	Tamara & Apple Pay Fixes + Other Updates	3 years ago
haroon amjad	8be9d3ae6e	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5	3 years ago
haroon amjad	833818e6e3	Rad & Lab email issues fixes	3 years ago
Zohaib Iqbal Kambrani	8c29b5f8e6	WebRTC or Opentok	3 years ago
Zohaib Iqbal Kambrani	8bd5a71318	Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5 ... * development_v2.5: Timezone fixes & Activate/Deactivate file changes Updates Timezone Updates CMC Updates updates Updates Laser Male back image added Updates & fixes E-Cens sign off Analtyics at registration and liveacare payment fail analytics events update Analytics no message Updates & fixes ED Online Check-In Calendar fixes updates & fixes Analytics statements align to bottom of block Analytics for login registration updates # Conflicts: Fixed # lib/analytics/flows/appointments.dart	3 years ago
Zohaib Iqbal Kambrani	1aabf08417	no message	3 years ago
haroon amjad	2ba744c3a6	Timezone fixes & Activate/Deactivate file changes	3 years ago
haroon amjad	b756bf8caf	Updates	3 years ago
haroon amjad	3896f02d13	Timezone Updates	3 years ago
haroon amjad	ca43849d9d	CMC Updates	3 years ago
haroon amjad	11529c65c5	updates	3 years ago
haroon amjad	4ba229c436	Updates	3 years ago
haroon amjad	eb3f5b5cb5	Updates & fixes	3 years ago
Zohaib Iqbal Kambrani	e615ca1a16	no message	3 years ago
haroon amjad	72654757c4	Merge branch 'development_v2.5' into 'zik_development_v2.5' ... # Conflicts: # lib/pages/login/confirm-login.dart	3 years ago
haroon amjad	7018696328	E-Cens sign off	3 years ago
Zohaib Iqbal Kambrani	a69e0da77d	Merge branch 'development_v2.5' into zik_development_v2.5 ... * development_v2.5: analytics events update	3 years ago
Zohaib Iqbal Kambrani	7051b3ed63	Analtyics at registration and liveacare payment fail	3 years ago
haroon amjad	4cbccd8efb	analytics events update	3 years ago
Zohaib Iqbal Kambrani	29c6841888	Analytics	3 years ago
Zohaib Iqbal Kambrani	a01b8b82da	no message	3 years ago
Zohaib Iqbal Kambrani	86363a15d6	Merge branch 'development_v2.5' into zik_development_v2.5 ... * development_v2.5: Updates & fixes ED Online Check-In Calendar fixes updates & fixes	3 years ago
Zohaib Iqbal Kambrani	5c32e488d0	no message	3 years ago
haroon amjad	3396b4253b	Updates & fixes	3 years ago
Zohaib Iqbal Kambrani	6cd660184a	no message	3 years ago
haroon amjad	8b7a6e7689	ED Online Check-In	3 years ago
Zohaib Iqbal Kambrani	f42e2fb652	Revert "no message" ... This reverts commit da7884ff61.	3 years ago
haroon amjad	bbb99667f8	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5	3 years ago
haroon amjad	f9a733884d	Calendar fixes	3 years ago
haroon amjad	27c6837f25	updates & fixes	3 years ago
Zohaib Iqbal Kambrani	1c6a62776c	Analytics statements align to bottom of block	3 years ago
Zohaib Iqbal Kambrani	1523fd5ade	Analytics for login registration	3 years ago
Zohaib Iqbal Kambrani	da7884ff61	no message	3 years ago
haroon amjad	f50bfda330	updates	3 years ago
Zohaib Iqbal Kambrani	a0e619eec6	fixes	3 years ago
Zohaib Iqbal Kambrani	88b904a4b8	analytics changes	3 years ago
Zohaib Iqbal Kambrani	fb4fb8d29e	Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5 ... * development_v2.5: Google analytics events update Updates Updates & fixes DateTime Fixes HHC Fixes updates & fixes Updates & fixes # Conflicts: # lib/config/config.dart # lib/pages/landing/fragments/home_page_fragment2.dart	3 years ago
Zohaib Iqbal Kambrani	8a95daff7c	Google analytics events update	3 years ago
Zohaib Iqbal Kambrani	e107d8a1a4	no message	3 years ago
haroon amjad	1faf27959a	Updates	3 years ago
haroon amjad	9057a96d7f	Updates & fixes	3 years ago
haroon amjad	842e099953	DateTime Fixes	3 years ago
haroon amjad	a9e48e487f	HHC Fixes	3 years ago
haroon amjad	f1129cc14c	updates & fixes	3 years ago
Zohaib Iqbal Kambrani	612d9eb019	Project Filter Applied on Packages & Offers	3 years ago
haroon amjad	fd96869d89	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 ... # Conflicts: # lib/pages/landing/fragments/home_page_fragment2.dart	3 years ago
haroon amjad	c3538ebdb6	Updates & fixes	3 years ago
Zohaib Iqbal Kambrani	94a99a911e	Offer And Packages (View Only)	3 years ago
haroon amjad	8d988ba994	updates & fixes	4 years ago
haroon amjad	4ba37d342c	RRT Updates	4 years ago
haroon amjad	72e5d0a2be	Pharma LiveCare	4 years ago
haroon amjad	33329f5c8a	base app client update	4 years ago
haroon amjad	aae48f2555	Android permission dialog updates	4 years ago
haroon amjad	887303fcde	updates	4 years ago
haroon amjad	643763764d	family files fixes	4 years ago
haroon amjad	be2a9380df	Analytics change	4 years ago
haroon amjad	9464d543fc	updates	4 years ago
haroon amjad	bc97cfa95b	Update Insurance changes	4 years ago
haroon amjad	6ba695f2c9	Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5' ... Zik new design flutter v2.5 See merge request Cloud_Solution/diplomatic-quarter!596	4 years ago
Sikander Saleem	27d0d80017	Merge branch 'development_v2.5' into sikander_family_profile_switch ... # Conflicts: # lib/pages/DrawerPages/family/my-family.dart # lib/widgets/drawer/app_drawer_widget.dart	4 years ago
Sikander Saleem	bcf746aa0b	Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5	4 years ago
haroon amjad	72e2707d4b	updates	4 years ago
Sikander Saleem	1b82146303	my family switch profile on dashboard.	4 years ago
Sikander Saleem	230444803d	Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5	4 years ago
Sikander Saleem	fd73c248e2	my family switch profile improvement.	4 years ago
Zohaib Iqbal Kambrani	d7931ac7da	Analytics: update set user	4 years ago
haroon amjad	d344169399	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 ... # Conflicts: # lib/pages/BookAppointment/BookSuccess.dart	4 years ago
haroon amjad	a918d409fb	updates & fixes	4 years ago
Zohaib Iqbal Kambrani	99bdd25bd3	added more analytics logs	4 years ago
haroon amjad	60a44f9a42	OpenTok fixes	4 years ago
Zohaib Iqbal Kambrani	9890d2caec	Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 ... * development_v2.5: mobile number updates video call setup with flutter 2.8, firebase modifications	4 years ago
Zohaib Iqbal Kambrani	687bc543ab	OpenTok Video Call	4 years ago
haroon amjad	ce8a7c07de	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5	4 years ago
haroon amjad	ff72b4b31e	mobile number updates	4 years ago
Sikander Saleem	7490d238e4	Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 ... # Conflicts: # lib/uitl/push-notification-handler.dart	4 years ago
Sikander Saleem	67b87449a9	video call setup with flutter 2.8, firebase modifications	4 years ago
Zohaib Iqbal Kambrani	bf7c1d1610	Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 ... * development_v2.5: updates livecare changes updates	4 years ago
Zohaib Iqbal Kambrani	aac15c5a4a	partial analytics fixes and updates	4 years ago
haroon amjad	8c96de866b	updates	4 years ago
haroon amjad	7d7864a1eb	livecare changes	4 years ago
haroon amjad	0ea2550246	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5	4 years ago
haroon amjad	32edb2e71e	updates	4 years ago
Zohaib Iqbal Kambrani	c61de7cfdc	no message	4 years ago
Zohaib Iqbal Kambrani	23404b4495	Video call at InAppWebView	4 years ago
Zohaib Iqbal Kambrani	936b7c28f9	Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 ... * development_v2.5: Covid updates & other fixes # Conflicts: Resolved # lib/config/config.dart # lib/pages/webRTC/signaling.dart # lib/widgets/drawer/app_drawer_widget.dart # lib/widgets/in_app_browser/InAppBrowser.dart	4 years ago
haroon amjad	927db41068	Covid updates & other fixes	4 years ago
Zohaib Iqbal Kambrani	a398220033	no message	4 years ago
Zohaib Iqbal Kambrani	a26b17f52d	Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 ... * development_v2.5: Translation fixes OBGyne updates updates OB Gyne appo updates no message updates & fixes no message no message Ancillary Orders completed updates & fixes # Conflicts: Resolved # lib/pages/BookAppointment/widgets/DentalComplaintCard.dart # lib/widgets/drawer/app_drawer_widget.dart	4 years ago
Zohaib Iqbal Kambrani	a8e1ba6b86	no message	4 years ago
haroon amjad	ac5077e9e7	Translation fixes	4 years ago
haroon amjad	f879991b50	OBGyne updates	4 years ago
haroon amjad	cbf49e31a1	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5	4 years ago
haroon amjad	2a343db335	updates	4 years ago
haroon amjad	736edad018	OB Gyne appo updates	4 years ago
haroon amjad	907181a56c	Merge branch 'development_v2.5' into haroon_development_2.5 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/medical/balance/confirm_payment_page.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	4b4ac4819f	no message	4 years ago
haroon amjad	3eb7a4325b	updates & fixes	4 years ago
Zohaib Iqbal Kambrani	ff508de9f7	Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 ... * development_v2.5: Updates & fixes # Conflicts: resolved # lib/pages/medical/balance/confirm_payment_page.dart	4 years ago
haroon amjad	aa36154764	Updates & fixes	4 years ago
Zohaib Iqbal	364ff3344a	Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5' ... # Conflicts: # lib/pages/BookAppointment/QRCode.dart # lib/pages/login/register-info.dart # lib/pages/medical/balance/confirm_payment_page.dart	4 years ago
Zohaib Iqbal Kambrani	a2efbf6494	no message	4 years ago
Zohaib Iqbal Kambrani	81a3d1ce87	no message	4 years ago
Zohaib Iqbal Kambrani	940a19d4d7	Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5 ... * 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter: ancillary orders update Updates & fixes fix category issue fixes & updates lakum fix Updates & fixes fix translation issue Compare duplication fixed Updates & fixes Updates & fixes fix compare issue pharmacy fixes fix categories & cantact design pharmacy fixes Updates & fixes fix conflict Updates & fixes Updates & fixes Login fixes # Conflicts: Resolved # lib/pages/BookAppointment/QRCode.dart # lib/pages/BookAppointment/SearchResults.dart	4 years ago
Zohaib Iqbal Kambrani	d974a7430c	Google Analytics as per e-Cense document	4 years ago
haroon amjad	4bc67b37e0	no message	4 years ago
Haroon Amjad	1cb7eb2afb	CS branch changes	4 years ago
haroon amjad	f8b3847d0a	Ancillary Orders completed	4 years ago
haroon amjad	ea8d700d22	updates & fixes	4 years ago
haroon amjad	efced34ffa	Updates	4 years ago
haroon amjad	19dadd2b35	Merge branch 'development_v2.5' into haroon_development_2.5	4 years ago
haroon amjad	a6c6651363	Updates & fixes	4 years ago
Zohaib Iqbal	259e27d4a7	Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5' ... # Conflicts: # lib/pages/landing/fragments/home_page_fragment2.dart # lib/uitl/app_shared_preferences.dart # lib/widgets/in_app_browser/InAppBrowser.dart	4 years ago
Zohaib Iqbal Kambrani	ab8b62bc3a	Packages and offers fixes, HMG Internet work in progress,	4 years ago
haroon amjad	7f5f3ababe	Registration fix	4 years ago
haroon amjad	0acc134e6e	Updates & fixes	4 years ago
haroon amjad	e45c2c5652	covid & pharmacy updates	4 years ago
haroon amjad	eb6b0aefc0	Merge branch 'fatima_v2' into 'development_v2.5' ... Fatima v2 See merge request Cloud_Solution/diplomatic-quarter!580	4 years ago
haroon amjad	7dbc00a864	ancillary orders update	4 years ago
haroon amjad	693f8cb090	Updates & fixes	4 years ago
Fatimah Alshammari	f83adbc6ff	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2	4 years ago
Fatimah Alshammari	0b21252ae7	fix category issue	4 years ago
haroon amjad	4acdad0e99	fixes & updates	4 years ago
haroon amjad	8f91d0a0dc	lakum fix	4 years ago
haroon amjad	40d649dfa4	Updates & fixes	4 years ago
haroon amjad	e53ba65ddd	Merge branch 'development_v2.5' into haroon_development_2.5	4 years ago
Fatimah Alshammari	0985436a10	fix translation issue	4 years ago
haroon amjad	28107f9a48	Compare duplication fixed	4 years ago
haroon amjad	8c3b443f79	Merge branch 'development_v2.5' into haroon_development_2.5	4 years ago
haroon amjad	4e3d99b007	Updates & fixes	4 years ago
Fatimah Alshammari	e5f0f5777b	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 ... # Conflicts: # lib/services/pharmacy_services/product_detail_service.dart	4 years ago
haroon amjad	6d88607631	Updates & fixes	4 years ago
Fatimah Alshammari	57d10d9e1f	fix compare issue	4 years ago
haroon amjad	1f19af01c4	Merge branch 'development_v2.5' into haroon_development_2.5	4 years ago
haroon amjad	c175139a29	pharmacy fixes	4 years ago
Fatimah Alshammari	71a28e2ed6	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2	4 years ago
Fatimah Alshammari	cc783045bb	fix categories & cantact design	4 years ago
haroon amjad	c05772c63a	pharmacy fixes	4 years ago
haroon amjad	b15bd2362b	Updates & fixes	4 years ago
Fatimah Alshammari	7634c35e3d	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 ... # Conflicts: # lib/widgets/input/text_field.dart	4 years ago
Fatimah Alshammari	d7c3cb3dbc	fix conflict	4 years ago
haroon amjad	c2b0326676	Updates & fixes	4 years ago
haroon amjad	3107d1e86d	Updates & fixes	4 years ago
haroon amjad	eea701907d	Login fixes	4 years ago
haroon amjad	0ae4a13c02	Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5' ... Zik new design flutter v2.5 See merge request Cloud_Solution/diplomatic-quarter!570	4 years ago
Zohaib Iqbal Kambrani	1a6a26be75	Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 ... * development_v2.5: (36 commits) merge improvements Health plugin updated fix search issue JIRA bug fixes updates & fixes Fixes & updates six issues nfc plugin improvement. disable lakum on check out page fix issue fix lakum issues Smartwatch fixes screen plugin improvement. Updates & fixes video call camera view issue fix, barcode plugin change, smart watches improvements. add quantity filed fixed pharmacy uo fix Fixes fix issue Speech to text fix in iOS ... # Conflicts: Resolved # android/app/build.gradle # android/app/src/main/AndroidManifest.xml # android/build.gradle # android/gradle/wrapper/gradle-wrapper.properties # lib/pages/conference/web_rtc/widgets/cam_view_widget.dart # lib/pages/landing/landing_page.dart # lib/pages/livecare/incoming_call.dart	4 years ago
Sikander Saleem	c8b5602d8e	flutter 2.8 improvements.	4 years ago
Sikander Saleem	3ad90f1a01	Merge branch 'development_new_design_2.0' into development_v2.5	4 years ago
haroon amjad	7733c74f00	Updates & fixes	4 years ago
Zohaib Iqbal Kambrani	63ffabcc86	no message	4 years ago
Sikander Saleem	684add0090	merge improvements	4 years ago
Sikander Saleem	9ba7b3b44b	Merge branch 'development_new_design_2.0' into development_v2.5 ... # Conflicts: # lib/pages/BookAppointment/BookConfirm.dart # lib/pages/medical/smart_watch_health_data/syncHealthData.dart # lib/pages/vaccine/my_vaccines_screen.dart # lib/widgets/in_app_browser/InAppBrowser.dart # pubspec.yaml	4 years ago
haroon amjad	c379c6a37b	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	4c2410cfd5	Health plugin updated	4 years ago
Fatimah Alshammari	216cc4a7e3	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design	4 years ago
Fatimah Alshammari	d767febcd0	fix search issue	4 years ago
haroon amjad	7bc8f69dfb	JIRA bug fixes	4 years ago
haroon amjad	2670d0be57	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	9c0337aa01	updates & fixes	4 years ago
haroon amjad	330f2d6c86	Fixes & updates	4 years ago
Fatimah Alshammari	b09b1e4732	six issues	4 years ago
Sikander Saleem	2a92478d01	nfc plugin improvement.	4 years ago
Fatimah Alshammari	f9d1bbe2ee	disable lakum on check out page	4 years ago
Fatimah Alshammari	cf7dd13a83	fix issue	4 years ago
Fatimah Alshammari	ff7146e259	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart # lib/pages/pharmacy/pharmacyContacts.dart	4 years ago
Fatimah Alshammari	de86cffb8c	fix lakum issues	4 years ago
haroon amjad	d5b58c07ca	Smartwatch fixes	4 years ago
Sikander Saleem	2fd0fd3f85	screen plugin improvement.	4 years ago
haroon amjad	a60e878fef	Updates & fixes	4 years ago
Sikander Saleem	628439ddf8	video call camera view issue fix, barcode plugin change, smart watches improvements.	4 years ago
haroon amjad	0b4e674097	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	03e554b1af	Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0' ... Hussam pharmacy fix See merge request Cloud_Solution/diplomatic-quarter!562	4 years ago
hussam al-habibeh	cf556c66b0	add quantity filed fixed	4 years ago
haroon amjad	bb9aaf9945	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/pharmacies/screens/product-details/availability_info.dart	4 years ago
hussam al-habibeh	516fddf962	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix	4 years ago
hussam al-habibeh	e291d46af7	pharmacy uo fix	4 years ago
haroon amjad	207525e31a	Fixes	4 years ago
Fatimah Alshammari	749b89b67d	fix issue	4 years ago
haroon amjad	94aab4a737	Speech to text fix in iOS	4 years ago
Fatimah Alshammari	a1b4e1c8a3	Merge branch 'development_new_design_2.0' into Fatima-New-Design	4 years ago
Fatimah Alshammari	7ffb431454	added map luncher	4 years ago
haroon amjad	3b9c1eb9ed	Appointment booking fix	4 years ago
Sikander Saleem	caec2c4ca4	video call improvements.	4 years ago
haroon amjad	302e9dbadd	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	76984a4ef6	Fixes	4 years ago
Fatimah Alshammari	1b9e3b75bd	fix issue of navigation	4 years ago
Sikander Saleem	e3bf988df5	map picker, firebase improvement and changes for v2.5	4 years ago
Fatimah Alshammari	c84d1cadad	fix address issue	4 years ago
Fatimah Alshammari	a55ca33c1b	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/search_products_page.dart # lib/widgets/pharmacy/product_tile.dart	4 years ago
Fatimah Alshammari	bc9fc5a878	fix issue	4 years ago
Fatimah Alshammari	9d9377d59f	fix issues	4 years ago
haroon amjad	eb64962d7c	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	b0ae08d6a5	updates & fixes	4 years ago
haroon amjad	d7de2d6802	Merge branch 'products_tails' into 'development_new_design_2.0' ... Products tails See merge request Cloud_Solution/diplomatic-quarter!557	4 years ago
haroon amjad	18c5b53b30	Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0' ... pharmacy design home page See merge request Cloud_Solution/diplomatic-quarter!556	4 years ago
Elham Rababh	b2814d0183	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into products_tails	4 years ago
hussam al-habibeh	9c8bd64142	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix	4 years ago
hussam al-habibeh	6b1c0e04d0	pharmacy design home page	4 years ago
Elham Rababh	16c1064a45	PMAU-19	4 years ago
haroon amjad	c1b194d15d	Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0' ... pharmacy home design See merge request Cloud_Solution/diplomatic-quarter!555	4 years ago
Elham Rababh	3e667d6b87	fix arabic language	4 years ago
Elham Rababh	f623828d78	fix arabic language	4 years ago
hussam al-habibeh	01433963bd	pharmacy home design	4 years ago
Elham Rababh	8f044a635a	fix footer design	4 years ago
haroon amjad	1a90698a99	Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0' ... fix ontap on prodcut card See merge request Cloud_Solution/diplomatic-quarter!554	4 years ago
hussam al-habibeh	1984400239	fix ontap on prodcut card	4 years ago
haroon amjad	6c20bf50b5	Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0' ... Hussam pharmacy fix See merge request Cloud_Solution/diplomatic-quarter!553	4 years ago
hussam al-habibeh	3c97122308	pharmacy home dsign	4 years ago
haroon amjad	14b0c4c125	Merge branch 'products_tails' into 'development_new_design_2.0' ... fix on design See merge request Cloud_Solution/diplomatic-quarter!550	4 years ago
haroon amjad	f06122d084	Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' ... Fatima new design See merge request Cloud_Solution/diplomatic-quarter!551	4 years ago
haroon amjad	75423e5501	Updates	4 years ago
Fatimah Alshammari	4d8271c45d	fix product details issue	4 years ago
Fatimah Alshammari	169ebac076	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacies/screens/product-details/product-name-and-price.dart	4 years ago
Elham Rababh	d6eeb02c91	fix on design	4 years ago
Fatimah Alshammari	fb974af726	fix issues	4 years ago
haroon amjad	d1fcdcc898	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart	4 years ago
hussam al-habibeh	01a56da151	merge conflict resolved	4 years ago
hussam al-habibeh	141e650276	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix ... Conflicts: lib/pages/pharmacies/screens/product-details/product-name-and-price.dart	4 years ago
hussam al-habibeh	8c4af92832	pharmacy new design home	4 years ago