Commit Graph

162 Commits (1553e71e7dad603b87f4ff2b8660cf843125bac4)

Author SHA1 Message Date
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 d0ed776ff6 new home health service 4 years ago
jammal 9328f942ba done ER service 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 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
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
Amjad amireh 83735ab68d modified Child vaccintion note 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 7b6135a6c7 voice search 4 years ago
Sultan Khan 8f18d1025a voice search 4 years ago
Sultan Khan 227731f8f8 Merge 4 years ago
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 5c859034d6 voice search 4 years ago
Elham Rababah 0a60b27ab4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/locator.dart
4 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
4 years ago
haroon amjad 929e289a6f started implementing Covid-19 DriveThru Test Module 4 years ago
Elham Rababah dd76ae05a7 fix H2O page issue 4 years ago
Amjad amireh 675d544514 Blood Denote 4 years ago
Elham Rababah bf6a8cecc6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal 3946f0355c Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljammal d6a27a8e28 change medical profile icons 4 years ago
Elham Rababah 91a8b94382 Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/landing_page.dart
4 years ago
Elham Rababah b853bede68 first step from h2o 4 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 4 years ago
Sultan Khan 03ff56f2de Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 591e9e9a4c updated 4 years ago
Elham Rababah 1e3ff89dbd finish new e-referral except calling the service 4 years ago
hussam al-habibeh 3c5adc0a1d HMG Service layout 4 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 4 years ago