Commit Graph

897 Commits (cee903dd6bb794d55357f2c19ae358a0f0af6c8c)

Author SHA1 Message Date
haroon amjad cee903dd6b changes for the hospital gesture clicked area and nearest check not showing the hospital dropdown area 1 year ago
haroon amjad a6ee6869cc Merge commit '81b94814ce4f0a1e4626fe07a9b7933246d71336' into dev_v3.13.6 1 year ago
Haroon Amjad 69493934b1 Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/QRCode.dart
1 year ago
Haroon Amjad 057994dfd2 Merge branch 'dev_3.13.6_CR6750' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
taha.alam 936682ff95 WD: clinic by hospital 1 year ago
haroon amjad fd70387b2d Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
# Conflicts:
#	pubspec.yaml
1 year ago
haroon amjad 06c0580d84 updates 1 year ago
taha.alam 633059b0be WD: Location dialog is added. 1 year ago
Haroon Amjad 49c11537b3 updated to latest flutter 3.24 1 year ago
Aamir.Muhammad e045c375d2 Merge branch 'refs/heads/dev_v3.13.6' into dev_v3.13.6_PenguinIn_3.22-IOS
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad f42223292a Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/config.dart
1 year ago
haroon amjad 536c95c825 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/drawer/app_drawer_widget.dart
1 year ago
haroon amjad 6f0cfebc89 Translation updates as requested by QA 1 year ago
Haroon Amjad 1c66351011 Updates & fixes 1 year ago
Aamir.Muhammad 145cd6010a Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn 1 year ago
Aamir.Muhammad 7065b00c5c Penguin Map Integration & Permissions Fixes. 1 year ago
taha.alam ae7fbbfb98 WD: penguin view navigation to clinic id added and username modified. 1 year ago
haroon amjad f83d538472 fixes 1 year ago
Haroon Amjad 05d0d2d5a7 PenguinIn Params updated 1 year ago
Haroon Amjad 6efb316377 homepage updates 1 year ago
Haroon Amjad 029f174a6c Penguin scenarios implemented 1 year ago
taha.alam 1e8953538a WD: notification for navigation added 1 year ago
haroon amjad 147fb6cee8 updates 1 year ago
haroon amjad 9f629afb9c Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/app_shared_preferences.dart
1 year ago
haroon amjad d3d8d1f121 Update to stores 16.0 1 year ago
haroon amjad 50ba0372db language updates 1 year ago
haroon amjad 34778d91d7 language fixes 1 year ago
haroon amjad 66ec7b5ca4 Derma package appointment booking fixes 1 year ago
Aamir.Muhammad fb4cf08b89 Penguin Map Integration & Permissions Fixes. 1 year ago
haroon amjad 53015422e5 PenguinIn integration with HMG App 1 year ago
Sultan khan 9501c2ea9a derma CR 6804 CHANGES and language on initial load issue fix. 2 years ago
haroon amjad b3f2904e9a Waiting appointment implementation contd. 2 years ago
haroon amjad 52e63fe5e4 Update to stores 15.9 2 years ago
haroon amjad 8a319cc2f2 updates & fixes 2 years ago
haroon amjad c948a1780c Update to stores VersionID 15.8 2 years ago
Aamir.Muhammad 515896c265 Calender Event Fixes 2 years ago
haroon amjad 5b7b40c732 Updates & fixes 2 years ago
haroon amjad c97fd25cdd Zoom integration updates & other stability fixes 2 years ago
Aamir.Muhammad 29c2fd067e Null fixes after merge from 3.13 2 years ago
Aamir.Muhammad 8441a0ef00 Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/pages/login/login.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	lib/uitl/utils.dart
#	lib/widgets/dialogs/radio_selection_dialog.dart
2 years ago
haroon amjad 96d5c3ce1d My Instructions added 2 years ago
haroon amjad 5f90435442 National ID input validation added 2 years ago
haroon amjad 6e30df2a29 WeCare service added 2 years ago
Sultan khan c9be715436 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
2 years ago
haroon amjad 69e64fd5fb Blood Donation CR merged into dev_3.3 2 years ago
Aamir Muhammad e18ba6822a changes local 2 years ago
Aamir Muhammad 660ec3a207 changes local 2 years ago
Aamir Muhammad 52a5e978a7 changes local 2 years ago
Sultan khan 5e9d08b9aa Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
2 years ago
Sultan khan 08b4c8f86e Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/main.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/LiveCareHistoryCard.dart
#	lib/pages/medical/eye/ContactLensPage.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/time_line_new_widget.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago