Zohaib Iqbal Kambrani
a8e1ba6b86
no message
3 years ago
haroon amjad
2a22edfdd0
no message
3 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
3 years ago
Zohaib Iqbal Kambrani
ab8b62bc3a
Packages and offers fixes, HMG Internet work in progress,
3 years ago
haroon amjad
3107d1e86d
Updates & fixes
3 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
3 years ago
Zohaib Iqbal Kambrani
63ffabcc86
no message
3 years ago
Fatimah Alshammari
749b89b67d
fix issue
3 years ago
Fatimah Alshammari
7ffb431454
added map luncher
3 years ago
haroon amjad
2274c6affe
Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
...
Zik new design 2.0
See merge request Cloud_Solution/diplomatic-quarter!531
3 years ago
haroon amjad
5f0985adaa
Updates
3 years ago
haroon amjad
a646677fae
Pharmacy & smart watch data fixes
3 years ago
Zohaib Iqbal Kambrani
b596b1b61d
WebRTC and Packages Offer | Merge
3 years ago
Zohaib Iqbal Kambrani
f3462dfc19
Applied cost from api at cart
3 years ago
Zohaib Iqbal Kambrani
aad071ac67
Packages and Offers apply token
3 years ago
Zohaib Iqbal Kambrani
d0986fcaf6
OpenTok SDK applied and method channels written to native
3 years ago
Zohaib Iqbal Kambrani
d33432d238
Covid Drive-Thru Questions Screen
3 years ago
Mohammad Aljammal
d9fabbab17
Fix feedback
3 years ago
Zohaib Iqbal Kambrani
dbf525c484
no message
3 years ago
haroon amjad
bcb4f48785
build fix
3 years ago
Elham Rababah
aab33b3e03
PAP-609: fix text align
4 years ago
Elham Rababah
6e7f62ca21
PAP-612: show ok and cancel options
4 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
4 years ago
haroon amjad
e0ebb922ed
pharmacy fixes
4 years ago
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
4 years ago
Zohaib Iqbal Kambrani
63663f1b24
Track Delivery Driver Completed
4 years ago
Mohammad Aljammal
8899bdf460
Done Prescription Delivery Address
4 years ago
Mohammad Aljammal
d477481856
fix security issues in pharmacy
4 years ago
Mohammad Aljammal
db2376f50c
fix blood and weight on my trackers
4 years ago
Zohaib Iqbal Kambrani
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
4 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
4 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
4 years ago
Zohaib Iqbal Kambrani
e2bce87e34
resolve merge conflicts.
4 years ago
Zohaib Iqbal Kambrani
dc83b476d6
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mohammad Aljammal
f77d2b497e
fix issues
4 years ago
Mohammad Aljammal
18dad434a0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
...
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/service/weather_service.dart
lib/core/viewModels/dashboard_view_model.dart
lib/main.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
lib/pages/BookAppointment/Search.dart
lib/pages/ErService/AmbulanceReq.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/pages/login/register.dart
lib/pages/medical/allergies_page.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/doctor/doctor_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
lib/uitl/location_util.dart
lib/widgets/drawer/app_drawer_widget.dart
pubspec.yaml
4 years ago
Mohammad Aljammal
591d56e624
change the info images and change the out patient color
4 years ago
Zohaib Kambrani
57925e3b02
Geofence fixes by JobScheduler
4 years ago
Zohaib Kambrani
a11d93332d
Wifi check network available - android
...
tweaking at geofence code
4 years ago
Zohaib Kambrani
4c00f9b3f2
Merge branch 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ZohaibIqbalKambrani
...
* 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter :
geofencing login check fix
4 years ago
Zohaib Kambrani
7b4a2b9e64
no message
4 years ago
Zohaib Kambrani
508bc191be
geofencing login check fix
4 years ago
Zohaib Kambrani
d8bd7d145d
no message
4 years ago
Mohammad Aljammal
6d7cb1b970
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
...
Conflicts:
ios/Runner.xcodeproj/project.pbxproj
lib/core/service/AuthenticatedUserObject.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mohammad Aljammal
a45216b902
hot fixes
4 years ago
Mohammad Aljammal
a57d5eb69f
hot fixes
4 years ago
Zohaib Kambrani
0f64c45e67
no message
4 years ago
Zohaib Kambrani
1dc9400ffc
Geofencing work in progress on android
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