Commit Graph

479 Commits (01512e633278d17bf5c065100ec90d0efd9beb24)

Author SHA1 Message Date
Elham Rababah 0b9a834673 Finish cancel order 5 years ago
Elham Rababah 293c557b54 First step from Home health care service 5 years ago
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 3d6eafe473 Ambulance Service first step 5 years ago
Amjad amireh db19eec35f Blood Denote 5 years ago
Sultan Khan 5c859034d6 voice search 5 years ago
Amjad amireh 42fd2e0eee Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into child_vaccines
 Conflicts:
	lib/core/viewModels/base_view_model.dart
5 years ago
Amjad amireh 20ef255ee6 Blood Denote 5 years ago
Amjad amireh 98947d5f6b Blood Denote 5 years ago
Mohammad Aljammal 0d12210116 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers 5 years ago
Mohammad Aljammal c7d396875e Ambulance Service steps 5 years ago
Elham Rababah fdc8ef36ef Refactor today page 5 years ago
Elham Rababah 0a60b27ab4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/locator.dart
5 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
5 years ago
Mohammad Aljammal f543126152 Ambulance Service 5 years ago
haroon amjad 6c0bb12c84 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# 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
5 years ago
haroon amjad 929e289a6f started implementing Covid-19 DriveThru Test Module 5 years ago
Amjad amireh b658e7be4d Blood Denote 5 years ago
Elham Rababah dd76ae05a7 fix H2O page issue 5 years ago
Amjad amireh a00b3a133c Blood Denote 5 years ago
Amjad amireh 675d544514 Blood Denote 5 years ago
haroon amjad 7fdc0da9dc livecare scheduling implemented 5 years ago
Amjad amireh 0ec39920f0 Blood Denote 5 years ago
Amjad amireh 5e50c0dc32 Blood Denote 5 years ago
Mohammad Aljammal 020d10fccc Merge branch 'insurance' into 'master'
Health Converter

See merge request Cloud_Solution/diplomatic-quarter!56
5 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
5 years ago
Mohammad Aljammal bae6fe4ad6 fix marge issues 5 years ago
Elham Rababah 37d9eae9ea improve E-referral 5 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
5 years ago
Mohammad Aljammal d6a27a8e28 change medical profile icons 5 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 5 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 5 years ago
Elham Rababah c994c39c6b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral 5 years ago
Elham Rababah a00bc8268e improve E-referral 5 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
5 years ago
Elham Rababah b1b6c77d62 Finish H2O Services 5 years ago
hussam al-habibeh 3e184f43db Health Converter 5 years ago
Elham Rababah b853bede68 first step from h2o 5 years ago
Amjad amireh 43689d19ce Contact us , virtual tout ,News 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Amjad amireh 9a6eadc3fb Contact us and virtual tout 5 years ago
Sultan Khan 79502de682 update 5 years ago
Sultan Khan 03ff56f2de Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 986a2e92f6 Merge branch 'find_us' into 'master'
Find us

See merge request Cloud_Solution/diplomatic-quarter!54
5 years ago
Amjad amireh 7c48a6f16a Contact us 5 years ago
Amjad amireh 5ce252d296 Contact us 5 years ago
Amjad amireh 50d862b076 Contact us 5 years ago
Amjad amireh 97d0c439c7 Contact us 5 years ago
Amjad amireh 5f981c9248 Contact us 5 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
5 years ago
haroon amjad f25d18353f icons updated 5 years ago
Sultan Khan 591e9e9a4c updated 5 years ago
Elham Rababah ae147b5988 first step from search referrals 5 years ago
Mohammad Aljammal 82226e62e1 Merge branch 'insurance' into 'master'
HMG Service layout

See merge request Cloud_Solution/diplomatic-quarter!52
5 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 5 years ago
Elham Rababah 1e3ff89dbd finish new e-referral except calling the service 5 years ago
Amjad amireh aa66e427b1 Contact us 5 years ago
Amjad amireh 24456895ee Contact us 5 years ago
Amjad amireh 24693f2992 Contact us 5 years ago
Amjad amireh de5633d58b Contact us 5 years ago
hussam al-habibeh 3c5adc0a1d HMG Service layout 5 years ago
Elham Rababah f582eee991 make index page of add new referral as page controller 5 years ago
Amjad amireh c2cfea7360 Contact us 5 years ago
Amjad amireh 571023e521 Contact us 5 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 5 years ago
Amjad amireh c2b7507005 Contact us 5 years ago
Amjad amireh dd3608e9ee Contact us 5 years ago
Elham Rababah a4905783ad refactor dialogs structure 5 years ago
Elham Rababah 7840ec4c3b finish activation process until step 2 5 years ago
Mohammad Aljammal c01e6095f2 done my trackers 5 years ago
Amjad amireh a4ea5f8e3e Contact us 5 years ago
Elham Rababah f1f3b6bd56 first step from e-referral 5 years ago
haroon amjad b9a0438ebb Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad a5fd9f53ab Payment flow implemented in advance payment 5 years ago
Mohammad Aljammal 14f3e08077 Merge branch 'amjad_amireh' into 'master'
edit card_position.dart

See merge request Cloud_Solution/diplomatic-quarter!47
5 years ago
haroon amjad 478917b240 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Mohammad Aljammal b4a7408962 Merge branch 'payment_service' into 'master'
add payment service page and translations

See merge request Cloud_Solution/diplomatic-quarter!49
5 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 5 years ago
haroon amjad 38c980be81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 5400d534db updates for push notifications 5 years ago
Mohammad Aljammal b6db1d1fd8 Merge branch 'my_balance' into 'master'
done My balance

See merge request Cloud_Solution/diplomatic-quarter!48
5 years ago
Mohammad Aljammal a0300738e8 done My balance 5 years ago
Amjad amireh 368db03ab8 edit card_position.dart 5 years ago
Amjad amireh a41dd736c4 edit card_position.dart 5 years ago
Amjad amireh d1a01f5afa edit card_position.dart 5 years ago
Sultan Khan 92efbcbd2f my family 5 years ago
Sultan Khan da7fa1038a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 0a2cb22042 design issues fixed 5 years ago
Amjad amireh 6fb063bf48 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh 5 years ago
Amjad amireh dc10f883db Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh 5 years ago
Mohammad Aljammal 4dd3f9ad01 done Patient Sick Leave 5 years ago
Amjad amireh 525080c09e edit card_position.dart 5 years ago
Mohammad Aljammal 57ed83a139 Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
 Conflicts:
	lib/config/config.dart
5 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 5 years ago
Sultan Khan 63e6d06e74 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 5e252d21d2 voice search added more medical option 5 years ago
Mohammad Aljammal fbb4b326a8 Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/locator.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 8e96c79d05 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 33bd972984 add my vaccines item screen 5 years ago
Amjad amireh 62d96a3f1c edit card_position.dart 5 years ago
Sultan Khan 3dc54230be Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 9159928e27 edit on vaccine service 5 years ago
Sultan Khan a535543863 more pages added on the voice search 5 years ago
Amjad amireh e638464657 edit card_position.dart 5 years ago
Mohammad Aljammal ddf53ce999 ER 5 years ago
Mohammad Aljammal 50d1e50df4 ER 5 years ago
Mohammad Aljammal ed1c04ab25 ER 5 years ago
Sultan Khan 7908506d5f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
haroon amjad 8387af844a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 0628aef62a applied dental change in SearchByClinic 5 years ago
Mohammad Aljammal 629251d216 ER 5 years ago
Mohammad Aljammal b7f73bf397 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into monthly_reports 5 years ago
Mohammad Aljammal 153335538a done monthly reports 5 years ago
Sultan Khan a2b3878a27 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a98bc226e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 5485cbab36 ER 5 years ago
Mohammad Aljammal 2ef36d3d8a ER 5 years ago
Mohammad Aljammal f534f8a348 ER 5 years ago
Sultan Khan 0f63b922d1 speech to text 5 years ago
Mohammad Aljammal 20f9f6f06c ER 5 years ago
haroon amjad cbf19f0cd1 Merge branch 'master' into 'Haroon'
# Conflicts:
#   lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 5 years ago
haroon amjad c5794e5c70 Dental flow in my appointments 5 years ago
Mohammad Aljammal 68466c8d03 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/models/Appointments/DoctorListResponse.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 5 years ago
Mohammad Aljammal db79f299b6 ER 5 years ago
Mohammad Aljammal e254261ef9 ER 5 years ago
Sultan Khan f6a3f0e615 family file 5 years ago
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 5 years ago
Mohammad Aljammal e909c16b80 ER 5 years ago
haroon amjad 3e5ef26b29 my appointment sorting implemented 5 years ago
haroon amjad ce9903fd13 nearest appointment flow implemented 5 years ago
haroon amjad 51078227ab Dental appointment flow implemented 5 years ago
Mohammad Aljammal d52e612bff Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 5 years ago
hussam al-habibeh 3a79ddb488 vaccine service 5 years ago
Sultan Khan 826c50ebf1 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
haroon amjad 1886f3a763 implementing Dental Appointment flow 5 years ago
Sultan Khan 6b2f1a86df Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3a4c016f4e search 5 years ago
Mohammad Aljammal 4ffbb80f3d ER 5 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 5 years ago
haroon amjad a7f5dfab5c fixes 5 years ago
haroon amjad 35cd02494c implemented search by doctor list 5 years ago
haroon amjad 13adb46319 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/config/shared_pref_kay.dart
5 years ago
haroon amjad e29c6a892e updates 5 years ago
haroon amjad f669adcb9d Location service implemented 5 years ago
Mohammad Aljammal 91e5a20fd0 fix merge issues 5 years ago
Mohammad Aljammal 54b766de81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal d16ea676cf done parking service ,fix design issues in home page and add new icon 5 years ago
Mohammad Aljammal 01a011a03d done dashboard page 5 years ago
haroon amjad 84e92cb040 updates & fixes 5 years ago
haroon amjad 96b7d00b4b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 823eda0d5c updates 5 years ago
Sultan Khan 130fb53a65 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
haroon amjad 30e08b4417 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/login/login.dart
5 years ago
haroon amjad 7a8392a97e updates 5 years ago
Mohammad Aljammal c0c6376f55 filter doctor by department 5 years ago
Mohammad Aljammal dc9b9e21ad filter doctor by department 5 years ago
Mohammad Aljammal 895c09efa4 parking service 5 years ago
Sultan Khan 1974e51602 merge 5 years ago
Sultan Khan 5d112b5464 merge 5 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 9b55309d53 text to speech 5 years ago
Mohammad Aljammal 4adc2916b4 fix merge issues 5 years ago
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 5 years ago
haroon amjad 61dba06236 Twilio implemented in LiveCare 5 years ago
Sultan Khan 8887ba85fe family file 5 years ago
haroon amjad 732ab90b2f Book Appointment check login 5 years ago
Sultan Khan cb99b2a7a7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 327c4585a6 family file change 5 years ago
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
5 years ago
haroon amjad cc4f5c0615 updates 5 years ago
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 5 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 5 years ago
Mohammad Aljammal f5b16734c6 add time line 5 years ago
Mohammad Aljammal f6d30178bf done medical report 5 years ago
Mohammad Aljammal b6319c558c Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
5 years ago
Mohammad Aljammal 75fdf28036 fix lab Result 5 years ago
Mohammad Aljammal 8495260c5a fix issues in feedback 5 years ago
haroon amjad db30fbdfd2 implementing livecare 5 years ago
haroon amjad 59c279998c working on vital signs integration 5 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 913729fc58 speech search 5 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 5 years ago
haroon amjad 73cf37a3a5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/core/service/client/base_app_client.dart
5 years ago
haroon amjad b9d913e6a5 Merge fixes & updates 5 years ago
Sultan Khan 03b34115c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3b2f9251dc search 5 years ago
Mohammad Aljammal a5e63817f2 done vital sign 5 years ago
Sultan Khan 4c1a8dc38f new changes 5 years ago
Sultan Khan 9afeecf9fa new 5 years ago
Mohammad Aljammal 32e2732c43 feedback service 5 years ago
haroon amjad 3b881f1ab3 appointment details scenarios handled 5 years ago
Amjad Amireh 97dbe62f93 done report service 5 years ago
haroon amjad 7972d01dff Insurance Approval implemented 5 years ago
haroon amjad fde47a5c2c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/core/service/client/base_app_client.dart
5 years ago
haroon amjad 750746aabe updates & fixes 5 years ago
Mohammad Aljammal d093ecd5e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	ios/Podfile
	ios/Runner.xcodeproj/project.pbxproj
	lib/config/config.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal b4b33be3e9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal 37b874fe3f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 5 years ago
haroon amjad c50530734d added my appointments in medical file page 5 years ago
Sultan Khan adbdd2dd0d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 621870eca1 family file changes 5 years ago
haroon amjad 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
hussam al-habibeh f77d4fac66 insurance translation 5 years ago
Haroon Amjad 8ad2941836 Appointment payment finalised, Ask Doc implemeted & other updates 5 years ago
Haroon Amjad 41c922bfeb Appointment payment implemented, Book Success implemented, Appointment flow implemented 5 years ago
haroon amjad 3a9fa97c91 updates 5 years ago
Mohammad Aljammal 716482bc4d Merge branch 'sultan' into 'master'
login changes

See merge request Cloud_Solution/diplomatic-quarter!17
5 years ago
Mohammad Aljammal 5cee1cef4e fix merge issues 5 years ago
Sultan Khan 6af7ac54ba login changes 5 years ago
Mohammad Aljammal 2e0afdb49c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
5 years ago
Sultan Khan d1871bb71f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8ee3b3b557 family files. 5 years ago
hussam al-habibeh 492cfa084b insurance card and insurance update and insurance approval 5 years ago
Mohammad Aljammal 125360ced7 fix merge issues 5 years ago
Mohammad Aljammal 002efe3b45 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal 5ea0df9f1e Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
#	lib/uitl/date_uitl.dart
5 years ago
Mohammad Aljammal 7d230ea14c fix issues 5 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 5 years ago
Sultan Khan 8e3fb6831d registration changes 5 years ago
Sultan Khan e735855c33 registration done. 5 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 5 years ago
Mohammad Aljammal 05222207da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 5 years ago
haroon amjad 00d9214460 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Sultan Khan ecfa1756d3 login changes 5 years ago
Sultan Khan 0bc529f420 login changes 5 years ago
haroon amjad 192a3835d6 implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment. 5 years ago
Mohammad Aljammal 1bbbd18373 labs services 5 years ago
Sultan Khan 9d0a2e1e43 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8d0834ff3e login inprogress 5 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 5 years ago
Mohammad Aljammal 940b327561 done Prescriptions 5 years ago
haroon amjad 06f95c5379 Appointment Details implementation continued 5 years ago
Sultan Khan 41b438fd74 login page changes 5 years ago
haroon amjad 0171664779 Master Merged in to local 5 years ago
haroon amjad 049d455e3c Implementing appointment details functions 5 years ago
Mohammad Aljammal ec09721869 fix merge issues 5 years ago
Mohammad Aljammal 5874f4ba21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal 1ac420ef7c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan 3a15c16883 login changes 5 years ago
Mohammad Aljammal 43349542da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile 5 years ago
Mohammad Aljammal 8de50bfe74 medical - my doctor and prescription services and pages 5 years ago
haroon amjad f5ddfabf50 Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented 5 years ago
hussam al-habibeh e92cb2e1ac Design and return Pharmacy List 5 years ago
haroon amjad 7f4fbadfab Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
5 years ago