Sultan Khan
6f68cf5a15
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
mosazaid
dfeb70c892
Merge branch 'development' into pharmacy-payment-feature
...
# Conflicts:
# lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
mosazaid
0b2002d4dd
finish payment order
5 years ago
Sultan Khan
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
e61c26b853
Auto SMS, Themes, Voice Command
5 years ago
haroon amjad
da3ad90ddd
added app-wide route transition animation
5 years ago
mosazaid
f3cdd08857
adding fharmacy payment feature
5 years ago
enadhilal
0cb493d56c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
5 years ago
enadhilal
0c6fb67718
fixed issues
5 years ago
Zohaib Iqbal Kambrani
63663f1b24
Track Delivery Driver Completed
5 years ago
Mohammad Aljammal
8899bdf460
Done Prescription Delivery Address
5 years ago
Sultan Khan
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b3e6c4efda
voice command changes
5 years ago
enadhilal
60648d368f
Merge branch 'development' into enad_pharmacy2
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
Mohammad Aljammal
0098345d05
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
5 years ago
haroon amjad
b6c617888b
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9fca52efca
voice command
5 years ago
Sultan Khan
eeb073fb17
voice command
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
Mohammad Aljammal
1d724a8db6
Merge branch 'h2o_improvement' into 'development'
...
H2o improvement
See merge request Cloud_Solution/diplomatic-quarter!259
5 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
5 years ago
haroon amjad
0b83089b86
Merge branch 'development' into Haroon
5 years ago
Sikander Saleem
3b4e791017
H2O feature improvement
5 years ago
Mohammad Aljammal
ab53ca82b1
fix colors issues
5 years ago
haroon amjad
3bad0a3804
Merge branch 'development' into Haroon
5 years ago
haroon amjad
146019432a
LiveCare schedule implemented
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
3e441c55b2
fix bottom nav bar
5 years ago
Mohammad Aljammal
9d8c1ddf63
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
5 years ago
haroon amjad
dde10cd27b
working in LiveCare Scheduling
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
Sultan Khan
68f7a9ff9c
login chnages
5 years ago
Zohaib Iqbal Kambrani
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Sultan Khan
c65983bfdb
code merged
5 years ago
Sultan Khan
86cf9300e1
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter : (136 commits)
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
some design enhancments
fix design
fix android
fix merge issues
fix merge issues
commit
fix merge issues
change color
return privilege
return privilege
fix issues
...
5 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
5 years ago
Elham Rababah
c9edb37a3c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
5 years ago
Mohammad Aljammal
b63025a9b3
return CMC HHC
5 years ago
Mohammad Aljammal
30ddea6419
hot fixing
5 years ago
Zohaib Iqbal Kambrani
dc83b476d6
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal
ed729689a9
Merge branch 'design_issues' into 'development'
...
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
5 years ago
Mohammad Aljammal
634c874eee
fix design issues
5 years ago
mosazaid
2843b1393e
some design enhancments
5 years ago
Mohammad Aljammal
72290f041f
fix design
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
298b4d6525
change color
5 years ago
Mohammad Aljammal
952e106531
return privilege
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
6bda03e935
hot fixing
5 years ago
Sultan Khan
c01246acf0
hot fix
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
Mohammad Aljammal
591d56e624
change the info images and change the out patient color
5 years ago
Sultan Khan
c9538c6a84
family files
5 years ago
Sultan Khan
73c8e00852
bug fixes
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
2059b76fc1
fix Medical profile
5 years ago
Mohammad Aljammal
4d8f42b517
fix issues vital sign issue
5 years ago
Mohammad Aljammal
f6983c138a
fix issues
5 years ago
Mohammad Aljammal
09a85d9127
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
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
Sultan Khan
6b1e7587a8
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
a0baaac314
bug fixes
5 years ago
Zohaib Kambrani
d8bd7d145d
no message
5 years ago
Mohammad Aljammal
a8b0af9ee1
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
5 years ago
Mohammad Aljammal
9c18c69d90
hot fixes
5 years ago
haroon amjad
ac3bebd59e
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
haroon amjad
8c9762c24f
Fixes
5 years ago
Sultan Khan
040c8f38ab
hot fixes
5 years ago
Mohammad Aljammal
7bc8fdb819
fix merge issues
5 years ago
Mohammad Aljammal
6d7cb1b970
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
...
Conflicts:
ios/Runner.xcodeproj/project.pbxproj
lib/core/service/AuthenticatedUserObject.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/widgets/drawer/app_drawer_widget.dart
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
Sultan Khan
eec67ac930
big fixes
5 years ago
Mohammad Aljammal
b29fdbb7d0
fix home issues
5 years ago
Mohammad Aljammal
d9759560c3
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
...
Conflicts:
lib/config/localized_values.dart
lib/pages/login/login.dart
5 years ago
Mohammad Aljammal
02d72fa27c
fix issues
5 years ago
Fatimah Alshammari
4a84483698
fixed order details
5 years ago
Sultan Khan
3aa592e2b0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
9a578cafc2
bug fixes
5 years ago
Sultan Khan
b759758a68
bug fixes
5 years ago
Mohammad Aljammal
3860a08b53
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
fix issues
See merge request Cloud_Solution/diplomatic-quarter!188
5 years ago
Mohammad Aljammal
f38f53587b
fix issues
5 years ago
Sultan Khan
9e3db622fa
login loader issue fixed
5 years ago
Zohaib Kambrani
6f6ab8d987
no message
5 years ago
Mohammad Aljammal
19f12116c4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
5 years ago
Mohammad Aljammal
de1e352e98
fix charts and vital sign
5 years ago
haroon amjad
965c97d262
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Sultan Khan
d779c6dd0a
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
a2e385f282
family file drawer
5 years ago
Haroon Amjad
b9269f525a
hot fixes
5 years ago
Haroon Amjad
5606c88715
hot fixes
5 years ago
Haroon Amjad
81b51bef51
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
4e823c2be4
fix chart and duplicated data in Patient Lab Result
5 years ago
haroon amjad
051bd1e23f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
b13a56ffbd
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
951d9b553f
fixes & updates
5 years ago
Sultan Khan
71592adf32
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
1f0d01b6cc
language issue fixed
5 years ago
Sultan Khan
2c50402aa8
language issue fixed
5 years ago
Mohammad Aljammal
b25bdbb6fa
fix LiveChatPage Service LabOrderResult MedicineSearch issues
5 years ago
Sultan Khan
557b8e814f
voice command
5 years ago
mosazaid
6ac8d67b83
finish address add/edit/delete/select
5 years ago
Mohammad Aljammal
a2ec01be5d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
...
Conflicts:
lib/config/localized_values.dart
lib/pages/landing/home_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
2f77592bac
fix Prescriptions Service and design issues
5 years ago
Mohammad Aljammal
5083080ba3
fix vital sign details
5 years ago
Sultan Khan
9d9d77ee3a
bug fixes
5 years ago
Sultan Khan
c813deea29
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
188b72bb90
voice command
5 years ago
Sultan Khan
e28209d4e8
bug fixes
5 years ago
Mohammad Aljammal
9cec304712
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
5 years ago
Mohammad Aljammal
eca2266f7b
hot fixing
5 years ago
Sultan Khan
21ccf1ef86
bug fixes
5 years ago
Sultan Khan
7742313923
voice command
5 years ago
Sultan Khan
ce7a64e86e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Mohammad Aljammal
9dfd8a71dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
...
Conflicts:
lib/locator.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/login/confirm-login.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/widgets/bottom_navigation/bottom_nav_bar.dart
lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal
4d203c8a5b
fix LabResult
5 years ago
Mohammad Aljammal
554ed1b50a
fix insurance update
5 years ago
Sultan Khan
7f44677242
voice command priv
5 years ago
Mohammad Aljammal
935e72975c
add new privilege
5 years ago
Sultan Khan
a004610ac3
voice command updatd
5 years ago
Sultan Khan
542335364e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
c050c3f189
voice command updated
5 years ago
Sultan Khan
f083912d43
voice command updated
5 years ago
enadhilal
727940c5c6
fixed merging issues
5 years ago
enadhilal
9c55571072
Merge branch 'pharmacy' into enad_pharmacy2
5 years ago
enadhilal
c22ca4e29e
Merge branch 'pharmacy' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/product_tile.dart
5 years ago
enadhilal
888a74fb9b
add these pages
...
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
5 years ago
Mohammad Aljammal
459ba828d9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
5 years ago
Fatimah Alshammari
706980248a
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal
77dcb918c3
Revert "Merge branch 'pharmacy-hussam' into 'master'"
...
This reverts merge request !149
5 years ago
Fatimah Alshammari
9b8103bfd6
fixe order and order details
5 years ago
Sultan Khan
af1c59394c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
496163a61a
voice command updated
5 years ago
haroon amjad
dfa1952f4d
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
5 years ago
hussam al-habibeh
a1906a4072
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
5 years ago
umasoodch
b5413d1749
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
92b0b6d6ea
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
f5b7d35f23
bug fixes
5 years ago
Sultan Khan
a3e01ff938
flutter tts
5 years ago
Sultan Khan
321d31b3bd
voice search page updated
5 years ago
hussam al-habibeh
64cbae3602
Search
5 years ago
Sultan Khan
fc0117754d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
269f682bd5
Added info images description
5 years ago
mosazaid
35d0d3e441
finsi lakum points task
5 years ago
Sultan Khan
3a055aa02b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
79c17de0de
ltr issue fixed
5 years ago
Mohammad Aljammal
3daef6e53f
add images info
5 years ago
Mohammad Aljammal
dc898a799d
Add Privileges
5 years ago
Sultan Khan
98f84c2161
voice search in progress
5 years ago
Elham Rababah
ea195ea9bf
Finish translate CMC HHC
5 years ago
Zohaib Kambrani
1155466d19
Packages and Offer Slider at home
5 years ago
mosazaid
98f660e29b
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
mosazaid
4e5d6a9a00
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
5 years ago
umasoodch
0431eb1ac8
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
5 years ago
Sultan Khan
8de838a6dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
haroon amjad
0181043da8
Ereferral fixes, smartwatch health data integration
5 years ago
Mohammad Aljammal
2185f5ce11
Merge branch 'hhc_cmc' into 'master'
...
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
5 years ago
Elham Rababah
05deaa6322
Address Added Successfully
5 years ago
Sultan Khan
078183c1fb
not authenticated page updated
5 years ago
Sultan Khan
de2a5e55eb
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
7d3c1ac852
weather indicator updated
5 years ago
Sultan Khan
648d9d245d
health weather indicator
5 years ago
Zohaib Kambrani
27182ee8db
no message
5 years ago
Mohammad Aljammal
54d8965773
done child Vaccination
5 years ago
haroon amjad
97b8aeeff5
Version Control finished
5 years ago
Sultan Khan
e7c862c801
health weather indicator
5 years ago
haroon amjad
92db2b2be9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Sultan Khan
603833db37
login changes
5 years ago
haroon amjad
e5feef8a9d
Updates & UI Fixes
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
haroon amjad
ebb8a8fa2c
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
b504f379de
fix lab result translations and colors
5 years ago
haroon amjad
c74ac3b7ca
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
85062859c8
updates
5 years ago
Mohammad Aljammal
0ac599ea1c
fix vital Sign
5 years ago
Sultan Khan
6bbdf05f90
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
857fc813cd
button feedback
5 years ago
haroon amjad
d284ceac04
advance payment & payment flow issues fixed
5 years ago
Sultan Khan
8d499704dc
family file changes
5 years ago
Mohammad Aljammal
0d098def04
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
...
Conflicts:
assets/app_icons/config.json
assets/app_icons/fonts/DQIcons.ttf
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/d_q_icons_icons.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/uitl/utils.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
Sultan Khan
18a2393d92
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
6e152951b4
notification count
5 years ago
Mohammad Aljammal
0966269537
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
5 years ago
Sultan Khan
d2f391ab7f
setting page inprogress
5 years ago
Sultan Khan
0ed29be214
launch
5 years ago
Sultan Khan
30a8e24521
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
91be66ecdd
family file changes
5 years ago
Mohammad Aljammal
b785f87dac
fix App drawer after logout
5 years ago
Mohammad Aljmma
6523a1dea9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljmma
a9b11a6b03
fix lab result
5 years ago
Sultan Khan
3589b21590
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljmma
ed7b9d609f
fix lab result
5 years ago
haroon amjad
b81af62551
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
b89c1f03b3
language translation fixes
5 years ago
Sultan Khan
bedafa24cd
insurance details
5 years ago
Sultan Khan
1eb6516ea6
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
3fef1b9d52
theme and login issues fixed
5 years ago
Mohammad Aljmma
a1684bdd9e
fix issue #17 & 18
5 years ago
Mohammad Aljmma
0f938fafd2
fix issue #12
5 years ago
Mohammad Aljmma
179df475b4
fix issue #9
5 years ago
Mohammad Aljmma
b913e5a7b7
fix issue#6
5 years ago
Mohammad Aljmma
27594f15b8
fix issue#1
5 years ago
Mohammad Aljmma
e1f6ef5e5b
fix Prescriptions history
5 years ago
Sultan Khan
cced69502a
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Fatimah Alshammari
ddf032bb47
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari
f137bd44c0
created order and order details UI pages
5 years ago
haroon amjad
9868a43e7b
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
5 years ago
haroon amjad
506e32e8c8
Payment issues resolved
5 years ago
haroon amjad
05ad8f8db5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Sultan Khan
4976870d2e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
875bf10c73
settings page added
5 years ago
Mohammad Aljmma
6a83538544
add info for Medical
5 years ago
Mohammad Aljmma
a077d87dd8
fix user authentication data
5 years ago
haroon amjad
ffbc7c4af4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljmma
7d2f1cf318
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication
5 years ago
Mohammad Aljmma
570aa514cd
fix user authentication data
5 years ago
haroon amjad
b7b7ead3ba
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
ee67852970
Bottom navbar count & ToDo list fixed
5 years ago
haroon amjad
5020c24e8b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/services/authentication/auth_provider.dart
5 years ago
Elham Rababah
5ed4d76a54
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
15a8e64e7c
updates & fixes
5 years ago
haroon amjad
89022231d7
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
hussam al-habibeh
6162833bba
offers products page
5 years ago
hussam al-habibeh
7815005e21
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
hussam al-habibeh
69a6bc2812
offers page
5 years ago
Elham Rababah
5bd3c7d9ce
finish step from notifications_page and create notification_details_page
5 years ago
Mohammad Aljmma
747cffacfc
fix lab result
5 years ago
haroon amjad
4f53d058d4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
mosazaid
11ff27bae3
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
5 years ago
mosazaid
9a169ff77b
finish home page and start working on order preview page
5 years ago
Elham Rababah
9f2beceb22
First step from notifications_page
5 years ago
Mohammad Aljmma
e42f953bd1
fix prescription report issues
5 years ago