Commit Graph

401 Commits (042de21831e9091db813d8ad6e47667788bfa251)

Author SHA1 Message Date
Elham Rababah 042de21831 Fix loader issue. 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 d5afb50ed3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljmma 856ab52439 fix ui issues 4 years ago
haroon amjad 6fd7a3fa3d updates 4 years ago
Mohammad Aljmma 89cfcd3cad fix design issues 4 years ago
Mohammad Aljmma 0b90d3c687 fix 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
Mohammad Aljammal 94c25d2188 Merge branch 'loader' into 'diplomatic-quarter-live'
Loader

See merge request Cloud_Solution/diplomatic-quarter!84
4 years ago
Elham Rababah 6f5b5ed0c2 move gif loader utils 4 years ago
Elham Rababah bf412e1edf Finish loader as Gif image in all cases where the network is busy 4 years ago
haroon amjad d5118bda11 Login / Register UI fixes 4 years ago
Elham Rababah cd7c354458 loader first step 4 years ago
haroon amjad 3354058738 Branding updated according to DQ 4 years ago
haroon amjad 3ae6df1dcb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live 4 years ago
haroon amjad 6a630f6d33 logo & colors changed for login & registration flow 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 Aljmma 1cf4797d4f add font 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
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
jammal 57f938aa09 fix ios issues 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 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 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 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