Sikander Saleem
8b2feb03ea
last login and login options ui.
3 years ago
9196367da4
Merge branch 'bug_fix_mirza' into 'development'
...
Medical Profile Buttons Lock
See merge request Cloud_Solution/diplomatic-quarter!329
3 years ago
f54b9a63aa
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!328
3 years ago
2fda47baf6
Medical Profile Buttons Lock
3 years ago
213d104d57
Covid test procedure selection implemented
3 years ago
487d63ec7f
Merge branch 'bug_fix_mirza' into 'development'
...
Check-In NFC
See merge request Cloud_Solution/diplomatic-quarter!326
3 years ago
Sikander Saleem
eb9005510d
bug fixes and insurance approvals improvements.
3 years ago
3c2539d5b9
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
3 years ago
14ef096c32
changes and fixes
3 years ago
b31813770e
Check-In NFC done
3 years ago
fde658fd5d
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
3 years ago
fb0a67e5bd
PAP 828 and 792 issue fix
3 years ago
e934e7cd2c
Merge Fix
3 years ago
4504b4bf75
config
3 years ago
f310f9d0ab
config
3 years ago
0d2a91c124
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
3 years ago
fefde8f575
jira bugs
3 years ago
7b6270c67f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
3 years ago
bcb4f48785
build fix
3 years ago
b4a7235fc8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
3 years ago
854352d9ce
jira bugs
3 years ago
Sikander Saleem
1f01f40ad8
PAP-681 fixed, H2O Unit changing & reflection.
3 years ago
da2df9b348
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
3 years ago
bcabd81f88
BUG FIXES
3 years ago
25d5105caf
Merge branch 'Apr-fixes' into 'development'
...
PAP-607: fix issue
See merge request Cloud_Solution/diplomatic-quarter!312
4 years ago
2a47564c37
PAP-607: fix issue
4 years ago
174e0d9673
Merge branch 'development' into pharmacy-Fatima
4 years ago
2481e4c9ea
fixed categories issues and home page button
4 years ago
8c9c309abb
bug fixes
4 years ago
cd7845b1a4
bug fix
4 years ago
6b675acc94
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
4 years ago
353a5157f2
fixes
4 years ago
0245875358
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
3d6858d0ec
bug fixes
4 years ago
235fdfba54
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
4 years ago
71a393df68
fixed categories issue
4 years ago
f754e48034
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
49c454b132
fixes
4 years ago
b623bd0dce
Merge branch 'development' into fix_bugs
4 years ago
e5474b3062
fix perscription pages bugs
4 years ago
126fad61c0
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
...
Conflicts:
lib/core/service/client/base_app_client.dart
4 years ago
53e4dfa99d
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!292
4 years ago
7c1fd8043b
fix chart and eye and balance
4 years ago
b91ce441e2
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
4 years ago
f9b8191a5e
jira bugs
4 years ago
6f2c947687
Packages And offers..
4 years ago
9c1fdf96f4
Merge branch 'development' into Haroon
4 years ago
33e1bf8103
Jira fixes
4 years ago
accc39d972
jira bug fixes
4 years ago
ca2a48e860
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
0445011e53
bug fixes
4 years ago
ad88f6de04
fix theme issues
4 years ago
454957ebba
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
4 years ago
616212828d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
66acce3b40
ancillary order pages added
4 years ago
e0ebb922ed
pharmacy fixes
4 years ago
f410ce20ca
Packages and Offers in Progress
4 years ago
ed3dba3eb3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
b9a12341d5
updates & fixes
4 years ago
4dcb70d7eb
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!282
4 years ago
a534b1415e
products filtering fix
4 years ago
861dba9a94
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
4 years ago
ec401d4848
Done Ed online
4 years ago
a6196d3c30
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
b891c1bd80
theme issue
4 years ago
747763c4be
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
4 years ago
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
e61c26b853
Auto SMS, Themes, Voice Command
4 years ago
c629fcb85c
fixed recommended products new design
4 years ago
0cb493d56c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
4 years ago
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
4 years ago
15ec3ec9b9
Translation Track Driver, enhancement, initial camera
4 years ago
63663f1b24
Track Delivery Driver Completed
4 years ago
ac32ba998c
fixed order isuee
4 years ago
516df96e21
no message
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
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
830e871e2c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
4 years ago
b70c7d7d05
fix pharmacy auth
4 years ago
292e983614
fixing issues
4 years ago
87ad027d33
Merge branch 'improve_hhc' into 'development'
...
Improve hhc
See merge request Cloud_Solution/diplomatic-quarter!264
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
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
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
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
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
b767748315
health-converter fix
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
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
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
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
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
5bcc67b77d
Nearest Er fix design
4 years ago
e2bce87e34
resolve merge conflicts.
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
634c874eee
fix design issues
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
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
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
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
c01246acf0
hot fix
4 years ago
2b48578e07
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
016dffcb87
change
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
5e3f6363cf
fix issues
4 years ago
754e60eb72
fix send email lab result
4 years ago
57925e3b02
Geofence fixes by JobScheduler
4 years ago
2059b76fc1
fix Medical profile
4 years ago
4d8f42b517
fix issues vital sign issue
4 years ago
4f015a1cda
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
4 years ago
f6983c138a
fix issues
4 years ago
37ab778fd0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
b505ed1be7
blood type added
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
9c18c69d90
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
b29fdbb7d0
fix home issues
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
f38f53587b
fix issues
4 years ago
3308aa47e1
fixes
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
b7088f70cd
Merge master in to my branch with Geofence iOS
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
051bd1e23f
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
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
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
c813deea29
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
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
Sikander Saleem
Sultan khan
Mirza.Shafique
Haroon Amjad
Sultan Khan
haroon amjad
hussam al-habibeh
Mohammad Aljammal
Elham Rababah
Fatimah Alshammari
mosazaid
Mohammad Aljammal
Zohaib Iqbal Kambrani
enadhilal
Zohaib Kambrani