Zohaib Iqbal Kambrani
|
8b1ac05012
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
app bar back icon issue
improvements
emergency nearest ui changes
Zoom Avatar implementation
no message
Child Vaccine 3
register
register page
Working on Health data
Child Vaccine 2
registration
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
registration done
Child Vaccine 1.0
In App Review
In App Review
oder log merge fix
design fixes 3
Chart fix & In-App update implemented
design fixes 1.1
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
|
4 years ago |
haroon amjad
|
68829d0986
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mirza.Shafique
|
0be197a782
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
e3bfe83ea2
|
app bar back icon issue
|
4 years ago |
haroon amjad
|
be91844868
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sikander Saleem
|
de43c6bfa4
|
improvements
|
4 years ago |
Sikander Saleem
|
7641da8122
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/hospital_location.dart
|
4 years ago |
Sikander Saleem
|
7c4edf971a
|
emergency nearest ui changes
|
4 years ago |
Mirza.Shafique
|
fe1a287070
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
5514753288
|
Zoom Avatar implementation
|
4 years ago |
Zohaib Iqbal Kambrani
|
aad071ac67
|
Packages and Offers apply token
|
4 years ago |
haroon amjad
|
d409875741
|
Smartwatch updates
|
4 years ago |
haroon amjad
|
1f077f71f8
|
no message
|
4 years ago |
Fatimah Alshammari
|
e494c9304d
|
fixed issues
|
4 years ago |
haroon amjad
|
3db4094585
|
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
|
4 years ago |
haroon amjad
|
3d22cdb17c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
680dcfc255
|
In App Review
|
4 years ago |
Mirza.Shafique
|
d3698a0e74
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
|
4 years ago |
Mirza.Shafique
|
3d480bac5c
|
design fixes 3
|
4 years ago |
haroon amjad
|
4b0382d7c4
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
12a58856e5
|
Chart fix & In-App update implemented
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
haroon amjad
|
a710406317
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
# lib/pages/DrawerPages/family/my-family.dart
|
4 years ago |
haroon amjad
|
494b1f221d
|
Updates & fixes
|
4 years ago |
Mirza.Shafique
|
792bb4df0b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
# lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
# lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
|
4 years ago |
Mirza.Shafique
|
0ba4e9047b
|
design fixes 1.0
|
4 years ago |
haroon amjad
|
8001c0140c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
|
4 years ago |
Sikander Saleem
|
554b9558b1
|
add reminder & send mail button color change.
|
4 years ago |
Haroon Amjad
|
59dac89118
|
updates
|
4 years ago |
haroon amjad
|
832d48971f
|
updates
|
4 years ago |
Sikander Saleem
|
706832a1cb
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
haroon amjad
|
43a672cc68
|
Updates & fixes
|
4 years ago |
haroon amjad
|
5d44fff28d
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
Sikander Saleem
|
f13871de9a
|
find us and prescription availability hospital location ui changes,
|
4 years ago |
Sikander Saleem
|
ecb6315f9c
|
blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont).
|
4 years ago |
haroon amjad
|
6511ca8dc7
|
UI fixes & updates
|
4 years ago |
haroon amjad
|
6cd2f65ce8
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
9d30bf63d0
|
Notification page fix
|
4 years ago |
Sikander Saleem
|
ae85f75e81
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/feedback/status_feedback_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
a026fbf940
|
feedback status added.
|
4 years ago |
haroon amjad
|
f60684ad08
|
Notifications UI redesigned
|
4 years ago |
haroon amjad
|
07a98d75c6
|
My tracker fixes
|
4 years ago |
haroon amjad
|
40cbca565a
|
fixes
|
4 years ago |
haroon amjad
|
e1f5eb8b83
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Sultan Khan
|
160049973e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
e3a7c08e7c
|
blood type changes
|
4 years ago |
Sikander Saleem
|
8f371f87d2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
58c78656bf
|
Rating dialog updates
|
4 years ago |
Sikander Saleem
|
ad98dfce67
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
|
4 years ago |
Sikander Saleem
|
1223ab7a17
|
h20 week & month graph updated & improvements.
|
4 years ago |
Sultan Khan
|
5c8b809e39
|
family file fixes
|
4 years ago |
hussam al-habibeh
|
a8fb7152b1
|
add to cart fix
|
4 years ago |
hussam al-habibeh
|
75ef3fde80
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
Conflicts:
lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
|
4 years ago |
Mirza.Shafique
|
d664a216c6
|
Profile Page and Back Button Click
|
4 years ago |
hussam al-habibeh
|
66acda38a3
|
add to cart fix
|
4 years ago |
Elham Rababh
|
75fdadafbd
|
refactor widget in the cart preview
|
4 years ago |
Mirza.Shafique
|
6261f01ab6
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
9c7e8e3637
|
Back Button on Landing Page 1
|
4 years ago |
haroon amjad
|
3f3ddd7af0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/SchedulePage.dart
|
4 years ago |
Sikander Saleem
|
f509679173
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
haroon amjad
|
cbf2e84959
|
fixes
|
4 years ago |
Sikander Saleem
|
1346eab593
|
h2o today page, prescription & schedule appointment improvements.
|
4 years ago |
haroon amjad
|
022b1bd000
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
cb220031dd
|
Updates & fixes
|
4 years ago |
mosazaid
|
b779c250a4
|
pharmacy cart and wishlist fixes
|
4 years ago |
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
4 years ago |
Mirza.Shafique
|
3a07d39bff
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
mosazaid
|
9a1dc3c678
|
pharmacy cart and wishlist fixes
|
4 years ago |
Mirza.Shafique
|
4d372bffb2
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
e788f09ed9
|
Show Chart Widget
|
4 years ago |
haroon amjad
|
587210ee58
|
UI fixes
|
4 years ago |
Mohammad Aljammal
|
29d0afdea4
|
Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions
See merge request Cloud_Solution/diplomatic-quarter!424
|
4 years ago |
haroon amjad
|
96c290c3f3
|
Localization file updates
|
4 years ago |
haroon amjad
|
829fcd1461
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
|
4 years ago |
haroon amjad
|
230d87c473
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
cb230db0c5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
a9773e81e7
|
Bug Fixes prescription
|
4 years ago |
Sikander Saleem
|
8b49eed6ae
|
hospital text replaced with branch
|
4 years ago |
Elham Rababh
|
8fac62bcb1
|
fix bottom sheet functions
|
4 years ago |
mosazaid
|
c1f3d3cc1c
|
fixes
|
4 years ago |
Mohammad Aljammal
|
0150bc4684
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacies/ProductCheckTypeWidget.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
Mohammad Aljammal
|
eb19daa98f
|
fix car count
|
4 years ago |
haroon amjad
|
46a572674f
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
69af6799c4
|
updates
|
4 years ago |
Mirza.Shafique
|
3a40eb92be
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
06c5ee269b
|
Bug Fixes
|
4 years ago |
Elham Rababh
|
2981eb3236
|
fix public card issues
|
4 years ago |
haroon amjad
|
2690bddcac
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
6099738a5c
|
improvements
|
4 years ago |
Elham Rababh
|
7dfc700d26
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Sikander Saleem
|
df31c82fd5
|
doctor header review on tap improvement.
|
4 years ago |
Elham Rababh
|
3b79d0ac41
|
return the disable colors
|
4 years ago |
Sikander Saleem
|
5410b826c3
|
prescriptions new ui updated.
|
4 years ago |
hussam al-habibeh
|
c56e4a1a5c
|
cart fix
|
4 years ago |
Mohammad Aljammal
|
1f9e7563a9
|
Merge branch 'product_detail_page' into 'development'
fix scaffold
See merge request Cloud_Solution/diplomatic-quarter!409
|
4 years ago |
Elham Rababh
|
ad0c8eaffb
|
fix scaffold
|
4 years ago |
Mohammad Aljammal
|
361b72624b
|
Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!407
|
4 years ago |