5d0a122689
fix bugs
4 years ago
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
4 years ago
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
4 years ago
8899bdf460
Done Prescription Delivery Address
4 years ago
d02b74142a
Merge branch 'development' into fix-pharmacy
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
4 years ago
1a45f99606
some fixes on pharmacy
4 years ago
5e8e3806d6
Covid Drive-Thru implemented
4 years ago
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
b3e6c4efda
voice command changes
4 years ago
ba10014b46
Merge branch 'development' into Haroon
4 years ago
60648d368f
Merge branch 'development' into enad_pharmacy2
4 years ago
830e871e2c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
4 years ago
0098345d05
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
4 years ago
83cca264f1
Merge branch 'LamaHerbish' into Haroon
4 years ago
031be1ac56
fixes
4 years ago
292e983614
fixing issues
4 years ago
f72c860516
Merge branch 'development' into Haroon
4 years ago
87ad027d33
Merge branch 'improve_hhc' into 'development'
...
Improve hhc
See merge request Cloud_Solution/diplomatic-quarter!264
4 years ago
13f6015cf0
Merge branch 'development' into Haroon
4 years ago
69649ff7f8
added verified icon in homepage when patient is logged in
4 years ago
29f4e6acb6
Merge branch 'hmg-services-fixing' into 'development'
...
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
4 years ago
9ecf745747
fixes
4 years ago
b6c617888b
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
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
4 years ago
ce64da11e4
homepage and product details design
4 years ago
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
4 years ago
0444b21101
Merge branch 'development' into hmg-services-fixing
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
94ee969406
hhc msg translation
4 years ago
8a1924cca2
fix images in hhc
4 years ago
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
9fca52efca
voice command
4 years ago
e964afd4f2
Merge branch 'fix_security_issue' into 'development'
...
fix security issues in pharmacy
See merge request Cloud_Solution/diplomatic-quarter!261
4 years ago
d477481856
fix security issues in pharmacy
4 years ago
63657cb7c4
Merge branch 'h2o_improvement' into 'development'
...
H2O feature, setting page added
See merge request Cloud_Solution/diplomatic-quarter!260
4 years ago
Sikander Saleem
e40ad85d61
H2O feature, setting page added
4 years ago
1d724a8db6
Merge branch 'h2o_improvement' into 'development'
...
H2o improvement
See merge request Cloud_Solution/diplomatic-quarter!259
4 years ago
Sikander Saleem
bd062150c1
H2O feature improvement
4 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
4 years ago
0b83089b86
Merge branch 'development' into Haroon
4 years ago
3832cee1ad
Translation fixes
4 years ago
Sikander Saleem
3b4e791017
H2O feature improvement
4 years ago
bb42647c91
Merge branch 'development' into 'fix_pharmacy'
...
# Conflicts:
# lib/pages/login/login.dart
4 years ago
ab53ca82b1
fix colors issues
4 years ago
822defbd04
working on bmi calculator design and functionality
4 years ago
3bad0a3804
Merge branch 'development' into Haroon
4 years ago
146019432a
LiveCare schedule implemented
4 years ago
Sikander Saleem
8f37fbf260
Qr icon added, notify me api added & improvements
4 years ago
3ac69692be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
0213264b7f
bug fixes
4 years ago
3e441c55b2
fix bottom nav bar
4 years ago
9d8c1ddf63
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/uitl/translations_delegate_base.dart
4 years ago
484cca086e
fix my my Trackers
4 years ago
ab158e14e9
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
4 years ago
97919c217f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
4 years ago
1ce0ef7b6c
health-converter fix
4 years ago
dde10cd27b
working in LiveCare Scheduling
4 years ago
db2376f50c
fix blood and weight on my trackers
4 years ago
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
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
4 years ago
38d52b52c8
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
4 years ago
68f7a9ff9c
login chnages
4 years ago
174534d8a5
fix Blood donation functionality and design
4 years ago
405f67be1e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
4 years ago
7a516cae51
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
4 years ago
f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
4 years ago
0b1014a91c
fix blood sugar service on my tracker
4 years ago
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
4 years ago
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
4 years ago
c65983bfdb
code merged
4 years ago
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
...
4 years ago
bbd953ae43
Order Delivery Driver tracking [inprogress]
4 years ago
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
f5d478fd27
re-design child vaccine and fix some funcrionalities
4 years ago
4457b5f109
add translation to ER service
4 years ago
200334d8f8
Fix ER service
4 years ago
4ecce79258
first step from fix CMC
4 years ago
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
4 years ago
d7a046f9ca
fix issue on cmc
4 years ago
1cb5e250ed
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!241
4 years ago
b63025a9b3
return CMC HHC
4 years ago
5bcc67b77d
Nearest Er fix design
4 years ago
01bfe84644
solving NearestEr design problem
4 years ago
e71a56ed51
Merge branch 'development' into fix_design
4 years ago
d2e1a323ce
simple fix
4 years ago
e2bce87e34
resolve merge conflicts.
4 years ago
30ddea6419
hot fixing
4 years ago
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
4 years ago
ed729689a9
Merge branch 'design_issues' into 'development'
...
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
4 years ago
634c874eee
fix design issues
4 years ago
a1b2709ac8
fixed orders
4 years ago
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
4 years ago
52fa0f6f89
fixed orders
4 years ago
2843b1393e
some design enhancments
4 years ago
de1b7cc1d0
fix merge issues
4 years ago
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
4 years ago
c82f01cd1a
fix merge issues
4 years ago
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
4 years ago
d77a607b78
commit
4 years ago
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
4 years ago
6827efc1b6
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge
4 years ago
d7fe93b3f3
Merge branch 'pharmacy-hussam' into 'pharmacy'
...
parent_categorise_page update
See merge request Cloud_Solution/diplomatic-quarter!226
4 years ago
298b4d6525
change color
4 years ago
952e106531
return privilege
4 years ago
f77d2b497e
fix issues
4 years ago
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
4 years ago
10734d5994
connecting pages.
...
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
4 years ago
6bda03e935
hot fixing
4 years ago
e6a94f8014
login design
4 years ago
b992978af4
login
4 years ago
764e706000
dashboard issue fixed
4 years ago
c01246acf0
hot fix
4 years ago
80da19555c
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!218
4 years ago
519a474d41
fix live care label and vital sign data
4 years ago
c0920e7099
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
4 years ago
5fa5e9b7c8
fixed orders and profile
4 years ago
5e3f6363cf
fix issues
4 years ago
6b4bae7370
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
827768e96d
language change
4 years ago
591d56e624
change the info images and change the out patient color
4 years ago
8becd4f920
login issue fixed
4 years ago
5e29dff448
fix issues insurance and medical profile order
4 years ago
355286768a
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
73c8e00852
bug fixes
4 years ago
b0ea1fc262
updates & fixes
4 years ago
18f492e52f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
d53031b0e6
blood type update for family files
4 years ago
b9958acd53
fix issues
4 years ago
2059b76fc1
fix Medical profile
4 years ago
4d8f42b517
fix issues vital sign issue
4 years ago
f6983c138a
fix issues
4 years ago
09a85d9127
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
4 years ago
9c12e949e8
hot fixes
4 years ago
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
4 years ago
fda101840a
fixed order isuues
4 years ago
508bc191be
geofencing login check fix
4 years ago
6b1e7587a8
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
a0baaac314
bug fixes
4 years ago
d8bd7d145d
no message
4 years ago
a8b0af9ee1
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
4 years ago
9c18c69d90
hot fixes
4 years ago
53282e3ae6
ToDo back issue fixed
4 years ago
ac3bebd59e
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
4 years ago
8c9762c24f
Fixes
4 years ago
073e79c325
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
040c8f38ab
hot fixes
4 years ago
7bc8fdb819
fix merge issues
4 years ago
3c2af11084
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
...
Conflicts:
lib/pages/landing/landing_page.dart
4 years ago
d8996cf879
Geofence Android Finished
4 years ago
d28870a629
fix merge issues
4 years ago
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
4 years ago
a57d5eb69f
hot fixes
4 years ago
d9a70e7f75
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
hot fixes
See merge request Cloud_Solution/diplomatic-quarter!199
4 years ago
8329c534a3
hot fixes
4 years ago
7167d58ce2
fix merge issues
4 years ago
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
4 years ago
359eba2da0
make some updates in firebase version and update gradle, finish review order
4 years ago
1dc9400ffc
Geofencing work in progress on android
4 years ago
e312671e24
hot fixes
4 years ago
cf642da661
landing page
4 years ago
eec67ac930
big fixes
4 years ago
99ee5b4545
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
b29fdbb7d0
fix home issues
4 years ago
8a554aa2f8
auth services fixed
4 years ago
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
4 years ago
02d72fa27c
fix issues
4 years ago
4a84483698
fixed order details
4 years ago
0f594059b5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
a7dc2fdfd1
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
4 years ago
781fd1c287
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
3aa592e2b0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
b759758a68
bug fixes
4 years ago
3860a08b53
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
fix issues
See merge request Cloud_Solution/diplomatic-quarter!188
4 years ago
f38f53587b
fix issues
4 years ago
3308aa47e1
fixes
4 years ago
9e3db622fa
login loader issue fixed
4 years ago
6f6ab8d987
no message
4 years ago
3122f2438b
fix import dialog
4 years ago
19f12116c4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
4 years ago
de1e352e98
fix charts and vital sign
4 years ago
53775d113d
commented code offers and packages
4 years ago
9947b30d3f
fix merge conflict
4 years ago
9ea779e48a
no message
4 years ago
bf999e611b
my appointment fix
4 years ago
b9269f525a
hot fixes
4 years ago
c67d41701d
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
5606c88715
hot fixes
4 years ago
92e6275162
Add Confirm send email dialog
4 years ago
81b51bef51
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
4 years ago
4e823c2be4
fix chart and duplicated data in Patient Lab Result
4 years ago
051bd1e23f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
4 years ago
4a43bcefe1
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
remove ErOptions
See merge request Cloud_Solution/diplomatic-quarter!179
4 years ago
a6d3fce6fc
remove ErOptions
4 years ago
8457972fda
no message
4 years ago
b13a56ffbd
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
4 years ago
951d9b553f
fixes & updates
4 years ago
71592adf32
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
1f0d01b6cc
language issue fixed
4 years ago
2c50402aa8
language issue fixed
4 years ago
f394433b6e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
4 years ago
9d046fd971
updates & fixes
4 years ago
97776ce99b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
4 years ago
b25bdbb6fa
fix LiveChatPage Service LabOrderResult MedicineSearch issues
4 years ago
92ba977fca
no message
4 years ago
c058cf0e93
finish address add/edit/delete/select
4 years ago
557b8e814f
voice command
4 years ago
75de755ccd
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
6ac8d67b83
finish address add/edit/delete/select
4 years ago
8d5d55a150
Geofencing in progress
4 years ago
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
4 years ago
2f77592bac
fix Prescriptions Service and design issues
4 years ago
740a294867
Translation & bug fixes
4 years ago
62b923b25e
fix send rad report email
4 years ago
5083080ba3
fix vital sign details
4 years ago
1db5b15dcd
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
4 years ago
9ecaaa1b12
radiology fix in appointment details
4 years ago
9d9d77ee3a
bug fixes
4 years ago
c813deea29
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
188b72bb90
voice command
4 years ago
d14e7e5223
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
e28209d4e8
bug fixes
4 years ago
9d3c64200e
fixes
4 years ago
9cec304712
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
4 years ago
eca2266f7b
hot fixing
4 years ago
21ccf1ef86
bug fixes
4 years ago
ce7a64e86e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
e85b21c08f
parent_categorise_page update
4 years ago
c4bb75eab4
Doctor rating fixed
4 years ago
8d20762050
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
4 years ago
33956db22a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/config.dart
4 years ago
b55681a056
Working on steps tracking
4 years ago
a1e92e1fdd
fix merge issue
4 years ago
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
4 years ago
4d203c8a5b
fix LabResult
4 years ago
8cd3ae915b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
4 years ago
468bb0356c
updates & fixes
4 years ago
14f92f6c58
remove updated button
4 years ago
554ed1b50a
fix insurance update
4 years ago
7f44677242
voice command priv
4 years ago
9fecf8e89f
fix insurance update
4 years ago
935e72975c
add new privilege
4 years ago
e495d3e5ad
Health Data integration implementing
4 years ago
542335364e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
c050c3f189
voice command updated
4 years ago
cf6686e413
Merge branch 'master' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
378562b781
adding some changes in order pages like translate texts
4 years ago
9c55571072
Merge branch 'pharmacy' into enad_pharmacy2
4 years ago
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
4 years ago
888a74fb9b
add these pages
...
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
4 years ago
ed68eed9df
added links for profile
4 years ago
2e2a29145c
fix merge issues
4 years ago
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
4 years ago
59aba6608d
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
4 years ago
a1f91d99b3
added countdown timer in my appointments
4 years ago
706980248a
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
4 years ago
77dcb918c3
Revert "Merge branch 'pharmacy-hussam' into 'master'"
...
This reverts merge request !149
4 years ago
9b8103bfd6
fixe order and order details
4 years ago
af1c59394c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
496163a61a
voice command updated
4 years ago
9e8def6584
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
...
Conflicts:
lib/config/localized_values.dart
4 years ago
7f23f356f1
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!151
4 years ago
4e2c955b09
add missing translation
4 years ago
dfa1952f4d
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
4 years ago
5dc3c53550
mousa and hussam branch
4 years ago
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
4 years ago
800565407d
12/6
4 years ago
4c9a1862d2
make pharmacy home page load data even without login, and some mini changes
4 years ago
257dc3d76d
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
...
create terms-condition in pharmacy order page
See merge request Cloud_Solution/diplomatic-quarter!154
4 years ago
7ee7ef58c4
working on dynamic title on pharmacy
4 years ago
umasoodch
b5413d1749
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
709ba2ce97
create terms-condition in pharmacy order page
4 years ago
2a91ae787f
commit
4 years ago
8b8207cb0d
search
4 years ago
e34a5c3c13
multiple login calls fixed
4 years ago
f5b7d35f23
bug fixes
4 years ago
a3e01ff938
flutter tts
4 years ago
8c5746f7b1
bug fixes
4 years ago
321d31b3bd
voice search page updated
4 years ago
d69b3676a4
weather indicator in progress
4 years ago
64cbae3602
Search
4 years ago
81c8239412
bug fixes
4 years ago
fc0117754d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
ced86de9fe
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
...
Conflicts:
lib/config/localized_values.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/balance/my_balance_page.dart
lib/uitl/translations_delegate_base.dart
4 years ago
269f682bd5
Added info images description
4 years ago
35d0d3e441
finsi lakum points task
4 years ago
f1a8e09a59
Added info images description
4 years ago
47b030eb82
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# ios/Flutter/.last_build_id
# lib/config/config.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
7edb0c8009
Doctor rating dialog revamped
4 years ago
3a055aa02b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
79c17de0de
ltr issue fixed
4 years ago
3daef6e53f
add images info
4 years ago
dc898a799d
Add Privileges
4 years ago
3ab513d9d0
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
98f84c2161
voice search in progress
4 years ago
713e44cf8b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
4 years ago
ea195ea9bf
Finish translate CMC HHC
4 years ago
ff0d66ccdb
Covid test translations
4 years ago
4f1f7dcefd
ereferral implementation completed
4 years ago
65fbd7af8e
referral finalised
4 years ago
1155466d19
Packages and Offer Slider at home
4 years ago
mosazaid
Mohammad Aljammal
haroon amjad
Sultan Khan
enadhilal
HMG\Lama.Herbish
Mohammad Aljammal
Fatimah Alshammari
Elham Rababah
Sikander Saleem
hussam al-habibeh
Zohaib Iqbal Kambrani
Haroon Amjad
Zohaib Kambrani
umasoodch
Elham Rababah