Mirza.Shafique
|
9b160958bb
|
Covid New Design 3
|
3 years ago |
haroon amjad
|
0a90791aca
|
Push notification fixes
|
3 years ago |
Zohaib Iqbal Kambrani
|
3f178e3e3f
|
Google_Huawei Map -> AppMap
|
3 years ago |
|
haroon amjad
|
2669378da4
|
Insurance Approval API updated
|
3 years ago |
 Sikander Saleem
|
ca363adee2
|
merge & improvements
|
3 years ago |
|
Sikander Saleem
|
56c0adaada
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
Sultan Khan
|
97d7f9225e
|
package name changed
|
3 years ago |
|
Sikander Saleem
|
6575adda42
|
merge changes-5
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
3 years ago |
|
Sultan Khan
|
14ef096c32
|
changes and fixes
|
3 years ago |
|
haroon amjad
|
bcb4f48785
|
build fix
|
3 years ago |
Fatimah Alshammari
|
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 |
|
Sultan Khan
|
1a35fe37b6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Fatimah Alshammari
|
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 |
|
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
4 years ago |
|
haroon amjad
|
60ea0465fd
|
fixes & updates
|
4 years ago |
|
Fatimah Alshammari
|
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 |
|
Fatimah Alshammari
|
ce64da11e4
|
homepage and product details design
|
4 years ago |
|
Sultan Khan
|
3ac69692be
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
ccd2fc5068
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
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 |
|
Sultan Khan
|
c65983bfdb
|
code merged
|
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 |
|
Sultan Khan
|
542335364e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
c050c3f189
|
voice command updated
|
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 |