237 Commits (ff85b2f1b264f800d36a1d725fa15e4aa33166a8)

Author	SHA1	Message	Date
Fatimah Alshammari	9b8103bfd6	fixe order and order details	4 years ago
Mohammad Aljammal	47e4b99f11	fix issues	4 years ago
Mohammad Aljammal	9e8def6584	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues ... Conflicts: lib/config/localized_values.dart	4 years ago
Mohammad Aljammal	4e2c955b09	add missing translation	4 years ago
haroon amjad	dfa1952f4d	Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app	4 years ago
hussam al-habibeh	a1906a4072	Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/locator.dart lib/pages/landing/home_page.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart pubspec.yaml	4 years ago
haroon amjad	257dc3d76d	Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy' ... create terms-condition in pharmacy order page See merge request Cloud_Solution/diplomatic-quarter!154	4 years ago
mosazaid	7ee7ef58c4	working on dynamic title on pharmacy	4 years ago
umasoodch	b5413d1749	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	f5b7d35f23	bug fixes	4 years ago
hussam al-habibeh	64cbae3602	Search	4 years ago
Sultan Khan	81c8239412	bug fixes	4 years ago
Mohammad Aljammal	1c23e28081	fix merge issues	4 years ago
Mohammad Aljammal	ced86de9fe	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info ... Conflicts: lib/config/localized_values.dart lib/pages/medical/balance/advance_payment_page.dart lib/pages/medical/balance/my_balance_page.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	269f682bd5	Added info images description	4 years ago
mosazaid	35d0d3e441	finsi lakum points task	4 years ago
haroon amjad	f1a8e09a59	Added info images description	4 years ago
haroon amjad	47b030eb82	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # ios/Flutter/.last_build_id # lib/config/config.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	7edb0c8009	Doctor rating dialog revamped	4 years ago
Mohammad Aljammal	3daef6e53f	add images info	4 years ago
Elham Rababah	713e44cf8b	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago
Elham Rababah	ea195ea9bf	Finish translate CMC HHC	4 years ago
haroon amjad	65fbd7af8e	referral finalised	4 years ago
Zohaib Kambrani	1155466d19	Packages and Offer Slider at home	4 years ago
mosazaid	98f660e29b	Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/locator.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
mosazaid	4e5d6a9a00	finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished	4 years ago
Elham Rababah	5bf63174c9	First step from translations	4 years ago
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	4 years ago
haroon amjad	6846a8501a	Merge branch 'master' 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
haroon amjad	0181043da8	Ereferral fixes, smartwatch health data integration	4 years ago
Mohammad Aljammal	2185f5ce11	Merge branch 'hhc_cmc' into 'master' ... Hhc cmc See merge request Cloud_Solution/diplomatic-quarter!138	4 years ago
Zohaib Kambrani	27182ee8db	no message	4 years ago
Mohammad Aljammal	54d8965773	done child Vaccination	4 years ago
haroon amjad	97b8aeeff5	Version Control finished	4 years ago
haroon amjad	92db2b2be9	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
Elham Rababah	3ef22be7da	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc ... Conflicts: lib/config/config.dart	4 years ago
Elham Rababah	a87855f445	Fix issues on hhc module	4 years ago
Mohammad Aljammal	49974f81db	add translations to child Vaccination	4 years ago
haroon amjad	e5feef8a9d	Updates & UI Fixes	4 years ago
Mohammad Aljammal	a556e8c1f8	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter ... Conflicts: lib/config/config.dart lib/pages/landing/home_page.dart lib/pages/landing/landing_page.dart	4 years ago
Mohammad Aljammal	b6d2878cf1	add Radiology translations and colors	4 years ago
Fatimah Alshammari	d328c74fc4	fix order and orderdetails	4 years ago
Mohammad Aljammal	b504f379de	fix lab result translations and colors	4 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	4 years ago
Mohammad Aljammal	0966269537	Merge branch 'sultan' into 'diplomatic-quarter-live' ... Sultan See merge request Cloud_Solution/diplomatic-quarter!116	4 years ago
Mohammad Aljammal	3c1257b379	fix Medicine Search	4 years ago
Sultan Khan	30a8e24521	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	91be66ecdd	family file changes	4 years ago
Mohammad Aljmma	6523a1dea9	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues ... Conflicts: lib/config/localized_values.dart	4 years ago
Sultan Khan	3589b21590	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Mohammad Aljmma	770d28033d	fix issues#26 & 27 & 28	4 years ago
haroon amjad	b81af62551	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	b89c1f03b3	language translation fixes	4 years ago
Mohammad Aljmma	8f38dc6077	fix issue #24	4 years ago
Sultan Khan	1eb6516ea6	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	3fef1b9d52	theme and login issues fixed	4 years ago
Mohammad Aljmma	59defa4532	fix issue #15	4 years ago
Mohammad Aljmma	5e8b61bf2d	fix issue #13	4 years ago
Mohammad Aljmma	a742f896be	fix issue#4	4 years ago
Mohammad Aljmma	e1f6ef5e5b	fix Prescriptions history	4 years ago
Sultan Khan	283473a06a	theme changes	4 years ago
Fatimah Alshammari	ddf032bb47	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # android/app/build.gradle # android/app/src/main/AndroidManifest.xml # lib/config/config.dart # lib/config/localized_values.dart # lib/pages/landing/home_page.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Fatimah Alshammari	f137bd44c0	created order and order details UI pages	4 years ago
Sultan Khan	4976870d2e	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	875bf10c73	settings page added	4 years ago
Mohammad Aljmma	6a83538544	add info for Medical	4 years ago
Elham Rababah	64f970c40c	Fix issues after the merge	4 years ago
Elham Rababah	5ed4d76a54	Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	0443a37886	register page updated	4 years ago
Elham Rababah	5bd3c7d9ce	finish step from notifications_page and create notification_details_page	4 years ago
Sultan Khan	d939b2ec9b	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	f8e05fc447	regiter issue	4 years ago
mosazaid	11ff27bae3	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/pages/landing/landing_page.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart pubspec.yaml	4 years ago
mosazaid	9a169ff77b	finish home page and start working on order preview page	4 years ago
Elham Rababah	9f2beceb22	First step from notifications_page	4 years ago
Mohammad Aljmma	e42f953bd1	fix prescription report issues	4 years ago
mosazaid	d1ac4080ca	working on pharmacy home page	4 years ago
Mohammad Aljmma	479aea4df8	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page ... Conflicts: lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljmma	d4be20b07b	add icons	4 years ago
Mohammad Aljmma	e10a0a4d54	add splash page fix language issues	4 years ago
haroon amjad	1553e71e7d	New loading dialog added into appointment flow	4 years ago
Mohammad Aljmma	856ab52439	fix ui issues	4 years ago
Mohammad Aljmma	894494ec4e	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page ... Conflicts: ios/Flutter/.last_build_id lib/main.dart lib/pages/landing/home_page.dart	4 years ago
Mohammad Aljmma	874de15040	change the home page design	4 years ago
haroon amjad	d5118bda11	Login / Register UI fixes	4 years ago
Sultan Khan	deb828b4dd	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
jammal	9328f942ba	done ER service	4 years ago
Fatimah Alshammari	1e00b9a4d8	added my-profile	4 years ago
jammal	7dc55f3378	Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/locator.dart lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	f03a711dff	symptom checker gender page updated	4 years ago
Mohammad Aljammal	29f0402cbd	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan ... Conflicts: lib/config/config.dart lib/config/shared_pref_kay.dart lib/core/service/client/base_app_client.dart lib/pages/AlHabibMedicalService/​ health_calculators.dart lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart lib/pages/MyAppointments/widgets/AppointmentCardView.dart lib/pages/login/confirm-login.dart lib/pages/login/login.dart lib/services/appointment_services/GetDoctorsList.dart lib/uitl/translations_delegate_base.dart lib/widgets/drawer/app_drawer_widget.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
Mohammad Aljammal	d3d0fa00e7	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers ... Conflicts: lib/pages/landing/home_page.dart	4 years ago
Mohammad Aljammal	84bb68789d	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s ... Conflicts: lib/config/config.dart lib/pages/BookAppointment/widgets/DoctorView.dart lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart lib/pages/ContactUs/findus/hospitrals_page.dart lib/pages/ContactUs/findus/pharmacies_page.dart	4 years ago
Mohammad Aljammal	06416b4934	add Not authenticated Page	4 years ago
Elham Rababah	83ab1b4d61	fix issues in the services logic and add some translation	4 years ago
Sultan Khan	ea86e88e2e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
haroon amjad	7fdc0da9dc	livecare scheduling implemented	4 years ago
Mohammad Aljammal	bae6fe4ad6	fix marge issues	4 years ago
Mohammad Aljammal	3946f0355c	Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers ... Conflicts: lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/locator.dart lib/pages/landing/landing_page.dart	4 years ago
haroon amjad	c9256a654a	LiveCare Scheduling updates	4 years ago