2532 Commits (72ee34f9a71fba30798db9ad230401d745fdc905)

Author	SHA1	Message	Date
Zohaib Iqbal Kambrani	d7931ac7da	Analytics: update set user	3 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	3 years ago
haroon amjad	a918d409fb	updates & fixes	3 years ago
Zohaib Iqbal Kambrani	99bdd25bd3	added more analytics logs	3 years ago
haroon amjad	60a44f9a42	OpenTok fixes	3 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	3 years ago
Zohaib Iqbal Kambrani	687bc543ab	OpenTok Video Call	3 years ago
haroon amjad	ce8a7c07de	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5	3 years ago
haroon amjad	ff72b4b31e	mobile number updates	3 years ago
Sikander Saleem	7490d238e4	Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 ... # Conflicts: # lib/uitl/push-notification-handler.dart	3 years ago
Sikander Saleem	67b87449a9	video call setup with flutter 2.8, firebase modifications	3 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	3 years ago
Zohaib Iqbal Kambrani	aac15c5a4a	partial analytics fixes and updates	3 years ago
haroon amjad	8c96de866b	updates	3 years ago
haroon amjad	7d7864a1eb	livecare changes	3 years ago
haroon amjad	0ea2550246	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5	3 years ago
haroon amjad	32edb2e71e	updates	3 years ago
Zohaib Iqbal Kambrani	c61de7cfdc	no message	3 years ago
Zohaib Iqbal Kambrani	23404b4495	Video call at InAppWebView	3 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	3 years ago
haroon amjad	927db41068	Covid updates & other fixes	3 years ago
Zohaib Iqbal Kambrani	a398220033	no message	3 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	3 years ago
Zohaib Iqbal Kambrani	a8e1ba6b86	no message	3 years ago
haroon amjad	ac5077e9e7	Translation fixes	3 years ago
haroon amjad	f879991b50	OBGyne updates	3 years ago
haroon amjad	cbf49e31a1	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5	3 years ago
haroon amjad	2a343db335	updates	3 years ago
haroon amjad	736edad018	OB Gyne appo updates	3 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	3 years ago
haroon amjad	4b4ac4819f	no message	3 years ago
haroon amjad	3eb7a4325b	updates & fixes	3 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	3 years ago
haroon amjad	aa36154764	Updates & fixes	3 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	3 years ago
Zohaib Iqbal Kambrani	a2efbf6494	no message	3 years ago
Zohaib Iqbal Kambrani	81a3d1ce87	no message	3 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	3 years ago
Zohaib Iqbal Kambrani	d974a7430c	Google Analytics as per e-Cense document	3 years ago
haroon amjad	4bc67b37e0	no message	3 years ago
Haroon Amjad	1cb7eb2afb	CS branch changes	3 years ago
haroon amjad	f8b3847d0a	Ancillary Orders completed	3 years ago
haroon amjad	ea8d700d22	updates & fixes	3 years ago
haroon amjad	efced34ffa	Updates	3 years ago
haroon amjad	19dadd2b35	Merge branch 'development_v2.5' into haroon_development_2.5	3 years ago
haroon amjad	a6c6651363	Updates & fixes	3 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	3 years ago
Zohaib Iqbal Kambrani	ab8b62bc3a	Packages and offers fixes, HMG Internet work in progress,	3 years ago
haroon amjad	7f5f3ababe	Registration fix	3 years ago
haroon amjad	0acc134e6e	Updates & fixes	3 years ago
haroon amjad	e45c2c5652	covid & pharmacy updates	3 years ago
haroon amjad	eb6b0aefc0	Merge branch 'fatima_v2' into 'development_v2.5' ... Fatima v2 See merge request Cloud_Solution/diplomatic-quarter!580	3 years ago
haroon amjad	7dbc00a864	ancillary orders update	3 years ago
haroon amjad	693f8cb090	Updates & fixes	3 years ago
Fatimah Alshammari	f83adbc6ff	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2	3 years ago
Fatimah Alshammari	0b21252ae7	fix category issue	3 years ago
haroon amjad	4acdad0e99	fixes & updates	3 years ago
haroon amjad	8f91d0a0dc	lakum fix	3 years ago
haroon amjad	40d649dfa4	Updates & fixes	3 years ago
haroon amjad	e53ba65ddd	Merge branch 'development_v2.5' into haroon_development_2.5	3 years ago
Fatimah Alshammari	0985436a10	fix translation issue	3 years ago
haroon amjad	28107f9a48	Compare duplication fixed	3 years ago
haroon amjad	8c3b443f79	Merge branch 'development_v2.5' into haroon_development_2.5	3 years ago
haroon amjad	4e3d99b007	Updates & fixes	3 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	3 years ago
haroon amjad	6d88607631	Updates & fixes	3 years ago
Fatimah Alshammari	57d10d9e1f	fix compare issue	3 years ago
haroon amjad	1f19af01c4	Merge branch 'development_v2.5' into haroon_development_2.5	3 years ago
haroon amjad	c175139a29	pharmacy fixes	3 years ago
Fatimah Alshammari	71a28e2ed6	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2	3 years ago
Fatimah Alshammari	cc783045bb	fix categories & cantact design	3 years ago
haroon amjad	c05772c63a	pharmacy fixes	3 years ago
haroon amjad	b15bd2362b	Updates & fixes	3 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	3 years ago
Fatimah Alshammari	d7c3cb3dbc	fix conflict	3 years ago
haroon amjad	c2b0326676	Updates & fixes	3 years ago
haroon amjad	3107d1e86d	Updates & fixes	3 years ago
haroon amjad	eea701907d	Login fixes	3 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	3 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	3 years ago
Sikander Saleem	c8b5602d8e	flutter 2.8 improvements.	3 years ago
Sikander Saleem	3ad90f1a01	Merge branch 'development_new_design_2.0' into development_v2.5	3 years ago
haroon amjad	7733c74f00	Updates & fixes	3 years ago
Zohaib Iqbal Kambrani	63ffabcc86	no message	3 years ago
Sikander Saleem	684add0090	merge improvements	3 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	3 years ago
haroon amjad	c379c6a37b	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	4c2410cfd5	Health plugin updated	3 years ago
Fatimah Alshammari	216cc4a7e3	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design	3 years ago
Fatimah Alshammari	d767febcd0	fix search issue	3 years ago
haroon amjad	7bc8f69dfb	JIRA bug fixes	3 years ago
haroon amjad	2670d0be57	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	9c0337aa01	updates & fixes	3 years ago
haroon amjad	330f2d6c86	Fixes & updates	3 years ago
Fatimah Alshammari	b09b1e4732	six issues	3 years ago
Sikander Saleem	2a92478d01	nfc plugin improvement.	3 years ago
Fatimah Alshammari	f9d1bbe2ee	disable lakum on check out page	3 years ago
Fatimah Alshammari	cf7dd13a83	fix issue	3 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	3 years ago
Fatimah Alshammari	de86cffb8c	fix lakum issues	3 years ago
haroon amjad	d5b58c07ca	Smartwatch fixes	3 years ago
Sikander Saleem	2fd0fd3f85	screen plugin improvement.	3 years ago
haroon amjad	a60e878fef	Updates & fixes	3 years ago
Sikander Saleem	628439ddf8	video call camera view issue fix, barcode plugin change, smart watches improvements.	3 years ago
haroon amjad	0b4e674097	Merge branch 'development_new_design_2.0' into haroon-new-design	3 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	3 years ago
hussam al-habibeh	cf556c66b0	add quantity filed fixed	3 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	3 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	3 years ago
hussam al-habibeh	e291d46af7	pharmacy uo fix	3 years ago
haroon amjad	207525e31a	Fixes	3 years ago
Fatimah Alshammari	749b89b67d	fix issue	3 years ago
haroon amjad	94aab4a737	Speech to text fix in iOS	3 years ago
Fatimah Alshammari	a1b4e1c8a3	Merge branch 'development_new_design_2.0' into Fatima-New-Design	3 years ago
Fatimah Alshammari	7ffb431454	added map luncher	3 years ago
haroon amjad	3b9c1eb9ed	Appointment booking fix	3 years ago
Sikander Saleem	caec2c4ca4	video call improvements.	3 years ago
haroon amjad	302e9dbadd	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	76984a4ef6	Fixes	3 years ago
Fatimah Alshammari	1b9e3b75bd	fix issue of navigation	3 years ago
Sikander Saleem	e3bf988df5	map picker, firebase improvement and changes for v2.5	3 years ago
Fatimah Alshammari	c84d1cadad	fix address issue	3 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	3 years ago
Fatimah Alshammari	bc9fc5a878	fix issue	3 years ago
Fatimah Alshammari	9d9377d59f	fix issues	3 years ago
haroon amjad	eb64962d7c	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	b0ae08d6a5	updates & fixes	3 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	3 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	3 years ago
Elham Rababh	b2814d0183	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into products_tails	3 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	3 years ago
hussam al-habibeh	6b1c0e04d0	pharmacy design home page	3 years ago
Elham Rababh	16c1064a45	PMAU-19	3 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	3 years ago
Elham Rababh	3e667d6b87	fix arabic language	3 years ago
Elham Rababh	f623828d78	fix arabic language	3 years ago
hussam al-habibeh	01433963bd	pharmacy home design	3 years ago
Elham Rababh	8f044a635a	fix footer design	3 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	3 years ago
hussam al-habibeh	1984400239	fix ontap on prodcut card	3 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	3 years ago
hussam al-habibeh	3c97122308	pharmacy home dsign	3 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	3 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	3 years ago
haroon amjad	75423e5501	Updates	3 years ago
Fatimah Alshammari	4d8271c45d	fix product details issue	3 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	3 years ago
Elham Rababh	d6eeb02c91	fix on design	3 years ago
Fatimah Alshammari	fb974af726	fix issues	3 years ago
haroon amjad	d1fcdcc898	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart	3 years ago
hussam al-habibeh	01a56da151	merge conflict resolved	3 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	3 years ago
hussam al-habibeh	8c4af92832	pharmacy new design home	3 years ago
hussam al-habibeh	a5e7541394	new design pharmacy home	3 years ago
haroon amjad	cf27c3e796	Incoming call & LiveCare pending UI revamped	3 years ago
hussam al-habibeh	af0316367d	Merge branch 'products_tails' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix	3 years ago
Elham Rababh	c5be1472e7	first step from product details	3 years ago
Fatimah Alshammari	dbe74b3eb4	fix desing	3 years ago
Fatimah Alshammari	bc49d0d7c0	Merge branch 'development_new_design_2.0' into Fatima-New-Design	3 years ago
Fatimah Alshammari	db3ea448f6	fix design	3 years ago
Elham Rababh	c6be53d800	first step from product details	3 years ago
Elham Rababh	a71e7e4075	first step from product details	3 years ago
haroon amjad	fe7baeab3c	LiveCare permissions	3 years ago
haroon amjad	39190681c6	Updates	3 years ago
haroon amjad	e3b7069aa2	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/parent_categorise_page.dart # lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart # lib/pages/webRTC/call_page.dart # lib/pages/webRTC/signaling.dart	3 years ago
haroon amjad	2274c6affe	Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0' ... Zik new design 2.0 See merge request Cloud_Solution/diplomatic-quarter!531	3 years ago
haroon amjad	8b1733e917	no message	3 years ago
haroon amjad	003375b12f	Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' ... Fatima new design See merge request Cloud_Solution/diplomatic-quarter!543	3 years ago
haroon amjad	68b443905e	Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0' ... Hussam pharmacy fix See merge request Cloud_Solution/diplomatic-quarter!544	3 years ago
Elham Rababh	34596163d1	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes	3 years ago
Sikander Saleem	4518a26ff1	video call improvement.	3 years ago
Fatimah Alshammari	127096ec04	fixed wishlist design	3 years ago
Fatimah Alshammari	21c315c1a3	fix wishlist issue	3 years ago
hussam al-habibeh	e6fd5293ca	fix filited produvts API	3 years ago
Fatimah Alshammari	7bbabd798a	fix issue	3 years ago
Fatimah Alshammari	e640f41c35	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart # lib/pages/pharmacies/widgets/ProductOrderItem.dart	3 years ago
Fatimah Alshammari	12b20831df	fix app bar	3 years ago
Elham Rababh	12e47aba82	fix as first step	3 years ago
haroon amjad	816dfe4a12	Pharmacy fixes	3 years ago
haroon amjad	2c198ed224	no message	3 years ago
haroon amjad	a88889ec1d	Merge branch 'nov_fixes' into 'development_new_design_2.0' ... small fix in order details See merge request Cloud_Solution/diplomatic-quarter!540	3 years ago
Elham Rababh	6439fe264a	small fix in order details	3 years ago
haroon amjad	17d569216d	Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' ... Fatima new design See merge request Cloud_Solution/diplomatic-quarter!539	3 years ago
Fatimah Alshammari	2992ca4f70	fix translation	3 years ago
Fatimah Alshammari	bd93395d0f	fix order details issue	3 years ago
Fatimah Alshammari	c60cf72640	fix lakum design	3 years ago
Fatimah Alshammari	5ae7471d3e	fix issue	3 years ago
Fatimah Alshammari	7b44f3487f	fix lakum design	3 years ago
Fatimah Alshammari	e9a86b4e1c	fix lakum	3 years ago
Fatimah Alshammari	d25f888c3e	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacies/screens/lakum-main-page.dart	3 years ago
Fatimah Alshammari	a858d8764a	fixed issues	3 years ago
devmirza121	f9e98c5fa4	Merge branch 'development_new_design_2.0' into mirza_home_page	3 years ago
devmirza121	7d2a6c794b	Clinic Search Dialog	3 years ago
haroon amjad	4b446bb6d0	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	b2bb201a34	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0	3 years ago
haroon amjad	333b41632c	fixes	3 years ago
Sikander Saleem	53e0165286	improvements.	3 years ago
Sikander Saleem	407fb81038	Merge branch 'development_new_design_2.0' into new_design_sikander	3 years ago
Sikander Saleem	7df0fc59df	laser images change & offer and packages	3 years ago
haroon amjad	5bb20ea9a2	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	5f0985adaa	Updates	3 years ago
Fatimah Alshammari	ffc2f2b4bb	fix issues	3 years ago
Fatimah Alshammari	1539945a29	Merge branch 'development_new_design_2.0' into Fatima-New-Design	3 years ago
Fatimah Alshammari	c87a391a23	fixed wishlist issue	3 years ago
haroon amjad	e67e17c2ba	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	7d29ee4468	cart order page fixes	3 years ago
haroon amjad	6d970800f9	Book Appo fix	3 years ago
Fatimah Alshammari	a2a6da1527	Merge branch 'development_new_design_2.0' into Fatima-New-Design	3 years ago
Fatimah Alshammari	5dc1561992	fixed notify issue	3 years ago
haroon amjad	d0c96d245b	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	a646677fae	Pharmacy & smart watch data fixes	3 years ago
Zohaib Iqbal Kambrani	3bd94ee05e	Merge branch 'development_new_design_2.0' into zik_new_design_2.0 ... * development_new_design_2.0: fix issues Base app client updates prescription reminders added Medical Reminder 1.0 lakum fixes Medical Reminder	3 years ago
Zohaib Iqbal Kambrani	b596b1b61d	WebRTC and Packages Offer | Merge	3 years ago
Fatimah Alshammari	468d64a1e0	fix design issue	3 years ago
haroon amjad	7c6fa89d63	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	7ffc467552	Lakum fixes	3 years ago
Fatimah Alshammari	998c1af0f7	Merge branch 'development_new_design_2.0' into Fatima-New-Design	3 years ago
Fatimah Alshammari	ae3bb1bb2d	fix issues	3 years ago
haroon amjad	ab7162f164	Base app client updates	3 years ago
haroon amjad	68294690a1	prescription reminders added	3 years ago
haroon amjad	ff0e878bf2	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
devmirza121	7f8a0320a7	Medical Reminder 1.0	3 years ago
haroon amjad	61a406085b	lakum fixes	3 years ago
devmirza121	f3b7a5c318	Merge branch 'development_new_design_2.0' into mirza_home_page	3 years ago
devmirza121	69b1dd6533	Medical Reminder	3 years ago
haroon amjad	47b7b0db58	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/pharmacy/order/Order.dart	3 years ago
Sikander Saleem	044c442ce0	Merge branch 'development_new_design_2.0' into new_design_sikander ... # Conflicts: # lib/pages/parent_categorise_page.dart	3 years ago
Sikander Saleem	5a8c887117	Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0	3 years ago
Fatimah Alshammari	bdf3429502	Merge branch 'development_new_design_2.0' into Fatima-New-Design ... # Conflicts: # lib/pages/pharmacy/order/Order.dart	3 years ago
haroon amjad	8c9ff27515	Merge branch 'development_new_design_2.0' into haroon-new-design	3 years ago
haroon amjad	777d88be30	updates	3 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	3 years ago
Fatimah Alshammari	54ff9931cb	fixed arrow issue order page	3 years ago
Sikander Saleem	084c82d7a8	improvements	3 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	3 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	3 years ago
hussam al-habibeh	7607631052	sub categories pagnation	3 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	3 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	3 years ago
Sikander Saleem	9a82b9c369	laser clinic added.	3 years ago
haroon amjad	79d99dd48a	Pharmacy security updates applied	3 years ago
Fatimah Alshammari	3bfca80ab9	fixed issue	3 years ago
Elham Rababh	258e107e1b	fix cart order page	3 years ago
hussam al-habibeh	ff86dcbdc0	sub categories pagnation	3 years ago
Elham Rababh	7b6622ee4c	fix cart order page	3 years ago
haroon amjad	4823919fcb	Pharmacy fixes	3 years ago
haroon amjad	f4ccecc1af	Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' ... fix issue See merge request Cloud_Solution/diplomatic-quarter!516	3 years ago
Fatimah Alshammari	adfa707eda	fix issue	3 years ago
haroon amjad	f533dd5356	Merge branch 'nov_fixes' into 'development_new_design_2.0' ... fix cart order page See merge request Cloud_Solution/diplomatic-quarter!515	3 years ago
Elham Rababh	6ff829ab91	fix cart order page	3 years ago