Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
king_kahild_app
dev_v3.13.6
dev_v_3.13.6_CR_6804
dev_3.13.6_CR6750
dev_v3.13.6_PenguinIn
dev_3.13.6_Development
dev_v3.13.6_BLE_Faiz
development_v3.3
dev_3.3_BLE
dev_3.3_ER_Online_CheckIn
dev_3.3_Floward
dev_v3.13.6_voipcall
Dev_3.3_InPatient_CR
dev_3.3_CCHI
dev_3.3_Queueing
development_v3.3_voipcall
dev_3.3_AmbulanceRequestCR
dev_3.3_faiz_payfort
dev_3.3_LabReportEnhancementCR
dev_3.3_blood_donation_CR
dev_3.3_merge_vida_plus
PatientApp_VIDA_Plus_3.3
Dev_3.3_MedicalReportCR
sultan_v3.3
faiz_development
development_huawei_v2.5
development_v2.5
development_amir
webrtc_with_signalr
sikander_family_profile_switch
sikander_video_call_improvements
development_CS_v2.5
fatima_v2
development_new_design_2.0
Fatima-New-Design
development
diplomatic-quarter-live
fatima-new
diplomatic-quarter-haroon
master
fix_bugs_Mar
ed_online
enad_pharmacy2
fix_er
dq_and_master
geofencing_wifi
fix_insurance_update
fix_issues
fix_authentication
fix_login
er_location
find_us
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '3fb522e15f'
${ noResults }
PatientApp-KKUMC/lib
History
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
 		4 years ago
..
config Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
core Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
generated/json Geofencing in progress 4 years ago
models Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
pages Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
services Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
theme Ereferral fixes, smartwatch health data integration 4 years ago
uitl Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
widgets Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
Constants.dart change color 4 years ago
d_q_icons_icons.dart no message 4 years ago
locator.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
main.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 4 years ago
routes.dart fix merge issues 4 years ago
splashPage.dart return privilege 4 years ago