632 Commits (4823919fcb701a4adc3894db34bc5eec32b700c3)

Author	SHA1	Message	Date
Mirza.Shafique	e1e3741abf	Event Reminder	3 years ago
Zohaib Iqbal Kambrani	d9672c47a0	Merge branch 'development' into ZohaibIqbalKambrani ... * development: BUG FIXES fix issues PAP-910,PAP-911 fix bugs pharmacy Dental procedures implemented Revert "Merge branch 'foote_in_all_pages' into 'development'" fixed products issues calendar events changes Covid passport CR implemented in Covid test flow doctor schedule Covid certificate passport CR implemented Covid Lab result generate certificate implemented return bottom sheet inside appointments list fix issues related to footer remove unused code remove footer from pharmacy pages first step from add footer for all pages # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	3 years ago
haroon amjad	9cf9e297cf	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 ... # Conflicts: # lib/pages/MyAppointments/AppointmentDetails.dart	3 years ago
haroon amjad	4560037f97	updates	3 years ago
Fatimah Alshammari	f09cdd944d	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new ... # Conflicts: # lib/uitl/translations_delegate_base.dart	3 years ago
Fatimah Alshammari	827d8733a1	fixed shopping cart issue	3 years ago
Sikander Saleem	402cf5936a	improvement.	3 years ago
Sikander Saleem	1a0e1f47a6	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/BookAppointment/components/DocAvailableAppointments.dart # lib/pages/MyAppointments/AppointmentDetails.dart # lib/uitl/translations_delegate_base.dart	3 years ago
Sultan Khan	1726f8cc11	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	d1fc4751ad	BUG FIXES	3 years ago
Zohaib Iqbal Kambrani	d1c99d1d82	ER Average waiting time label applied	3 years ago
Sikander Saleem	bdb7f29d4c	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/core/service/parmacyModule/prescription_service.dart # lib/pages/BookAppointment/DentalComplaints.dart # lib/pages/login/login.dart	3 years ago
Mirza.Shafique	089ad0d321	Booking appointment 1.3	3 years ago
haroon amjad	e9c26ee85f	Dental procedures implemented	3 years ago
Sikander Saleem	ca363adee2	merge & improvements	3 years ago
Sikander Saleem	6191377914	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/pages/login/login.dart # lib/uitl/translations_delegate_base.dart # lib/widgets/data_display/medical/LabResult/LabResultWidget.dart # lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart	3 years ago
Sultan Khan	b116079843	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Mirza.Shafique	ad025f3d8e	Booking appointment 1.2	3 years ago
Sultan Khan	4325bd3448	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	5fe6a6c3dd	doctor schedule	3 years ago
Mirza.Shafique	d2b2b4063d	Booking appointment 1.1	3 years ago
haroon amjad	72dbdd2c2b	Merge branch 'development' into Haroon	3 years ago
haroon amjad	e96157c74a	Covid certificate passport CR implemented	3 years ago
Zohaib Iqbal Kambrani	d33432d238	Covid Drive-Thru Questions Screen	3 years ago
haroon amjad	73097d15de	Covid Lab result generate certificate implemented	3 years ago
Mirza.Shafique	bd1cf9bcc7	Merge branch 'development_new_design_2.0' into mirza_home_page ... # Conflicts: # lib/pages/BookAppointment/components/SearchByClinic.dart # lib/widgets/drawer/app_drawer_widget.dart	3 years ago
Mirza.Shafique	62631677ad	Booking appointment 1.0	3 years ago
Sikander Saleem	2ba91e54ab	merge-changes	3 years ago
Sikander Saleem	94ff5cff40	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	3 years ago
haroon amjad	5f521556dc	Dental flow fixes	3 years ago
Sikander Saleem	288d64214e	improvements	3 years ago
Sikander Saleem	bb18645d85	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/MyAppointments/AppointmentDetails.dart # lib/pages/landing/landing_page.dart # lib/pages/medical/medical_profile_page.dart # lib/uitl/translations_delegate_base.dart	3 years ago
Sikander Saleem	5ab9dd1761	Appointment screen Changes & improvements.	3 years ago
Sultan Khan	57d87dfc03	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	11ffed2ae3	bug fixes	3 years ago
haroon amjad	cbbca5ce86	Merge branch 'development' into Haroon	3 years ago
Sikander Saleem	ec6693c55e	improvement.	3 years ago
haroon amjad	0121337d1b	LiveCare Flow from book appointment flow implemented	3 years ago
Sikander Saleem	6c8f1c6185	merge improvement.	3 years ago
Sikander Saleem	197e7d5742	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/medical/patient_sick_leave_page.dart # lib/uitl/translations_delegate_base.dart # lib/uitl/utils.dart	3 years ago
Sikander Saleem	b3fd1cb93d	lab result detail flow chart screen & improvement.	3 years ago
Fatimah Alshammari	787b55a803	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new ... # Conflicts: # lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart # lib/uitl/translations_delegate_base.dart	3 years ago
Fatimah Alshammari	34ccb132dc	fixed issues	3 years ago
haroon amjad	cbbef80bd5	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	3 years ago
haroon amjad	eadba3f767	Working on livecare appointment booking page	3 years ago
Sikander Saleem	bb20d65b40	lab result detail screen.	3 years ago
hussam al-habibeh	a33a6b0b2f	push request after conflict resolve	3 years ago
hussam al-habibeh	0a3c44b5e8	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	3 years ago
haroon amjad	5c8e9f4e19	Merge branch 'Haroon' into 'development' ... Haroon See merge request Cloud_Solution/diplomatic-quarter!352	3 years ago
haroon amjad	2242b78116	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/config.dart	3 years ago
Zohaib Iqbal Kambrani	f442cc251c	Pre Post Images Dental Doctor Profile	3 years ago
haroon amjad	a32501f3dc	My invoices implementation continued	3 years ago
Sikander Saleem	80c50e29bf	Merge branch 'login_design_sikander' into development_new_design_2.0 ... # Conflicts: # lib/config/config.dart # lib/pages/landing/landing_page.dart	3 years ago
Sikander Saleem	4db432b351	lab results working(cont.) & improvements	3 years ago
Mirza.Shafique	38465eaafb	Home page icons and drawer	3 years ago
Zohaib Iqbal Kambrani	429fcb1e60	Merge branch 'development' into ZohaibIqbalKambrani ... * development: (32 commits) changes package name changed Jira Fixes Jira fixes PAP-664 PAP-664 PAP-664 langauge issue bug fix PAP-777 PAP-729 fix button fix translate issues CONFIG PAP-715 : Y –axis and X –axis values should be display in the yearly graph details. bug fixes fix bugs fixing dashboard issue fixing dashboard issue jira bugs ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/uitl/translations_delegate_base.dart # lib/uitl/utils.dart	3 years ago
hussam al-habibeh	d3868844de	Medication availability	3 years ago
Mirza.Shafique	06f877b8d4	Home page new design & drawer	3 years ago
Zohaib Iqbal Kambrani	bf303a7be0	RRT Implementation	3 years ago
Mirza.Shafique	99c6318410	Merge branch 'mirza_home_page' into development_new_design_2.0	3 years ago
Mirza.Shafique	2d62822536	Medical Profile Page improvements	3 years ago
Sikander Saleem	f482595d6b	merge improvements.	3 years ago
Mirza.Shafique	4ebf5f900b	improvements.	3 years ago
Mirza.Shafique	32e867421f	Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 ... # Conflicts: # lib/uitl/date_uitl.dart # lib/uitl/translations_delegate_base.dart	3 years ago
Mirza.Shafique	bbaeec5b85	Medical Profile Complete	3 years ago
Sikander Saleem	f6ae7ed770	merge changes-4	3 years ago
Sikander Saleem	14561d0ac6	merge changes-1	3 years ago
Mirza.Shafique	3c438406b5	Merge branch 'mirza_home_page' into development_new_design_2.0 ... # Conflicts: # lib/uitl/translations_delegate_base.dart	3 years ago
Mirza.Shafique	49bfa2e9a7	Home page 1.3	3 years ago
Zohaib Iqbal Kambrani	e4256d6874	RRT in progress (Service implementations)	3 years ago
Sultan Khan	d88e3faa6b	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan khan	ba32a37a17	Merge branch 'ZohaibIqbalKambrani' into 'development' ... RRT in progress See merge request Cloud_Solution/diplomatic-quarter!339	3 years ago
Zohaib Iqbal Kambrani	4da163d186	RRT in progress in stage	3 years ago
Sikander Saleem	907d90b987	login ui and forgot password ui added.	3 years ago
Sultan Khan	ed20ba65b3	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	23ca95b9b6	bug fixes	3 years ago
Haroon Amjad	47e521fe1d	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/pages/feedback/send_feedback_page.dart # lib/pages/landing/home_page.dart # lib/uitl/translations_delegate_base.dart # lib/widgets/in_app_browser/InAppBrowser.dart	3 years ago
Sultan Khan	6442ce178d	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan khan	a67e320a8e	Merge branch 'ZohaibIqbalKambrani' into 'development' ... Zohaib iqbal kambrani See merge request Cloud_Solution/diplomatic-quarter!333	3 years ago
Sultan Khan	8766a69928	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
hussam al-habibeh	d5c76b5400	jira bugs	3 years ago
hussam al-habibeh	6dc0d89f61	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs ... Conflicts: lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart lib/uitl/utils.dart	3 years ago
hussam al-habibeh	981e78936e	jira bugs	3 years ago
Zohaib Iqbal Kambrani	08e0ce52c8	Merge branch 'development' into ZohaibIqbalKambrani ... * development: fix bugs	3 years ago
Zohaib Iqbal Kambrani	4abdd9bde7	no message	3 years ago
Mohammad Aljammal	4ac6bf628b	Merge branch 'fix-bugs' into 'development' ... fix bugs See merge request Cloud_Solution/diplomatic-quarter!331	3 years ago
Zohaib Iqbal Kambrani	882d5f090a	Merge branch 'zik-analytics' into ZohaibIqbalKambrani ... * zik-analytics: no message	3 years ago
mosazaid	2e33c2b240	fix bugs	3 years ago
Mirza.Shafique	b0dfbef52a	Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart	3 years ago
Mirza.Shafique	d37f225c1b	Home page 1.2	3 years ago
Sikander Saleem	3707b13986	login type ui & icons added.	3 years ago
Sultan Khan	446f86dbcf	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Elham Rababh	5d05b09345	PAP-712 : fixes on Blood sugar	3 years ago
Sultan Khan	c88bea4461	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	9acb5b087d	bug fixes	3 years ago
Mirza.Shafique	090556f4d1	Merge branch 'mirza_home_page' into development_new_design_2.0	3 years ago
Mirza.Shafique	5dc88f51c3	Home Page 1.0	3 years ago
Sikander Saleem	8b2feb03ea	last login and login options ui.	3 years ago
Sultan khan	9196367da4	Merge branch 'bug_fix_mirza' into 'development' ... Medical Profile Buttons Lock See merge request Cloud_Solution/diplomatic-quarter!329	3 years ago
Sultan khan	f54b9a63aa	Merge branch 'sultan-patientapp' into 'development' ... Sultan patientapp See merge request Cloud_Solution/diplomatic-quarter!328	3 years ago
Mirza.Shafique	2fda47baf6	Medical Profile Buttons Lock	3 years ago
Zohaib Iqbal Kambrani	dbf525c484	no message	3 years ago
Haroon Amjad	213d104d57	Covid test procedure selection implemented	3 years ago
Sultan Khan	14ef096c32	changes and fixes	3 years ago
Mirza.Shafique	b31813770e	Check-In NFC done	3 years ago
Mirza.Shafique	fb0a67e5bd	PAP 828 and 792 issue fix	3 years ago
haroon amjad	7cf66934bc	Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	3 years ago
haroon amjad	7b6270c67f	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	3 years ago
Sultan khan	f048f5229b	Merge branch 'sultan-patientapp' into 'development' ... Sultan patientapp See merge request Cloud_Solution/diplomatic-quarter!321	3 years ago
Mirza.Shafique	58d5734f1a	Bug Fix: 873, 878 to 881	3 years ago
Sultan Khan	85e803651c	permission issue fixed	3 years ago
Sultan Khan	da2df9b348	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	bcabd81f88	BUG FIXES	3 years ago
Haroon Amjad	e13a13189c	Merge branch 'development' into Haroon ... # Conflicts: # lib/uitl/translations_delegate_base.dart	4 years ago
mosazaid	865afd7761	fix bugs	4 years ago
Mohammad Aljammal	25d5105caf	Merge branch 'Apr-fixes' into 'development' ... PAP-607: fix issue See merge request Cloud_Solution/diplomatic-quarter!312	4 years ago
Elham Rababah	2a47564c37	PAP-607: fix issue	4 years ago
Fatimah Alshammari	2481e4c9ea	fixed categories issues and home page button	4 years ago
Sultan Khan	8c9c309abb	bug fixes	4 years ago
Zohaib Iqbal Kambrani	c7c96f913f	no message	4 years ago
haroon amjad	6b675acc94	Merge branch 'development' into Haroon ... # Conflicts: # lib/pages/feedback/send_feedback_page.dart	4 years ago
haroon amjad	353a5157f2	fixes	4 years ago
Mohammad Aljammal	9a850d0ca3	fix advance payment	4 years ago
haroon amjad	f754e48034	Merge branch 'development' into Haroon ... # Conflicts: # lib/widgets/in_app_browser/InAppBrowser.dart	4 years ago
haroon amjad	49c454b132	fixes	4 years ago
mosazaid	b623bd0dce	Merge branch 'development' into fix_bugs	4 years ago
mosazaid	e5474b3062	fix perscription pages bugs	4 years ago
Zohaib Iqbal Kambrani	b91ce441e2	Merge branch 'development' into ZohaibIqbalKambrani ... # Conflicts: Resolved # lib/core/model/pharmacies/order_model.dart # lib/core/service/client/base_app_client.dart # lib/main.dart # lib/pages/landing/home_page.dart # lib/pages/pharmacy/order/OrderDetails.dart # lib/pages/pharmacy/order/TrackDriver.dart # lib/routes.dart # lib/uitl/translations_delegate_base.dart # lib/uitl/utils.dart # lib/widgets/in_app_browser/InAppBrowser.dart # lib/widgets/others/app_scaffold_widget.dart # pubspec.yaml	4 years ago
haroon amjad	9c1fdf96f4	Merge branch 'development' into Haroon	4 years ago
haroon amjad	accc39d972	jira bug fixes	4 years ago
Sultan Khan	60b1688bb4	chatbot	4 years ago
Sultan Khan	9bfd725e4f	bug fixes	4 years ago
Sultan Khan	0445011e53	bug fixes	4 years ago
haroon amjad	454957ebba	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart	4 years ago
Sultan Khan	616212828d	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	66acce3b40	ancillary order pages added	4 years ago
Zohaib Iqbal Kambrani	f410ce20ca	Packages and Offers in Progress	4 years ago
haroon amjad	ed3dba3eb3	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	b9a12341d5	updates & fixes	4 years ago
Mohammad Aljammal	861dba9a94	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	ec401d4848	Done Ed online	4 years ago
Sultan Khan	a6196d3c30	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	b891c1bd80	theme issue	4 years ago
Fatimah Alshammari	747763c4be	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/config/localized_values.dart # lib/locator.dart # lib/uitl/translations_delegate_base.dart # pubspec.yaml	4 years ago
Sultan Khan	1a35fe37b6	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Fatimah Alshammari	42bf76f712	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/config/config.dart # lib/core/service/parmacyModule/parmacy_module_service.dart # lib/pages/pharmacies/product_detail.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart	4 years ago
Zohaib Iqbal Kambrani	15ec3ec9b9	Translation Track Driver, enhancement, initial camera	4 years ago
Zohaib Iqbal Kambrani	63663f1b24	Track Delivery Driver Completed	4 years ago
Fatimah Alshammari	ac32ba998c	fixed order isuee	4 years ago
Mohammad Aljammal	e6da54c201	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... Conflicts: lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	20ad10b9dc	Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy ... Conflicts: lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	8899bdf460	Done Prescription Delivery Address	4 years ago
mosazaid	d02b74142a	Merge branch 'development' into fix-pharmacy ... # Conflicts: # lib/core/service/client/base_app_client.dart	4 years ago
mosazaid	1a45f99606	some fixes on pharmacy	4 years ago
haroon amjad	5e8e3806d6	Covid Drive-Thru implemented	4 years ago
Sultan Khan	144ef52c70	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	b3e6c4efda	voice command changes	4 years ago
Mohammad Aljammal	0098345d05	add Prescription Delivery Address Page amd fix the Authentication Pharmacy	4 years ago
mosazaid	b70c7d7d05	fix pharmacy auth	4 years ago
Mohammad Aljammal	29f4e6acb6	Merge branch 'hmg-services-fixing' into 'development' ... Hmg services fixing See merge request Cloud_Solution/diplomatic-quarter!262	4 years ago
haroon amjad	b6c617888b	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/localized_values.dart	4 years ago
mosazaid	cbe422cbc6	Merge branch 'hmg-services-fixing' into development ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/uitl/translations_delegate_base.dart	4 years ago
mosazaid	0444b21101	Merge branch 'development' into hmg-services-fixing ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	d33918c932	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sikander Saleem	aef4c7bfac	H2O feature improvement	4 years ago
haroon amjad	3832cee1ad	Translation fixes	4 years ago
Sikander Saleem	3b4e791017	H2O feature improvement	4 years ago
mosazaid	822defbd04	working on bmi calculator design and functionality	4 years ago
Sultan Khan	3ac69692be	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Mohammad Aljammal	3e441c55b2	fix bottom nav bar	4 years ago
Mohammad Aljammal	9d8c1ddf63	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker ... Conflicts: lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	484cca086e	fix my my Trackers	4 years ago
haroon amjad	ab158e14e9	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	7c538b350f	LiveCare Scheduling finalized, Appointments in ToDo list categorized	4 years ago
hussam al-habibeh	b767748315	health-converter fix	4 years ago
hussam al-habibeh	97919c217f	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago
hussam al-habibeh	1ce0ef7b6c	health-converter fix	4 years ago
Mohammad Aljammal	db2376f50c	fix blood and weight on my trackers	4 years ago
Sultan Khan	ccd2fc5068	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
mosazaid	38d52b52c8	Merge branch 'development' into fix_design ... # Conflicts: # lib/config/localized_values.dart # lib/locator.dart	4 years ago
mosazaid	174534d8a5	fix Blood donation functionality and design	4 years ago
Mohammad Aljammal	405f67be1e	Merge branch 'pharmacy-Fatima' into 'development' ... Pharmacy fatima See merge request Cloud_Solution/diplomatic-quarter!249	4 years ago
Fatimah Alshammari	7a516cae51	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/order/Order.dart # lib/pages/pharmacy/order/OrderDetails.dart	4 years ago
Mohammad Aljammal	f883e1bd78	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker ... Conflicts: lib/config/localized_values.dart	4 years ago
Mohammad Aljammal	0b1014a91c	fix blood sugar service on my tracker	4 years ago
Fatimah Alshammari	0f22a50a5d	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/profile/profile.dart	4 years ago
Zohaib Iqbal Kambrani	9a5daed5c3	Merge branch 'development' into ZohaibIqbalKambrani ... * development: re-design child vaccine and fix some funcrionalities Fix ER service first step from fix CMC fix issue on cmc return CMC HHC Nearest Er fix design solving NearestEr design problem simple fix hot fixing fix design issues # Conflicts: # lib/config/localized_values.dart	4 years ago
Sultan Khan	c65983bfdb	code merged	4 years ago
Zohaib Iqbal Kambrani	bbd953ae43	Order Delivery Driver tracking [inprogress]	4 years ago
mosazaid	3a45239059	Merge branch 'development' into fix_design ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
mosazaid	f5d478fd27	re-design child vaccine and fix some funcrionalities	4 years ago
Mohammad Aljammal	4457b5f109	add translation to ER service	4 years ago
Mohammad Aljammal	200334d8f8	Fix ER service	4 years ago
Elham Rababah	c9edb37a3c	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc ... Conflicts: lib/config/localized_values.dart lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart lib/uitl/translations_delegate_base.dart	4 years ago
Elham Rababah	d7a046f9ca	fix issue on cmc	4 years ago
mosazaid	5bcc67b77d	Nearest Er fix design	4 years ago
Zohaib Iqbal Kambrani	e2bce87e34	resolve merge conflicts.	4 years ago
Zohaib Iqbal Kambrani	dc83b476d6	Merge branch 'development' into ZohaibIqbalKambrani ... # Conflicts: # android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt # ios/Flutter/.last_build_id # lib/pages/landing/landing_page.dart # lib/pages/medical/medical_profile_page.dart # lib/widgets/drawer/app_drawer_widget.dart	4 years ago
Mohammad Aljammal	634c874eee	fix design issues	4 years ago
Fatimah Alshammari	ba4003cb56	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/locator.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacy/profile/profile.dart	4 years ago