Zohaib Iqbal Kambrani
|
e2bce87e34
|
resolve merge conflicts.
|
4 years ago |
Mohammad Aljammal
|
30ddea6419
|
hot fixing
|
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
|
ed729689a9
|
Merge branch 'design_issues' into 'development'
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
|
4 years ago |
|
Mohammad Aljammal
|
634c874eee
|
fix design issues
|
4 years ago |
Fatimah Alshammari
|
a1b2709ac8
|
fixed orders
|
4 years ago |
|
Fatimah Alshammari
|
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 |
|
Fatimah Alshammari
|
52fa0f6f89
|
fixed orders
|
4 years ago |
mosazaid
|
2843b1393e
|
some design enhancments
|
4 years ago |
|
Mohammad Aljammal
|
72290f041f
|
fix design
|
4 years ago |
|
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
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
|
c82f01cd1a
|
fix merge issues
|
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 |
|
mosazaid
|
d77a607b78
|
commit
|
4 years ago |
|
mosazaid
|
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 |
|
Mohammad Aljammal
|
6827efc1b6
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge
|
4 years ago |
|
Mohammad Aljammal
|
d7fe93b3f3
|
Merge branch 'pharmacy-hussam' into 'pharmacy'
parent_categorise_page update
See merge request Cloud_Solution/diplomatic-quarter!226
|
4 years ago |
|
Mohammad Aljammal
|
298b4d6525
|
change color
|
4 years ago |
|
Mohammad Aljammal
|
1968eb4682
|
return privilege
|
4 years ago |
|
Mohammad Aljammal
|
952e106531
|
return privilege
|
4 years ago |
|
Mohammad Aljammal
|
f77d2b497e
|
fix issues
|
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 |
Sultan Khan
|
e6a94f8014
|
login design
|
4 years ago |
|
Sultan Khan
|
b992978af4
|
login
|
4 years ago |
|
Sultan Khan
|
764e706000
|
dashboard issue fixed
|
4 years ago |
|
Sultan Khan
|
c01246acf0
|
hot fix
|
4 years ago |
|
Sultan Khan
|
2b48578e07
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
016dffcb87
|
change
|
4 years ago |
|
Mohammad Aljammal
|
4263672f00
|
fim last vital sign data
|
4 years ago |
|
Mohammad Aljammal
|
80da19555c
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!218
|
4 years ago |
|
Mohammad Aljammal
|
519a474d41
|
fix live care label and vital sign data
|
4 years ago |
|
Fatimah Alshammari
|
c0920e7099
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Fatimah Alshammari
|
5fa5e9b7c8
|
fixed orders and profile
|
4 years ago |
|
Mohammad Aljammal
|
5e3f6363cf
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
754e60eb72
|
fix send email lab result
|
4 years ago |
|
Sultan Khan
|
6b4bae7370
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
827768e96d
|
language change
|
4 years ago |
|
Mohammad Aljammal
|
591d56e624
|
change the info images and change the out patient color
|
4 years ago |
|
Mohammad Aljammal
|
5c8e43c163
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Sultan Khan
|
8becd4f920
|
login issue fixed
|
4 years ago |
|
Sultan Khan
|
3edae19ad6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
c9538c6a84
|
family files
|
4 years ago |
Zohaib Kambrani
|
57925e3b02
|
Geofence fixes by JobScheduler
|
4 years ago |
|
Mohammad Aljammal
|
33c61afd2a
|
add powered by
|
4 years ago |
|
Mohammad Aljammal
|
5e29dff448
|
fix issues insurance and medical profile order
|
4 years ago |
|
Sultan Khan
|
355286768a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
73c8e00852
|
bug fixes
|
4 years ago |
Haroon Amjad
|
b0ea1fc262
|
updates & fixes
|
4 years ago |
|
Sultan Khan
|
18f492e52f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
d53031b0e6
|
blood type update for family files
|
4 years ago |
|
Mohammad Aljammal
|
b9958acd53
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
2059b76fc1
|
fix Medical profile
|
4 years ago |
|
Mohammad Aljammal
|
4d8f42b517
|
fix issues vital sign issue
|
4 years ago |
|
Mohammad Aljammal
|
4f015a1cda
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Mohammad Aljammal
|
f6983c138a
|
fix issues
|
4 years ago |
|
Sultan Khan
|
37ab778fd0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
b505ed1be7
|
blood type added
|
4 years ago |
|
Zohaib Kambrani
|
a11d93332d
|
Wifi check network available - android
tweaking at geofence code
|
4 years ago |
|
Mohammad Aljammal
|
09a85d9127
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
4 years ago |
|
Fatimah Alshammari
|
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 |
|
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
4 years ago |
|
Zohaib Kambrani
|
508bc191be
|
geofencing login check fix
|
4 years ago |
|
Sultan Khan
|
6b1e7587a8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
a0baaac314
|
bug fixes
|
4 years ago |
|
Zohaib Kambrani
|
d8bd7d145d
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
a8b0af9ee1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Mohammad Aljammal
|
9c18c69d90
|
hot fixes
|
4 years ago |
haroon amjad
|
53282e3ae6
|
ToDo back issue fixed
|
4 years ago |
|
haroon amjad
|
ac3bebd59e
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
8c9762c24f
|
Fixes
|
4 years ago |
|
Sultan Khan
|
073e79c325
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
040c8f38ab
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
7bc8fdb819
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
3c2af11084
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
Conflicts:
lib/pages/landing/landing_page.dart
|
4 years ago |
|
Zohaib Kambrani
|
d8996cf879
|
Geofence Android Finished
|
4 years ago |
|
Mohammad Aljammal
|
d28870a629
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
6d7cb1b970
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
Conflicts:
ios/Runner.xcodeproj/project.pbxproj
lib/core/service/AuthenticatedUserObject.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
|
Mohammad Aljammal
|
a57d5eb69f
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
d9a70e7f75
|
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
hot fixes
See merge request Cloud_Solution/diplomatic-quarter!199
|
4 years ago |
|
Mohammad Aljammal
|
8329c534a3
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
4e2979cd64
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
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 |
|
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 |
|
Sultan Khan
|
e312671e24
|
hot fixes
|
4 years ago |
|
Sultan Khan
|
cf642da661
|
landing page
|
4 years ago |
|
Sultan Khan
|
eec67ac930
|
big fixes
|
4 years ago |
|
Sultan Khan
|
99ee5b4545
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
b29fdbb7d0
|
fix home issues
|
4 years ago |
|
Sultan Khan
|
8a554aa2f8
|
auth services fixed
|
4 years ago |
|
Mohammad Aljammal
|
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 |
|
Mohammad Aljammal
|
02d72fa27c
|
fix issues
|
4 years ago |
|
Fatimah Alshammari
|
4a84483698
|
fixed order details
|
4 years ago |
|
Sultan Khan
|
0f594059b5
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
haroon amjad
|
a7dc2fdfd1
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
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 |
|
Sultan Khan
|
3aa592e2b0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
9a578cafc2
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
b759758a68
|
bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
3860a08b53
|
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix issues
See merge request Cloud_Solution/diplomatic-quarter!188
|
4 years ago |
|
Mohammad Aljammal
|
f38f53587b
|
fix issues
|
4 years ago |
|
Haroon Amjad
|
3308aa47e1
|
fixes
|
4 years ago |
|
Sultan Khan
|
9e3db622fa
|
login loader issue fixed
|
4 years ago |
|
Zohaib Kambrani
|
78928335ef
|
Geofences Login check (unregister/register geozones on logout/logout)
|
4 years ago |
|
Zohaib Kambrani
|
6f6ab8d987
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
3122f2438b
|
fix import dialog
|
4 years ago |
|
Mohammad Aljammal
|
19f12116c4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
|
4 years ago |
|
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
4 years ago |
|
Zohaib Kambrani
|
53775d113d
|
commented code offers and packages
|
4 years ago |
|
Zohaib Kambrani
|
9947b30d3f
|
fix merge conflict
|
4 years ago |
|
Zohaib Kambrani
|
9ea779e48a
|
no message
|
4 years ago |
|
Zohaib Kambrani
|
b7088f70cd
|
Merge master in to my branch with Geofence iOS
|
4 years ago |
|
haroon amjad
|
965c97d262
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
bf999e611b
|
my appointment fix
|
4 years ago |
|
Sultan Khan
|
d779c6dd0a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
a2e385f282
|
family file drawer
|
4 years ago |
|
Haroon Amjad
|
b9269f525a
|
hot fixes
|
4 years ago |
|
Haroon Amjad
|
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 |
|
Haroon Amjad
|
5606c88715
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
92e6275162
|
Add Confirm send email dialog
|
4 years ago |
|
Haroon Amjad
|
81b51bef51
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 years ago |
|
Mohammad Aljammal
|
4e823c2be4
|
fix chart and duplicated data in Patient Lab Result
|
4 years ago |
|
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Zohaib Kambrani
|
67f4b4e167
|
iOS Geofence in progress
|
4 years ago |
|
Mohammad Aljammal
|
4a43bcefe1
|
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
remove ErOptions
See merge request Cloud_Solution/diplomatic-quarter!179
|
4 years ago |
|
Mohammad Aljammal
|
a6d3fce6fc
|
remove ErOptions
|
4 years ago |
|
Zohaib Kambrani
|
8457972fda
|
no message
|
4 years ago |
|
haroon amjad
|
b13a56ffbd
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
951d9b553f
|
fixes & updates
|
4 years ago |
|
Sultan Khan
|
71592adf32
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
1f0d01b6cc
|
language issue fixed
|
4 years ago |
|
Sultan Khan
|
2c50402aa8
|
language issue fixed
|
4 years ago |
|
haroon amjad
|
f394433b6e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
9d046fd971
|
updates & fixes
|
4 years ago |
|
Mohammad Aljammal
|
97776ce99b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
|
4 years ago |
|
Mohammad Aljammal
|
b25bdbb6fa
|
fix LiveChatPage Service LabOrderResult MedicineSearch issues
|
4 years ago |
|
Zohaib Kambrani
|
92ba977fca
|
no message
|
4 years ago |
|
mosazaid
|
c058cf0e93
|
finish address add/edit/delete/select
|
4 years ago |
|
Sultan Khan
|
557b8e814f
|
voice command
|
4 years ago |
|
haroon amjad
|
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 |
|
mosazaid
|
6ac8d67b83
|
finish address add/edit/delete/select
|
4 years ago |
|
Zohaib Kambrani
|
c10d024700
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
08aa2de69b
|
fix Prescriptions Service and design issues
|
4 years ago |
|
Zohaib Kambrani
|
8d5d55a150
|
Geofencing in progress
|
4 years ago |
|
Mohammad Aljammal
|
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 |