haroon amjad
|
6511ca8dc7
|
UI fixes & updates
|
3 years ago |
Sultan Khan
|
448a3aaa48
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
881644a22e
|
family files changes
|
3 years ago |
Fatimah Alshammari
|
e2763a5bd5
|
fixed cart shopping issues
|
3 years ago |
|
haroon amjad
|
6cd2f65ce8
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
9d30bf63d0
|
Notification page fix
|
3 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
|
3 years ago |
|
haroon amjad
|
43c67a5a84
|
Notifications UI fix
|
3 years ago |
|
Sikander Saleem
|
a026fbf940
|
feedback status added.
|
3 years ago |
|
haroon amjad
|
f60684ad08
|
Notifications UI redesigned
|
3 years ago |
|
haroon amjad
|
8cf6642c79
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
803f5a786b
|
Blood pressure chart fix
|
3 years ago |
Sultan khan
|
f5b17444fe
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family
See merge request Cloud_Solution/diplomatic-quarter!441
|
3 years ago |
|
haroon amjad
|
07a98d75c6
|
My tracker fixes
|
3 years ago |
|
Sultan Khan
|
a39658206d
|
my family
|
3 years ago |
|
haroon amjad
|
40cbca565a
|
fixes
|
3 years ago |
|
haroon amjad
|
e1f5eb8b83
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
|
Sultan Khan
|
160049973e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
e3a7c08e7c
|
blood type changes
|
3 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
|
3 years ago |
|
haroon amjad
|
58c78656bf
|
Rating dialog updates
|
3 years ago |
Mirza.Shafique
|
dde16a13fe
|
General page in profile
|
3 years ago |
|
Sikander Saleem
|
21863cfe06
|
improvements.
|
3 years ago |
|
Sikander Saleem
|
ad98dfce67
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
|
3 years ago |
|
Sikander Saleem
|
1223ab7a17
|
h20 week & month graph updated & improvements.
|
3 years ago |
|
haroon amjad
|
4a2e01b8b1
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
b475adb5c3
|
Updates & fixes
|
3 years ago |
|
Sultan Khan
|
5c8b809e39
|
family file fixes
|
3 years ago |
|
Fatimah Alshammari
|
d8db5ad590
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/landing/landing_page_pharmcy.dart
# lib/pages/pharmacies/screens/cart-order-page.dart
|
3 years ago |
|
Fatimah Alshammari
|
30a1353be6
|
fixed brands design and recommended products issues
|
3 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
|
3 years ago |
|
Mirza.Shafique
|
d664a216c6
|
Profile Page and Back Button Click
|
3 years ago |
|
hussam al-habibeh
|
66acda38a3
|
add to cart fix
|
3 years ago |
Elham Rababh
|
75fdadafbd
|
refactor widget in the cart preview
|
3 years ago |
|
Elham Rababh
|
2526d6bc6f
|
fix issue in cart page
|
3 years ago |
|
haroon amjad
|
e62e3dae1b
|
CMC APIs coverting to RC
|
3 years ago |
|
haroon amjad
|
6902e6529c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
Sultan khan
|
5dbb257194
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!433
|
3 years ago |
|
Sikander Saleem
|
f6b96dcb7b
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/components/SearchByDoctor.dart
|
3 years ago |
|
Sultan Khan
|
3b4e03c618
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
b5cd6afa4b
|
family file fixs
|
3 years ago |
|
Sikander Saleem
|
c9662c7451
|
schedule appointment navigation fix.
|
3 years ago |
|
haroon amjad
|
0a9d0e5eaa
|
fixes
|
3 years ago |
|
Mirza.Shafique
|
6261f01ab6
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
Mirza.Shafique
|
9c7e8e3637
|
Back Button on Landing Page 1
|
3 years ago |
|
haroon amjad
|
3f3ddd7af0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/SchedulePage.dart
|
3 years ago |
|
Sikander Saleem
|
f509679173
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
1346eab593
|
h2o today page, prescription & schedule appointment improvements.
|
3 years ago |
|
haroon amjad
|
022b1bd000
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
Sultan Khan
|
02f5b43b64
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
ca70926050
|
family file fixes
|
3 years ago |
|
haroon amjad
|
cb220031dd
|
Updates & fixes
|
3 years ago |
|
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
3 years ago |
|
Mirza.Shafique
|
3a07d39bff
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
mosazaid
|
9a1dc3c678
|
pharmacy cart and wishlist fixes
|
3 years ago |
|
haroon amjad
|
6c4afaf114
|
Advance payment API updates
|
3 years ago |
|
Fatimah Alshammari
|
10f75191c6
|
added shopping cart to categories
|
3 years ago |
|
Mirza.Shafique
|
4d372bffb2
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
Mirza.Shafique
|
e788f09ed9
|
Show Chart Widget
|
3 years ago |
Haroon Amjad
|
1fa6a4409b
|
Family files fixes
|
3 years ago |
|
haroon amjad
|
587210ee58
|
UI fixes
|
3 years ago |
|
haroon amjad
|
a819660536
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
|
haroon amjad
|
01ccd484f4
|
Calendar plugin changed
|
3 years ago |
|
Sultan khan
|
7e095248c5
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family files changes
See merge request Cloud_Solution/diplomatic-quarter!428
|
3 years ago |
|
Sultan Khan
|
9010558dc9
|
family files changes
|
3 years ago |
|
Sikander Saleem
|
08960867f7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
2aa6ad5d6b
|
h20 today ui (cont.)1
|
3 years ago |
|
Sikander Saleem
|
55df00dcd4
|
h20 today ui (cont.)
|
3 years ago |
|
haroon amjad
|
7264d03818
|
Family Files previleges fix
|
3 years ago |
|
Sikander Saleem
|
763c16ddd0
|
h2o setting ui redesigned.
|
3 years ago |
|
haroon amjad
|
259581c4f8
|
updates & fixes
|
3 years ago |
Mohammad Aljammal
|
29d0afdea4
|
Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions
See merge request Cloud_Solution/diplomatic-quarter!424
|
3 years ago |
|
Elham Rababh
|
be21cb352b
|
return recommended products
|
3 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
|
3 years ago |
|
haroon amjad
|
2c4ff16f0c
|
updates & fixes
|
3 years ago |
|
Sultan Khan
|
821a9b5ade
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
2c1d7c511e
|
family file changes
|
3 years ago |
|
haroon amjad
|
230d87c473
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
3 years ago |
|
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
3 years ago |
|
Mirza.Shafique
|
cb230db0c5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
a9773e81e7
|
Bug Fixes prescription
|
3 years ago |
|
Sikander Saleem
|
8b49eed6ae
|
hospital text replaced with branch
|
3 years ago |
|
Fatimah Alshammari
|
ac63f09633
|
edit arabic version
|
3 years ago |
|
Fatimah Alshammari
|
8baad999c5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/config/config.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/wishlist.dart
|
3 years ago |
|
Elham Rababh
|
8fac62bcb1
|
fix bottom sheet functions
|
3 years ago |
|
Fatimah Alshammari
|
74929f76e5
|
edit home page
|
3 years ago |
|
Mohammad Aljammal
|
bcd99555e3
|
Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!423
|
3 years ago |
|
mosazaid
|
c1f3d3cc1c
|
fixes
|
3 years ago |
|
Elham Rababh
|
944bbce1bf
|
add count to cart
|
3 years ago |
|
Elham Rababh
|
bfbd04e35d
|
add count to cart
|
3 years ago |
|
mosazaid
|
acdd19eeed
|
calling cart from pharmacy home and add provider to it
|
3 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
|
3 years ago |
|
Mohammad Aljammal
|
eb19daa98f
|
fix car count
|
3 years ago |
|
Elham Rababh
|
3dc28d318a
|
fix bugs on wish list
|
3 years ago |
|
Fatimah Alshammari
|
4309952b17
|
fixed subCategories
|
3 years ago |
|
Sikander Saleem
|
b4031e973e
|
chevron icon to arrow forward
|
3 years ago |
|
Elham Rababh
|
b0b278a7e3
|
fix bugs
|
3 years ago |
|
haroon amjad
|
503ab739ca
|
prescription availability design revamped
|
3 years ago |
|
Elham Rababh
|
145117aa63
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
|
3 years ago |
|
Elham Rababh
|
9254004125
|
fix coloring issue
|
3 years ago |