Commit Graph

410 Commits (e025321c71b6a7d226ac0852256fb0508dd045ac)
 

Author SHA1 Message Date
Mohammad Aljammal e025321c71 fix issues 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 c1b3b3bbbb Merge branch 'my_trackers' into 'master'
My trackers

See merge request Cloud_Solution/diplomatic-quarter!68
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 e7cf452a79 Merge branch 'insurance' into 'master'
files import fix

See merge request Cloud_Solution/diplomatic-quarter!66
4 years ago
Mohammad Aljammal ecde0b450d Merge branch 'haroon_s' into 'master'
Haroon s

See merge request Cloud_Solution/diplomatic-quarter!67
4 years ago
Mohammad Aljammal a31796322b fix icons issue 4 years ago
Mohammad Aljammal 15ac74fadb Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
 Conflicts:
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
4 years ago
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 4 years ago
Sultan Khan d0d262f139 robot icon updates 4 years ago
hussam al-habibeh cd36749e4e files import fix 4 years ago
Sultan Khan 8095e56b32 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3ad928902b voice command 4 years ago
Mohammad Aljammal b0fa7811e5 Merge branch 'insurance' into 'master'
women health

See merge request Cloud_Solution/diplomatic-quarter!65
4 years ago
Mohammad Aljammal 39a4020b69 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!64
4 years ago
hussam al-habibeh c6a9b66538 women health 4 years ago
Amjad amireh 83735ab68d modified Child vaccintion note 4 years ago
haroon amjad a8ee7db62b fixes
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad 41d50e23e3 covid drivethru implemented 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
Sultan Khan da317431ba Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Amjad amireh 8ddec0ad99 child Vaccines add new child modified 4 years ago
Amjad amireh 67e3a13a95 child Vaccines add new child modified 4 years ago
Mohammad Aljammal 847ccb9c07 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!62
4 years ago
Amjad amireh cb2a78e2ee child Vaccines 4 years ago
Sultan Khan 7b6135a6c7 voice search 4 years ago
Sultan Khan 83bc2cddce Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 8f18d1025a voice search 4 years ago
Amjad amireh 24795e808f child Vaccines 4 years ago
Mohammad Aljammal 60b276f9da Merge branch 'insurance' into 'master'
health Calculator'General Health'

See merge request Cloud_Solution/diplomatic-quarter!61
4 years ago
hussam al-habibeh 84f429e559 merge 4 years ago
hussam al-habibeh bafcc4331e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	pubspec.yaml
4 years ago
hussam al-habibeh dbda69baa1 health Calculator'General Health' 4 years ago
Amjad amireh dcb93bf5cc child Vaccines 4 years ago
Amjad amireh 1d29aa36a2 child Vaccines 4 years ago
Amjad amireh fe17c20bdf child Vaccines 4 years ago
Mohammad Aljammal 1ce55e687f Ambulance Service second step 4 years ago
Amjad amireh 6830996f9c child Vaccines 4 years ago
Amjad amireh 8a6511404f child Vaccines 4 years ago
Amjad amireh 42554ffa67 child Vaccines 4 years ago
Amjad amireh 4009aed000 child Vaccines 4 years ago
Sultan Khan 227731f8f8 Merge 4 years ago
Amjad amireh e14d619edd child Vaccines 4 years ago
Amjad amireh 37b817e0c8 child Vaccines 4 years ago
Amjad amireh 0e4ff1f804 child Vaccines 4 years ago
Amjad amireh 9ab0d66888 child Vaccines 4 years ago
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal 3d6eafe473 Ambulance Service first step 4 years ago
Amjad amireh db19eec35f Blood Denote 4 years ago