Faiz Hashmi
|
ccb9e93d62
|
Added InAppApple Pay with PayFort
|
2 years ago |
haroon amjad
|
e50a67ea12
|
Vida Plus changes
|
3 years ago |
haroon amjad
|
22274ebbb0
|
updates & fixes
|
3 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
3 years ago |
haroon amjad
|
8b7a6e7689
|
ED Online Check-In
|
3 years ago |
haroon amjad
|
9057a96d7f
|
Updates & fixes
|
3 years ago |
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
4 years ago |
haroon amjad
|
4b4ac4819f
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
63ffabcc86
|
no message
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
4 years ago |
haroon amjad
|
39190681c6
|
Updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
b596b1b61d
|
WebRTC and Packages Offer | Merge
|
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
|
bc91b9ad88
|
bottom nav pharmacy
|
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 |
haroon amjad
|
12a58856e5
|
Chart fix & In-App update implemented
|
4 years ago |
haroon amjad
|
494b1f221d
|
Updates & fixes
|
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 |
Mohammad Aljammal
|
eb19daa98f
|
fix car count
|
4 years ago |
mosazaid
|
fdb61c78c5
|
fix bugs pharmacy home
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
haroon amjad
|
4469ae1209
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
0a83cf8241
|
Bug Fixis
|
4 years ago |
Mirza.Shafique
|
5f44dece71
|
Ganaric Font and font implementaion
|
4 years ago |
Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
4 years ago |
Mirza.Shafique
|
a20185b2b9
|
Home page 1.4 (Homepage changes)
|
4 years ago |
Zohaib Iqbal Kambrani
|
dbf525c484
|
no message
|
4 years ago |
Mirza.Shafique
|
58d5734f1a
|
Bug Fix: 873, 878 to 881
|
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
|
5 years ago |
Zohaib Iqbal Kambrani
|
6f2c947687
|
Packages And offers..
|
5 years ago |
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
5 years ago |
Sultan Khan
|
e61c26b853
|
Auto SMS, Themes, Voice Command
|
5 years ago |
Sultan Khan
|
c65983bfdb
|
code merged
|
5 years ago |
Mohammad Aljammal
|
30ddea6419
|
hot fixing
|
5 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
|
5 years ago |
Mohammad Aljammal
|
298b4d6525
|
change color
|
5 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
|
5 years ago |
enadhilal
|
10734d5994
|
connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
|
5 years ago |
Mohammad Aljammal
|
6bda03e935
|
hot fixing
|
5 years ago |
Zohaib Kambrani
|
92ba977fca
|
no message
|
5 years ago |
Zohaib Kambrani
|
8d5d55a150
|
Geofencing in progress
|
5 years ago |
haroon amjad
|
6846a8501a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
Mohammad Aljammal
|
a556e8c1f8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/config.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
|
5 years ago |
Sultan Khan
|
8d499704dc
|
family file changes
|
5 years ago |
Mohammad Aljammal
|
f70ca95a38
|
fix merge issues
|
5 years ago |
Sultan Khan
|
2f454055b9
|
login fixed
|
5 years ago |
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
5 years ago |