haroon amjad
|
c175139a29
|
pharmacy fixes
|
4 years ago |
haroon amjad
|
b15bd2362b
|
Updates & fixes
|
4 years ago |
haroon amjad
|
c2b0326676
|
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 |
Sikander Saleem
|
9ba7b3b44b
|
Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/medical/smart_watch_health_data/syncHealthData.dart
# lib/pages/vaccine/my_vaccines_screen.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# pubspec.yaml
|
4 years ago |
Sikander Saleem
|
2a92478d01
|
nfc plugin improvement.
|
4 years ago |
Sikander Saleem
|
628439ddf8
|
video call camera view issue fix, barcode plugin change, smart watches improvements.
|
4 years ago |
Sikander Saleem
|
caec2c4ca4
|
video call improvements.
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
haroon amjad
|
6c20bf50b5
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!553
|
4 years ago |
hussam al-habibeh
|
3c97122308
|
pharmacy home dsign
|
4 years ago |
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
4 years ago |
Sikander Saleem
|
4518a26ff1
|
video call improvement.
|
4 years ago |
haroon amjad
|
777d88be30
|
updates
|
4 years ago |
haroon amjad
|
3ec2f990b1
|
product detail page updates
|
4 years ago |
haroon amjad
|
502c7fd3de
|
Offers & discounts UI updating
|
4 years ago |
haroon amjad
|
925e3cb686
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/landing_page_pharmcy.dart
# lib/pages/login/login.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/screens/product-details/product-detail.dart
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/pharmacy/profile/profile.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
hussam al-habibeh
|
46d7e7ee14
|
show bottom nav in pharmacy all pages
|
4 years ago |
haroon amjad
|
e7f5fc8434
|
Blood donation fixes
|
4 years ago |
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
4 years ago |
hussam al-habibeh
|
bc91b9ad88
|
bottom nav pharmacy
|
4 years ago |
Fatimah Alshammari
|
42e74759e4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
|
4 years ago |
Elham Rababh
|
2c30b5a494
|
fix issues
|
4 years ago |
haroon amjad
|
924f685342
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/Blood/blood_donation.dart
|
4 years ago |
haroon amjad
|
ddf764897a
|
Pharmacy Payment method design fix, Blood Donation fix
|
4 years ago |
Sikander Saleem
|
d8476df6dd
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
|
4 years ago |
Sikander Saleem
|
4858f8883a
|
blood donation dialog change & improvements.
|
4 years ago |
haroon amjad
|
3dc82a0547
|
Pharmacy updates
|
4 years ago |
haroon amjad
|
eed4fd2509
|
Pharmacy prescriptions page design
|
4 years ago |
haroon amjad
|
6f92a093ab
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
haroon amjad
|
e913316c54
|
Updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
8b1ac05012
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
app bar back icon issue
improvements
emergency nearest ui changes
Zoom Avatar implementation
no message
Child Vaccine 3
register
register page
Working on Health data
Child Vaccine 2
registration
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
registration done
Child Vaccine 1.0
In App Review
In App Review
oder log merge fix
design fixes 3
Chart fix & In-App update implemented
design fixes 1.1
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
aad071ac67
|
Packages and Offers apply token
|
4 years ago |
Mirza.Shafique
|
957ff9039b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
1a6802ce24
|
Child Vaccine 3
|
4 years ago |
haroon amjad
|
2062b96652
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
3db4094585
|
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
|
4 years ago |
Mirza.Shafique
|
a766c2522e
|
Child Vaccine 1.0
|
4 years ago |
Mirza.Shafique
|
3d480bac5c
|
design fixes 3
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
Mirza.Shafique
|
0ba4e9047b
|
design fixes 1.0
|
4 years ago |
Sikander Saleem
|
706832a1cb
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
haroon amjad
|
5d44fff28d
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
Mirza.Shafique
|
ab6f7b8915
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Mirza.Shafique
|
eeaf7d9d2f
|
HMG Services Detail View
|
4 years ago |
haroon amjad
|
2db050a228
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
e564cdc7e5
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
0b4305de03
|
all dialog changes and improvements (cont).
|
4 years ago |