haroon amjad
|
eb3f5b5cb5
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
4ba37d342c
|
RRT Updates
|
3 years ago |
|
haroon amjad
|
887303fcde
|
updates
|
3 years ago |
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
23404b4495
|
Video call at InAppWebView
|
3 years ago |
|
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 |
 Sikander Saleem
|
2a92478d01
|
nfc plugin improvement.
|
3 years ago |
|
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
3 years ago |
|
haroon amjad
|
e3b7069aa2
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/webRTC/call_page.dart
# lib/pages/webRTC/signaling.dart
|
3 years ago |
|
haroon amjad
|
8b1733e917
|
no message
|
3 years ago |
|
Sikander Saleem
|
4518a26ff1
|
video call improvement.
|
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
|
b1244f0bf3
|
Huawei MapTiles loading issue fix by apply signing on App and AGConnect
|
3 years ago |
Mirza.Shafique
|
9b160958bb
|
Covid New Design 3
|
3 years ago |
|
haroon amjad
|
0a90791aca
|
Push notification fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
3f178e3e3f
|
Google_Huawei Map -> AppMap
|
3 years ago |
|
haroon amjad
|
2669378da4
|
Insurance Approval API updated
|
3 years ago |
|
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
3 years ago |
|
Sikander Saleem
|
56c0adaada
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
Sultan Khan
|
97d7f9225e
|
package name changed
|
3 years ago |
|
Sikander Saleem
|
6575adda42
|
merge changes-5
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
3 years ago |
|
Sultan Khan
|
14ef096c32
|
changes and fixes
|
3 years ago |
|
haroon amjad
|
bcb4f48785
|
build fix
|
3 years ago |
Fatimah Alshammari
|
747763c4be
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
|
Sultan Khan
|
1a35fe37b6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Fatimah Alshammari
|
42bf76f712
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/config/config.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
|
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
4 years ago |
|
haroon amjad
|
60ea0465fd
|
fixes & updates
|
4 years ago |
|
Fatimah Alshammari
|
ef8312f2b8
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/pharmacies/product_detail.dart
|
4 years ago |
|
Fatimah Alshammari
|
ce64da11e4
|
homepage and product details design
|
4 years ago |
|
Sultan Khan
|
3ac69692be
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
ccd2fc5068
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
haroon amjad
|
6945230965
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
|
Sultan Khan
|
c65983bfdb
|
code merged
|
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
|
72290f041f
|
fix design
|
4 years ago |
|
Mohammad Aljammal
|
1f03919094
|
fix android
|
4 years ago |
|
Mohammad Aljammal
|
3fb522e15f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
lib/core/model/pharmacies/order_model.dart
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
lib/locator.dart
lib/main.dart
lib/pages/landing/landing_page_pharmcy.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/cart-order-preview.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/pages/pharmacies/wishlist.dart
lib/pages/pharmacy/order/Order.dart
lib/pages/pharmacy/order/OrderDetails.dart
lib/pages/pharmacy/order/ProductReview.dart
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
lib/pages/pharmacy/profile/profile.dart
lib/services/pharmacy_services/orderDetails_service.dart
lib/services/pharmacy_services/order_service.dart
lib/services/pharmacy_services/pharmacyAddress_service.dart
lib/services/pharmacy_services/wishList_service.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/borderedButton.dart
lib/widgets/others/app_scaffold_widget.dart
lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Mohammad Aljammal
|
16d1f667d4
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Mohammad Aljammal
|
a2e5b48915
|
fix merge issues
|
4 years ago |
|
Zohaib Kambrani
|
f03adb37ce
|
no message
|
4 years ago |