Commit Graph

27 Commits (e7c862c801084705ab5a98d3ae0178bc4593c894)

Author SHA1 Message Date
Mohammad Aljmma 97a8fe4f9b fix issue #14 4 years ago
Mohammad Aljmma 5e8b61bf2d fix issue #13 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 53bbafdc2b fix Authenticated User Object 4 years ago
haroon amjad a8ee7db62b fixes
# Conflicts:
#	lib/config/config.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
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal bae6fe4ad6 fix marge issues 4 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 4 years ago
Sultan Khan 79502de682 update 4 years ago
Amjad amireh 7c48a6f16a Contact us 4 years ago
Amjad amireh 5ce252d296 Contact us 4 years ago
Amjad amireh 50d862b076 Contact us 4 years ago
Amjad amireh 97d0c439c7 Contact us 4 years ago
Amjad amireh 5f981c9248 Contact us 4 years ago
haroon amjad 06798ef327 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/ContactUs/findus/pharmacies_page.dart
4 years ago
haroon amjad f25d18353f icons updated 4 years ago
Amjad amireh aa66e427b1 Contact us 4 years ago
Amjad amireh 24456895ee Contact us 4 years ago
Amjad amireh 24693f2992 Contact us 4 years ago
Amjad amireh de5633d58b Contact us 4 years ago
Amjad amireh c2cfea7360 Contact us 4 years ago
Amjad amireh 571023e521 Contact us 4 years ago
Amjad amireh c2b7507005 Contact us 4 years ago
Amjad amireh dd3608e9ee Contact us 4 years ago
Amjad amireh a4ea5f8e3e Contact us 4 years ago