Mohammad Aljammal
|
ec401d4848
|
Done Ed online
|
5 years ago |
Sultan Khan
|
1a35fe37b6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
5 years ago |
hussam al-habibeh
|
e050f87a64
|
pharmacy bugs
|
5 years ago |
hussam al-habibeh
|
8c58dced7d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
Conflicts:
lib/core/service/pharmacy_categorise_service.dart
lib/pages/final_products_page.dart
|
5 years ago |
hussam al-habibeh
|
1b76d9c192
|
pharmacy bugs fixed
|
5 years ago |
mosazaid
|
125dd27a00
|
Merge branch 'development' into fix-pharmacy
|
5 years ago |
mosazaid
|
5d0a122689
|
fix bugs
|
5 years ago |
Mohammad Aljammal
|
e6da54c201
|
Merge branch 'development' 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 |
Mohammad Aljammal
|
20ad10b9dc
|
Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
8899bdf460
|
Done Prescription Delivery Address
|
5 years ago |
mosazaid
|
d02b74142a
|
Merge branch 'development' into fix-pharmacy
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
5 years ago |
mosazaid
|
1a45f99606
|
some fixes on pharmacy
|
5 years ago |
haroon amjad
|
5e8e3806d6
|
Covid Drive-Thru implemented
|
5 years ago |
Sultan Khan
|
144ef52c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Mohammad Aljammal
|
0632af3fb5
|
Fix the Authentication Pharmacy
|
5 years ago |
Mohammad Aljammal
|
0098345d05
|
add Prescription Delivery Address Page amd 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 |
Sultan Khan
|
d33918c932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
Sultan Khan
|
3ac69692be
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
Sultan Khan
|
ccd2fc5068
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
Sultan Khan
|
c65983bfdb
|
code merged
|
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
|
b63025a9b3
|
return CMC HHC
|
5 years ago |
Mohammad Aljammal
|
634c874eee
|
fix design issues
|
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
|
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 |
Mohammad Aljammal
|
4263672f00
|
fim last vital sign data
|
5 years ago |