Commit Graph

181 Commits (741126102d9ca1029419d7d6cb164d0740dac9e3)

Author SHA1 Message Date
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 4 years ago
haroon amjad 506e32e8c8 Payment issues resolved 4 years ago
haroon amjad 05ad8f8db5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 4 years ago
haroon amjad ffbc7c4af4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljmma 7d2f1cf318 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication 4 years ago
Mohammad Aljmma 570aa514cd fix user authentication data 4 years ago
haroon amjad b7b7ead3ba Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad f0897881d1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Elham Rababah 124d388ee1 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
4 years ago
Mohammad Aljmma 4a4d5248a2 fix status issue 4 years ago
haroon amjad 5020c24e8b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/services/authentication/auth_provider.dart
4 years ago
Elham Rababah 5ed4d76a54 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 15a8e64e7c updates & fixes 4 years ago
Elham Rababah 41b919183f Fix bug on read notifications_page.dart 4 years ago
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 4 years ago
Mohammad Aljmma 747cffacfc fix lab result 4 years ago
Elham Rababah 9f2beceb22 First step from notifications_page 4 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 4 years ago
Mohammad Aljmma f79d8eb8f9 fix login issues 4 years ago
Mohammad Aljmma e7e32a414b fix barcode 4 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 4 years ago
Mohammad Aljmma d0ed776ff6 new home health service 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 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
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
Elham Rababah a359a6cd1a fix the loader issue 4 years ago
Amjad amireh 83735ab68d modified Child vaccintion note 4 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 4 years ago
Elham Rababah 83ab1b4d61 fix issues in the services logic and add some translation 4 years ago
Amjad amireh 67e3a13a95 child Vaccines add new child modified 4 years ago
Amjad amireh cb2a78e2ee child Vaccines 4 years ago
Elham Rababah 9ebc6980dd change the checkup item based on service 4 years ago
Amjad amireh 1d29aa36a2 child Vaccines 4 years ago
Amjad amireh fe17c20bdf child Vaccines 4 years ago
Mohammad Aljammal 1ce55e687f Ambulance Service second step 4 years ago
Amjad amireh 6830996f9c child Vaccines 4 years ago
Elham Rababah 31b217aa19 First step from CMC 4 years ago
Amjad amireh e14d619edd child Vaccines 4 years ago
Amjad amireh 0e4ff1f804 child Vaccines 4 years ago
Elham Rababah 0b9a834673 Finish cancel order 4 years ago
Amjad amireh 9ab0d66888 child Vaccines 4 years ago
Elham Rababah 293c557b54 First step from Home health care service 4 years ago
Mohammad Aljammal 3d6eafe473 Ambulance Service first step 4 years ago