Sikander Saleem
|
56c0adaada
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Sultan Khan
|
b1453b52e3
|
registration
|
4 years ago |
Sultan Khan
|
97d7f9225e
|
package name changed
|
4 years ago |
haroon amjad
|
5007064105
|
Jira fixes
|
5 years ago |
Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
5 years ago |
Sikander Saleem
|
889ae24f07
|
merge changes-3
|
5 years ago |
Mirza.Shafique
|
49bfa2e9a7
|
Home page 1.3
|
5 years ago |
Haroon Amjad
|
47e521fe1d
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
5 years ago |
hussam al-habibeh
|
981e78936e
|
jira bugs
|
5 years ago |
Haroon Amjad
|
213d104d57
|
Covid test procedure selection implemented
|
5 years ago |
Sultan khan
|
487d63ec7f
|
Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC
See merge request Cloud_Solution/diplomatic-quarter!326
|
5 years ago |
Sikander Saleem
|
eb9005510d
|
bug fixes and insurance approvals improvements.
|
5 years ago |
Mirza.Shafique
|
b31813770e
|
Check-In NFC done
|
5 years ago |
haroon amjad
|
7b6270c67f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
5 years ago |
haroon amjad
|
bcb4f48785
|
build fix
|
5 years ago |
Sultan Khan
|
33465b04e5
|
permission
|
5 years ago |
Sultan Khan
|
d5d48703f9
|
camera permission fixed
|
5 years ago |
Sultan Khan
|
85e803651c
|
permission issue fixed
|
5 years ago |
Sultan Khan
|
bcabd81f88
|
BUG FIXES
|
5 years ago |
Mohammad Aljammal
|
1607aecb4a
|
Merge branch 'pharmacy-Fatima' into 'development'
fixed an issue in recommended page
See merge request Cloud_Solution/diplomatic-quarter!304
|
5 years ago |
Fatimah Alshammari
|
265d13b970
|
fixed an issue in recommended page
|
5 years ago |
Sultan Khan
|
3d6858d0ec
|
bug fixes
|
5 years ago |
haroon amjad
|
f754e48034
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
|
5 years ago |
Sultan Khan
|
1b770420be
|
bug fixes
|
5 years ago |
haroon amjad
|
accc39d972
|
jira bug fixes
|
5 years ago |
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
5 years ago |
Fatimah Alshammari
|
a46dddea9a
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/core/model/pharmacies/order_model.dart
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/profile/profile.dart
|
5 years ago |
Fatimah Alshammari
|
c629fcb85c
|
fixed recommended products new design
|
5 years ago |
mosazaid
|
f3cdd08857
|
adding fharmacy payment feature
|
5 years ago |
enadhilal
|
0c6fb67718
|
fixed issues
|
5 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
|
5 years ago |
Fatimah Alshammari
|
ac32ba998c
|
fixed order isuee
|
5 years ago |
enadhilal
|
830e871e2c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
|
5 years ago |
haroon amjad
|
b6c617888b
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/localized_values.dart
|
5 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
|
5 years ago |
Fatimah Alshammari
|
ce64da11e4
|
homepage and product details design
|
5 years ago |
Mohammad Aljammal
|
d477481856
|
fix security issues in pharmacy
|
5 years ago |
haroon amjad
|
0b83089b86
|
Merge branch 'development' into Haroon
|
5 years ago |
haroon amjad
|
146019432a
|
LiveCare schedule implemented
|
5 years ago |
Sikander Saleem
|
8f37fbf260
|
Qr icon added, notify me api added & improvements
|
5 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
|
5 years ago |
Fatimah Alshammari
|
0f22a50a5d
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
|
5 years ago |
Fatimah Alshammari
|
ba4003cb56
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/locator.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/profile/profile.dart
|
5 years ago |
Fatimah Alshammari
|
52fa0f6f89
|
fixed orders
|
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
|
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
|
5 years ago |
mosazaid
|
38d58ebaaf
|
Merge branch 'pharmacy' into pharmacy_mosa_branch
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
# lib/services/pharmacy_services/pharmacyAddress_service.dart
# lib/uitl/translations_delegate_base.dart
|
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 |
Fatimah Alshammari
|
c0920e7099
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |