58 Commits (87ad027d33fd99f1456dd09450e10c79d2ecd022)

Author	SHA1	Message	Date
haroon amjad	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
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	4 years ago
Mohammad Aljammal	72290f041f	fix design	4 years ago
Mohammad Aljammal	1f03919094	fix android	4 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	4 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	4 years ago
Mohammad Aljammal	a2e5b48915	fix merge issues	4 years ago
Zohaib Kambrani	f03adb37ce	no message	4 years ago
Zohaib Kambrani	57925e3b02	Geofence fixes by JobScheduler	4 years ago
Zohaib Kambrani	3392a2431b	Added Location Provider Changed Receiver to Reregister the geofences	4 years ago
Zohaib Kambrani	187d2bcd8b	Geofence error logging in shared_preferences	4 years ago
Zohaib Kambrani	a11d93332d	Wifi check network available - android ... tweaking at geofence code	4 years ago
Zohaib Kambrani	4c00f9b3f2	Merge branch 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ZohaibIqbalKambrani ... * 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter: geofencing login check fix	4 years ago
Zohaib Kambrani	7b4a2b9e64	no message	4 years ago
Zohaib Kambrani	508bc191be	geofencing login check fix	4 years ago
Zohaib Kambrani	d8996cf879	Geofence Android Finished	4 years ago
mosazaid	0237d71931	make firebase-in app messaging commented to solve problem Duplicate class com.google.protobuf.WireFormat$Utf8Validation$3 found in modules jetified-protobuf-javalite-3.11.0.jar (com.google.protobuf:protobuf-javalite:3.11.0) and jetified-protobuf-lite-3.0.1.jar (com.google.protobuf:protobuf-lite:3.0.1)	4 years ago
Zohaib Kambrani	0f64c45e67	no message	4 years ago
mosazaid	359eba2da0	make some updates in firebase version and update gradle, finish review order	4 years ago
Zohaib Kambrani	1dc9400ffc	Geofencing work in progress on android	4 years ago
Zohaib Kambrani	8d5d55a150	Geofencing in progress	4 years ago
haroon amjad	e495d3e5ad	Health Data integration implementing	4 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	4 years ago
Zohaib Kambrani	55ad82147f	Wifi internet	4 years ago
Zohaib Kambrani	27182ee8db	no message	4 years ago
haroon amjad	a03d5c6d57	App initial release to stores	4 years ago
Sultan Khan	571bda9100	permission	4 years ago
Zohaib Kambrani	c2be303418	Move code from java to kotlin package	4 years ago
Zohaib Kambrani	3264b82118	Complete Native Wifi connection and LoadingView Android	4 years ago
Zohaib Kambrani	8fcf1b6708	Swipe the Native loading « arguments	4 years ago
Zohaib Kambrani	8e554970f3	Wifi Connectivity and loading View	4 years ago
Zohaib Kambrani	69d1e4bb0b	no message	4 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	4 years ago
hussam al-habibeh	e74e168e88	Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam ... Conflicts: android/app/build.gradle lib/config/config.dart lib/core/service/client/base_app_client.dart lib/locator.dart	4 years ago
hussam al-habibeh	f7cee8f484	pharmacy module app && category home page	4 years ago
haroon amjad	22ef24c4ff	Merge branch 'master' into Haroon ... # Conflicts: # android/app/src/main/AndroidManifest.xml	4 years ago
jammal	9328f942ba	done ER service	4 years ago
jammal	bd2254491c	done ER service	4 years ago
haroon amjad	6b316bf262	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # android/app/src/main/AndroidManifest.xml # lib/config/config.dart # lib/pages/AlHabibMedicalService/​ health_calculators.dart # lib/pages/BookAppointment/widgets/DoctorView.dart # lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart	4 years ago
haroon amjad	0daa0dc683	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
Mohammad Aljammal	1ce55e687f	Ambulance Service second step	4 years ago
haroon amjad	6c0bb12c84	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # lib/config/config.dart # lib/pages/BookAppointment/widgets/DoctorView.dart # lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart # lib/pages/ContactUs/findus/hospitrals_page.dart # lib/pages/ContactUs/findus/pharmacies_page.dart	4 years ago
Elham Rababah	bf6a8cecc6	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral ... Conflicts: lib/config/config.dart lib/locator.dart lib/pages/landing/landing_page.dart pubspec.yaml	4 years ago
Mohammad Aljammal	2952fd56ab	Done Active Medications Service	4 years ago
Elham Rababah	f1f3b6bd56	first step from e-referral	4 years ago
Mohammad Aljammal	ea02622977	fix merge issues	4 years ago
Sultan Khan	5d112b5464	merge	4 years ago
Sultan Khan	47c42808fd	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	4c1a8dc38f	new changes	4 years ago
haroon amjad	750746aabe	updates & fixes	4 years ago