Commit Graph

1137 Commits (b70c7d7d053d2d8970ce35be442f05be6f3b0b7a)
 

Author SHA1 Message Date
Mohammad Aljammal d9a70e7f75 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
hot fixes

See merge request Cloud_Solution/diplomatic-quarter!199
4 years ago
Mohammad Aljammal 8329c534a3 hot fixes 4 years ago
Mohammad Aljammal 4e2979cd64 fix merge issues 4 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 4 years ago
Mohammad Aljammal aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
mosazaid 359eba2da0 make some updates in firebase version and update gradle, finish review order 4 years ago
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 4 years ago
Mohammad Aljammal 9b67b2632b Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!196
4 years ago
Sultan Khan e312671e24 hot fixes 4 years ago
Sultan Khan cf642da661 landing page 4 years ago
Mohammad Aljammal d8134240de Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!195
4 years ago
Sultan Khan eec67ac930 big fixes 4 years ago
Sultan Khan 99ee5b4545 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal ca1e496481 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix home issues

See merge request Cloud_Solution/diplomatic-quarter!192
4 years ago
Mohammad Aljammal b29fdbb7d0 fix home issues 4 years ago
Sultan Khan 8a554aa2f8 auth services fixed 4 years ago
Mohammad Aljammal 530c9e89fc Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix

See merge request Cloud_Solution/diplomatic-quarter!191
4 years ago
Mohammad Aljammal d9759560c3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/login/login.dart
4 years ago
Mohammad Aljammal 02d72fa27c fix issues 4 years ago
Fatimah Alshammari 4a84483698 fixed order details 4 years ago
Mohammad Aljammal 2a2d149cc6 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!189
4 years ago
Sultan Khan 0f594059b5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal 466b17949a Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!190
4 years ago
haroon amjad a7dc2fdfd1 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
haroon amjad 781fd1c287 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 3aa592e2b0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 9a578cafc2 bug fixes 4 years ago
Sultan Khan b759758a68 bug fixes 4 years ago
Mohammad Aljammal 3860a08b53 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix issues

See merge request Cloud_Solution/diplomatic-quarter!188
4 years ago
Mohammad Aljammal f38f53587b fix issues 4 years ago
Haroon Amjad 3308aa47e1 fixes 4 years ago
Mohammad Aljammal 1c2f08a9fe Merge branch 'sultan' into 'diplomatic-quarter-live'
login loader issue fixed

See merge request Cloud_Solution/diplomatic-quarter!186
4 years ago
Sultan Khan 9e3db622fa login loader issue fixed 4 years ago
Zohaib Kambrani 78928335ef Geofences Login check (unregister/register geozones on logout/logout) 4 years ago
Zohaib Kambrani 6f6ab8d987 no message 4 years ago
Mohammad Aljammal d5c5b7eaed Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix

See merge request Cloud_Solution/diplomatic-quarter!185
4 years ago
Mohammad Aljammal 3122f2438b fix import dialog 4 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 4 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 4 years ago
Mohammad Aljammal 82724883fb Merge branch 'ZohaibIqbalKambrani' into 'master'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!183
4 years ago
Mohammad Aljammal fc00361db1 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!184
4 years ago
Zohaib Kambrani 53775d113d commented code offers and packages 4 years ago
Zohaib Kambrani 9947b30d3f fix merge conflict 4 years ago
Zohaib Kambrani c534061c4f no message 4 years ago
Zohaib Kambrani 9ea779e48a no message 4 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 4 years ago
haroon amjad 965c97d262 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad bf999e611b my appointment fix 4 years ago
Mohammad Aljammal 7345a289ed Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!182
4 years ago
Sultan Khan d779c6dd0a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago