haroon amjad
|
7ddd932c51
|
no message
|
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
|
8862cc6c06
|
Release issues resolved
|
1 year ago |
haroon amjad
|
fd70387b2d
|
Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
# Conflicts:
# pubspec.yaml
|
1 year ago |
taha.alam
|
633059b0be
|
WD: Location dialog is added.
|
1 year ago |
haroon amjad
|
b64cf0bf6c
|
SFCalendar issue fixed & update to stores 16.4
|
1 year ago |
haroon amjad
|
db91921de1
|
update to stores version 16.3
|
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
|
b6ba9fff2f
|
Updates n fixes
|
1 year ago |
haroon amjad
|
6f0cfebc89
|
Translation updates as requested by QA
|
1 year ago |
haroon amjad
|
2d82b97680
|
updates
|
1 year ago |
Haroon Amjad
|
029f174a6c
|
Penguin scenarios implemented
|
1 year ago |
haroon amjad
|
393ea45d2c
|
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
|
a39d2840e0
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
|
1 year ago |
haroon amjad
|
66ec7b5ca4
|
Derma package appointment booking fixes
|
1 year ago |
haroon amjad
|
ed037edf22
|
Apple Pay fixes
|
1 year ago |
haroon amjad
|
53015422e5
|
PenguinIn integration with HMG App
|
1 year ago |
haroon amjad
|
0eaeb75207
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
|
1 year ago |
haroon amjad
|
ca8533190a
|
Walkin appointment booking implementation contd
|
1 year ago |
haroon amjad
|
31aa09e35b
|
translation fix
|
1 year ago |
haroon amjad
|
d65325f998
|
Payment flow integration for Walk-In appointments
|
1 year ago |
Sultan khan
|
554548bc9a
|
CR updates
|
1 year ago |
Sultan khan
|
9501c2ea9a
|
derma CR 6804 CHANGES and language on initial load issue fix.
|
1 year ago |
haroon amjad
|
984459d314
|
Walkin appointment implementation contd
|
1 year ago |
haroon amjad
|
b3f2904e9a
|
Waiting appointment implementation contd.
|
2 years ago |
haroon amjad
|
52e63fe5e4
|
Update to stores 15.9
|
2 years ago |
haroon amjad
|
d0e743dcc9
|
Family members issue fixed in android
|
2 years ago |
haroon amjad
|
8edf65daf1
|
Updates & Fixes
|
2 years ago |
haroon amjad
|
c948a1780c
|
Update to stores VersionID 15.8
|
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
|
d9cf383648
|
Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/reports/report_home_page.dart
|
2 years ago |
haroon amjad
|
3a65113149
|
Update to stores 15.7
|
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
|
6e30df2a29
|
WeCare service added
|
2 years ago |
haroon amjad
|
4c0d758dd1
|
Zoom updates
|
2 years ago |
Sultan khan
|
d1b13d5ce9
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
haroon amjad
|
a4a638aa37
|
updates
|
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 |