haroon amjad
|
d9b4b1575d
|
Merge branch 'dev_3.13.6_merge_ER_Online_CheckIn' into dev_v3.13.6
|
1 year ago |
haroon amjad
|
6386da8936
|
Mapbox key updated to custom maps
|
1 year ago |
haroon amjad
|
18b4fc5317
|
Patient app update
|
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
|
03e5604f68
|
updates
|
1 year ago |
Aamir.Muhammad
|
5883b06fcb
|
Updated to 3.24 Flutter & Penguin Fixed.
|
1 year ago |
Haroon Amjad
|
1c66351011
|
Updates & fixes
|
1 year ago |
Haroon Amjad
|
60a35032e5
|
Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn
|
1 year ago |
Aamir.Muhammad
|
7065b00c5c
|
Penguin Map Integration & Permissions Fixes.
|
1 year ago |
Haroon Amjad
|
72d459ce10
|
PenguinIn updates
|
1 year ago |
Aamir.Muhammad
|
29830f4f55
|
Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn
# Conflicts:
# ios/Runner/Helper/HMGPenguinInPlatformBridge.swift
# ios/Runner/Penguin/PenguinView.swift
|
1 year ago |
Aamir.Muhammad
|
cba8369a51
|
Penguin Map Integration & Permissions Fixes.
|
1 year ago |
Haroon Amjad
|
029f174a6c
|
Penguin scenarios implemented
|
1 year ago |
haroon amjad
|
53015422e5
|
PenguinIn integration with HMG App
|
1 year ago |
Sultan khan
|
90dc8e5e05
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/models/LiveCare/ApplePayInsertRequest.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/uitl/location_util.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
52b3c196d6
|
updates
|
2 years ago |
devamirsaleemahmad
|
1ddac14efb
|
Calender Permission Fix Ios 17+
|
2 years ago |
devamirsaleemahmad
|
720c0ac6e9
|
changes & Deletion
|
2 years ago |
haroon amjad
|
52070c8f94
|
Updates & fixes
|
3 years ago |
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
4 years ago |
haroon amjad
|
2a22edfdd0
|
no message
|
4 years ago |
Zohaib Iqbal
|
259e27d4a7
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/uitl/app_shared_preferences.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
4 years ago |
haroon amjad
|
3107d1e86d
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
1a6a26be75
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5: (36 commits)
merge improvements
Health plugin updated
fix search issue
JIRA bug fixes
updates & fixes
Fixes & updates
six issues
nfc plugin improvement.
disable lakum on check out page
fix issue
fix lakum issues
Smartwatch fixes
screen plugin improvement.
Updates & fixes
video call camera view issue fix, barcode plugin change, smart watches improvements.
add quantity filed fixed
pharmacy uo fix
Fixes
fix issue
Speech to text fix in iOS
...
# Conflicts: Resolved
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# android/build.gradle
# android/gradle/wrapper/gradle-wrapper.properties
# lib/pages/conference/web_rtc/widgets/cam_view_widget.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/incoming_call.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
63ffabcc86
|
no message
|
4 years ago |
Fatimah Alshammari
|
749b89b67d
|
fix issue
|
4 years ago |
Fatimah Alshammari
|
7ffb431454
|
added map luncher
|
4 years ago |
haroon amjad
|
5f0985adaa
|
Updates
|
4 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
aad071ac67
|
Packages and Offers apply token
|
4 years ago |
Zohaib Iqbal Kambrani
|
d0986fcaf6
|
OpenTok SDK applied and method channels written to native
|
4 years ago |
Sikander Saleem
|
6575adda42
|
merge changes-5
|
5 years ago |
Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
5 years ago |
Zohaib Iqbal Kambrani
|
b91ce441e2
|
Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
5 years ago |
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
5 years ago |
Zohaib Iqbal Kambrani
|
63663f1b24
|
Track Delivery Driver Completed
|
5 years ago |
Zohaib Kambrani
|
57925e3b02
|
Geofence fixes by JobScheduler
|
5 years ago |
Zohaib Kambrani
|
a11d93332d
|
Wifi check network available - android
tweaking at geofence code
|
5 years ago |
Zohaib Kambrani
|
508bc191be
|
geofencing login check fix
|
5 years ago |
Zohaib Kambrani
|
d8bd7d145d
|
no message
|
5 years ago |
Zohaib Kambrani
|
1dc9400ffc
|
Geofencing work in progress on android
|
5 years ago |
Zohaib Kambrani
|
78928335ef
|
Geofences Login check (unregister/register geozones on logout/logout)
|
5 years ago |
Zohaib Kambrani
|
6f6ab8d987
|
no message
|
5 years ago |
Zohaib Kambrani
|
9947b30d3f
|
fix merge conflict
|
5 years ago |
Zohaib Kambrani
|
c534061c4f
|
no message
|
5 years ago |
Zohaib Kambrani
|
b7088f70cd
|
Merge master in to my branch with Geofence iOS
|
5 years ago |
Zohaib Kambrani
|
67f4b4e167
|
iOS Geofence in progress
|
5 years ago |
Zohaib Kambrani
|
8457972fda
|
no message
|
5 years ago |
Zohaib Kambrani
|
8d5d55a150
|
Geofencing in progress
|
5 years ago |