Commit Graph

458 Commits (6162833bba3c451b5f5b9337b5bfe53b309c0b7a)
 

Author SHA1 Message Date
hussam al-habibeh 6162833bba offers products page 4 years ago
hussam al-habibeh 7815005e21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
hussam al-habibeh 69a6bc2812 offers page 4 years ago
Mohammad Aljammal a691186ec7 Merge branch 'pharmacy_module_feature_home_page' into 'master'
Pharmacy module feature home page

See merge request Cloud_Solution/diplomatic-quarter!96
4 years ago
mosazaid 2095f2c62a fix merge issue 4 years ago
mosazaid dade295656 fix merge 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
hussam al-habibeh e74e168e88 Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
4 years ago
hussam al-habibeh f7cee8f484 pharmacy module app && category home page 4 years ago
mosazaid d1ac4080ca working on pharmacy home page 4 years ago
Mohammad Aljammal a9eb09c560 Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!79
4 years ago
Sultan Khan deb828b4dd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 23b48485ed voice command 4 years ago
Mohammad Aljammal bdb42e2704 Merge branch 'font' into 'master'
add font

See merge request Cloud_Solution/diplomatic-quarter!77
4 years ago
Mohammad Aljmma 1cf4797d4f add font 4 years ago
Mohammad Aljammal 1323551bb1 Merge branch 'hot_fixing' into 'master'
hot fixing

See merge request Cloud_Solution/diplomatic-quarter!75
4 years ago
Mohammad Aljmma 26cf849f2b hot fixing 4 years ago
Mohammad Aljammal 50dffe9af9 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!74
4 years ago
Mohammad Aljmma d0ed776ff6 new home health service 4 years ago
haroon amjad dfa7e0e02f updates & fixes 4 years ago
haroon amjad 0b6cd845f1 implementing Smart Watch Integration 4 years ago
haroon amjad 22ef24c4ff Merge branch 'master' into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
4 years ago
Mohammad Aljammal 9126934ef4 Merge branch 'er_location' into 'master'
Er location

See merge request Cloud_Solution/diplomatic-quarter!72
4 years ago
jammal 9328f942ba done ER service 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
jammal bd2254491c done ER service 4 years ago
Mohammad Aljammal f604b0322a Merge branch 'ios_issues' into 'master'
fix ios issues

See merge request Cloud_Solution/diplomatic-quarter!71
4 years ago
jammal 57f938aa09 fix ios issues 4 years ago
Mohammad Aljammal d90a28aecf Merge branch 'ios_issues' into 'master'
fix ios issues

See merge request Cloud_Solution/diplomatic-quarter!70
4 years ago
jammal 0fceca8f3e fix ios issues 4 years ago
haroon amjad 68b0e3857a updates 4 years ago
Sultan Khan f03a711dff symptom checker gender page updated 4 years ago
haroon amjad 6b316bf262 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/config.dart
#	lib/pages/AlHabibMedicalService/​ health_calculators.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
4 years ago
haroon amjad 7edb6fd179 UI Fixes in LiveCare 4 years ago
Mohammad Aljammal 62efc13047 Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!44
4 years ago
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
Elham Rababah c0a54c8cbc remove commit 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