190 Commits (fda101840ab4fa1b29431413702a42c27b678594)

Author	SHA1	Message	Date
Fatimah Alshammari	fda101840a	fixed order isuues	4 years ago
Fatimah Alshammari	4a84483698	fixed order details	4 years ago
Fatimah Alshammari	706980248a	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/config/config.dart # lib/pages/landing/home_page.dart	4 years ago
Fatimah Alshammari	9b8103bfd6	fixe order and order details	4 years ago
hussam al-habibeh	5dc3c53550	mousa and hussam branch	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
mosazaid	4c9a1862d2	make pharmacy home page load data even without login, and some mini changes	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
hussam al-habibeh	64cbae3602	Search	4 years ago
mosazaid	35d0d3e441	finsi lakum points task	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
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
Mohammad Aljammal	54d8965773	done child Vaccination	4 years ago
haroon amjad	97b8aeeff5	Version Control finished	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
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	536682e953	merge	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	741126102d	fix issue #11	4 years ago
Mohammad Aljmma	e1f6ef5e5b	fix Prescriptions history	4 years ago
Sultan Khan	283473a06a	theme changes	4 years ago