Mirza.Shafique
|
0a83cf8241
|
Bug Fixis
|
3 years ago |
|
Mirza.Shafique
|
5f44dece71
|
Ganaric Font and font implementaion
|
3 years ago |
 Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
3 years ago |
|
Mirza.Shafique
|
a20185b2b9
|
Home page 1.4 (Homepage changes)
|
3 years ago |
|
Mirza.Shafique
|
58d5734f1a
|
Bug Fix: 873, 878 to 881
|
3 years ago |
Zohaib Iqbal Kambrani
|
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 |
|
Zohaib Iqbal Kambrani
|
6f2c947687
|
Packages And offers..
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
4 years ago |
Sultan Khan
|
e61c26b853
|
Auto SMS, Themes, Voice Command
|
4 years ago |
|
Sultan Khan
|
c65983bfdb
|
code merged
|
4 years ago |
Mohammad Aljammal
|
30ddea6419
|
hot fixing
|
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
|
298b4d6525
|
change color
|
4 years ago |
|
Mohammad Aljammal
|
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 |
enadhilal
|
10734d5994
|
connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
|
4 years ago |
|
Mohammad Aljammal
|
6bda03e935
|
hot fixing
|
4 years ago |
|
Zohaib Kambrani
|
92ba977fca
|
no message
|
4 years ago |
Zohaib Kambrani
|
8d5d55a150
|
Geofencing in progress
|
4 years ago |
haroon amjad
|
6846a8501a
|
Merge branch 'master' 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 |
|
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
a556e8c1f8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/config.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
|
4 years ago |
|
Sultan Khan
|
8d499704dc
|
family file changes
|
4 years ago |
|
Mohammad Aljammal
|
f70ca95a38
|
fix merge issues
|
4 years ago |
|
Sultan Khan
|
2f454055b9
|
login fixed
|
4 years ago |
|
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
4 years ago |
|
Sultan Khan
|
3fef1b9d52
|
theme and login issues fixed
|
4 years ago |
|
Sultan Khan
|
283473a06a
|
theme changes
|
4 years ago |
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
4 years ago |
|
haroon amjad
|
aeab57beab
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/main.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
haroon amjad
|
f5a2870fac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
|
4 years ago |
|
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
4 years ago |
|
Mohammad Aljmma
|
894494ec4e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
ios/Flutter/.last_build_id
lib/main.dart
lib/pages/landing/home_page.dart
|
4 years ago |
|
Mohammad Aljmma
|
874de15040
|
change the home page design
|
4 years ago |
|
haroon amjad
|
6a630f6d33
|
logo & colors changed for login & registration flow
|
4 years ago |
|
Mohammad Aljmma
|
1cf4797d4f
|
add font
|
4 years ago |
|
Sultan Khan
|
3ad928902b
|
voice command
|
4 years ago |
|
Mohammad Aljammal
|
a0300738e8
|
done My balance
|
4 years ago |
|
Mohammad Aljammal
|
153335538a
|
done monthly reports
|
4 years ago |
|
haroon amjad
|
13adb46319
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/config/shared_pref_kay.dart
|
4 years ago |
|
Mohammad Aljammal
|
54b766de81
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
haroon amjad
|
96b7d00b4b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
haroon amjad
|
823eda0d5c
|
updates
|
4 years ago |
|
Mohammad Aljammal
|
895c09efa4
|
parking service
|
4 years ago |
|
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
30c0963063
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
8989fbc9b7
|
done design dashboard
|
4 years ago |
|
haroon amjad
|
5f1413a2ac
|
implementing Twilio in LiveCare
|
4 years ago |
|
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
4 years ago |
|
Sultan Khan
|
913729fc58
|
speech search
|
4 years ago |
|
Sultan Khan
|
3b2f9251dc
|
search
|
4 years ago |