Commit Graph

57 Commits (dev_v3.13.6)

Author SHA1 Message Date
Aamir Muhammad 6f99aca8a5 Inpatient Cr Merge 2 years ago
Aamir Muhammad 77651f9652 Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/push-notification-handler.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/uitl/utils_new.dart
#	lib/widgets/avatar/large_avatar.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/bottom_options/BottomSheet.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
Sultan khan 8c46d2577d updated with assets 2 years ago
Sultan khan aa605a2e47 file updated 2 years ago
haroon amjad 38648df897 Meal Plan development continued 2 years ago
haroon amjad 3896f02d13 Timezone Updates 3 years ago
haroon amjad 8b7a6e7689 ED Online Check-In 3 years ago
haroon amjad 9057a96d7f Updates & fixes 3 years ago
haroon amjad 842e099953 DateTime Fixes 3 years ago
haroon amjad f1129cc14c updates & fixes 3 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
haroon amjad d409875741 Smartwatch updates 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
Sikander Saleem 1a0e1f47a6 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 4 years ago
Sikander Saleem bb20d65b40 lab result detail screen. 4 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 4 years ago
Mirza.Shafique 4ebf5f900b improvements. 4 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 4 years ago
Sikander Saleem f6ae7ed770 merge changes-4 4 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 4 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 4 years ago
haroon amjad accc39d972 jira bug fixes 5 years ago
mosazaid f5d478fd27 re-design child vaccine and fix some funcrionalities 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 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
5 years ago
Mohammad Aljammal f38f53587b fix issues 5 years ago
Haroon Amjad b9269f525a hot fixes 5 years ago
Mohammad Aljammal 08aa2de69b fix Prescriptions Service and design issues 5 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad b89c1f03b3 language translation fixes 5 years ago
mosazaid d1ac4080ca working on pharmacy home page 5 years ago
jammal 9328f942ba done ER service 5 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Mohammad Aljammal c01e6095f2 done my trackers 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
Mohammad Aljammal 32e2732c43 feedback service 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 a1fa2c0727 done vital sign 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