Mohammad Aljammal
|
0632af3fb5
|
Fix the Authentication Pharmacy
|
5 years ago |
mosazaid
|
b70c7d7d05
|
fix pharmacy auth
|
5 years ago |
mosazaid
|
cbe422cbc6
|
Merge branch 'hmg-services-fixing' into development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
0444b21101
|
Merge branch 'development' into hmg-services-fixing
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
e964afd4f2
|
Merge branch 'fix_security_issue' into 'development'
fix security issues in pharmacy
See merge request Cloud_Solution/diplomatic-quarter!261
|
5 years ago |
Mohammad Aljammal
|
d477481856
|
fix security issues in pharmacy
|
5 years ago |
Sikander Saleem
|
aef4c7bfac
|
H2O feature improvement
|
5 years ago |
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
5 years ago |
Sikander Saleem
|
8f37fbf260
|
Qr icon added, notify me api added & improvements
|
5 years ago |
Mohammad Aljammal
|
484cca086e
|
fix my my Trackers
|
5 years ago |
Mohammad Aljammal
|
db2376f50c
|
fix blood and weight on my trackers
|
5 years ago |
mosazaid
|
38d52b52c8
|
Merge branch 'development' into fix_design
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
|
5 years ago |
mosazaid
|
174534d8a5
|
fix Blood donation functionality and design
|
5 years ago |
Mohammad Aljammal
|
405f67be1e
|
Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
|
5 years ago |
Fatimah Alshammari
|
7a516cae51
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
|
5 years ago |
Mohammad Aljammal
|
f883e1bd78
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Mohammad Aljammal
|
0b1014a91c
|
fix blood sugar service on my tracker
|
5 years ago |
Fatimah Alshammari
|
0f22a50a5d
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
|
5 years ago |
mosazaid
|
3a45239059
|
Merge branch 'development' into fix_design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
f5d478fd27
|
re-design child vaccine and fix some funcrionalities
|
5 years ago |
Mohammad Aljammal
|
200334d8f8
|
Fix ER service
|
5 years ago |
Mohammad Aljammal
|
30ddea6419
|
hot fixing
|
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
|
de1b7cc1d0
|
fix merge issues
|
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
|
f77d2b497e
|
fix issues
|
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
|
519a474d41
|
fix live care label and vital sign data
|
5 years ago |
Fatimah Alshammari
|
c0920e7099
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
Sultan Khan
|
18f492e52f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
d53031b0e6
|
blood type update for family files
|
5 years ago |
Mohammad Aljammal
|
4d8f42b517
|
fix issues vital sign issue
|
5 years ago |
Mohammad Aljammal
|
4f015a1cda
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
5 years ago |
Mohammad Aljammal
|
f6983c138a
|
fix issues
|
5 years ago |
Sultan Khan
|
37ab778fd0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
b505ed1be7
|
blood type added
|
5 years ago |
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
5 years ago |
Fatimah Alshammari
|
e5bf7acc52
|
Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
# lib/core/viewModels/pharmacyModule/order_model_view_model.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
5 years ago |
Mohammad Aljammal
|
9c18c69d90
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
aa89a05f1d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
mosazaid
|
359eba2da0
|
make some updates in firebase version and update gradle, finish review order
|
5 years ago |
Mohammad Aljammal
|
02d72fa27c
|
fix issues
|
5 years ago |
Fatimah Alshammari
|
4a84483698
|
fixed order details
|
5 years ago |
Mohammad Aljammal
|
f38f53587b
|
fix issues
|
5 years ago |