haroon amjad
|
6902e6529c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 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
|
4 years ago |
Sikander Saleem
|
f6b96dcb7b
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/components/SearchByDoctor.dart
|
4 years ago |
Sultan Khan
|
3b4e03c618
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
b5cd6afa4b
|
family file fixs
|
4 years ago |
Sikander Saleem
|
c9662c7451
|
schedule appointment navigation fix.
|
4 years ago |
haroon amjad
|
0a9d0e5eaa
|
fixes
|
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 |
Sultan Khan
|
02f5b43b64
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
ca70926050
|
family file fixes
|
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 |
haroon amjad
|
6c4afaf114
|
Advance payment API updates
|
4 years ago |
Fatimah Alshammari
|
10f75191c6
|
added shopping cart to categories
|
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
|
1fa6a4409b
|
Family files fixes
|
4 years ago |
haroon amjad
|
587210ee58
|
UI fixes
|
4 years ago |
haroon amjad
|
a819660536
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
haroon amjad
|
01ccd484f4
|
Calendar plugin changed
|
4 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
|
4 years ago |
Sikander Saleem
|
8aa1fbfb4a
|
localized_values fixed.
|
4 years ago |
Sultan Khan
|
9010558dc9
|
family files changes
|
4 years ago |
Sikander Saleem
|
08960867f7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
2aa6ad5d6b
|
h20 today ui (cont.)1
|
4 years ago |
Sikander Saleem
|
55df00dcd4
|
h20 today ui (cont.)
|
4 years ago |
haroon amjad
|
7264d03818
|
Family Files previleges fix
|
4 years ago |
Sikander Saleem
|
763c16ddd0
|
h2o setting ui redesigned.
|
4 years ago |
haroon amjad
|
259581c4f8
|
updates & 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 |
Elham Rababh
|
be21cb352b
|
return recommended products
|
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
|
2c4ff16f0c
|
updates & fixes
|
4 years ago |
Sultan Khan
|
821a9b5ade
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
2c1d7c511e
|
family file changes
|
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 |
Fatimah Alshammari
|
ac63f09633
|
edit arabic version
|
4 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
|
4 years ago |
Elham Rababh
|
8fac62bcb1
|
fix bottom sheet functions
|
4 years ago |
Fatimah Alshammari
|
74929f76e5
|
edit home page
|
4 years ago |
Mohammad Aljammal
|
bcd99555e3
|
Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!423
|
4 years ago |
mosazaid
|
c1f3d3cc1c
|
fixes
|
4 years ago |
Elham Rababh
|
944bbce1bf
|
add count to cart
|
4 years ago |
Elham Rababh
|
bfbd04e35d
|
add count to cart
|
4 years ago |
mosazaid
|
acdd19eeed
|
calling cart from pharmacy home and add provider to it
|
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 |
Elham Rababh
|
3dc28d318a
|
fix bugs on wish list
|
4 years ago |
Fatimah Alshammari
|
4309952b17
|
fixed subCategories
|
4 years ago |
Sikander Saleem
|
b4031e973e
|
chevron icon to arrow forward
|
4 years ago |
Elham Rababh
|
b0b278a7e3
|
fix bugs
|
4 years ago |
haroon amjad
|
503ab739ca
|
prescription availability design revamped
|
4 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
|
4 years ago |
Elham Rababh
|
9254004125
|
fix coloring issue
|
4 years ago |
mosazaid
|
8b5e1e57c7
|
fix bugs pharmacy wishlist
|
4 years ago |
mosazaid
|
4d37bc2958
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
Conflicts:
lib/pages/pharmacies/screens/product-details/product-detail.dart
lib/pages/pharmacies/screens/product-details/recommended_products.dart
lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
lib/widgets/others/app_scafold_detail_page.dart
|
4 years ago |
mosazaid
|
a41980b252
|
fix bugs pharmacy wishlist
|
4 years ago |
Elham Rababh
|
7de8c2588f
|
fix coloring issue
|
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 |
Sultan Khan
|
1b387c2dbf
|
changes pushed
|
4 years ago |
Elham Rababh
|
58d43f7e46
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
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 |
Sultan Khan
|
d514f64870
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
76e16594ba
|
FAMILY FILES
|
4 years ago |
Sikander Saleem
|
6099738a5c
|
improvements
|
4 years ago |
mosazaid
|
0d2d4c64c2
|
fix bugs pharmacy home and increase performance
|
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
|
055b888ba2
|
fix address
|
4 years ago |
Elham Rababh
|
3b79d0ac41
|
return the disable colors
|
4 years ago |
Elham Rababh
|
47e19c4ab5
|
add loader and cache on images
|
4 years ago |
Sikander Saleem
|
5410b826c3
|
prescriptions new ui updated.
|
4 years ago |
Mohammad Aljammal
|
48642a3c7c
|
Merge branch 'product_detail_page' into 'development'
Product detail page
See merge request Cloud_Solution/diplomatic-quarter!414
|
4 years ago |
Mohammad Aljammal
|
b175fb7ce0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
|
4 years ago |
Haroon Amjad
|
19edcc210e
|
Rate appointment UI implemented
|
4 years ago |
haroon amjad
|
89e1aa70c0
|
updates
|
4 years ago |
Elham Rababh
|
1e1e230908
|
fix call service in case not login
|
4 years ago |
Mohammad Aljammal
|
b539ff5851
|
Merge branch 'pharmacy_fix' into 'development'
cart fix
See merge request Cloud_Solution/diplomatic-quarter!413
|
4 years ago |
Elham Rababh
|
a5751f0d70
|
handel un login cases
|
4 years ago |
hussam al-habibeh
|
c56e4a1a5c
|
cart fix
|
4 years ago |
Mohammad Aljammal
|
6339e30369
|
Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!412
|
4 years ago |
mosazaid
|
a9d0b7a14b
|
fix bugs pharmacy home
|
4 years ago |
Elham Rababh
|
19cb48e133
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Elham Rababh
|
338901d423
|
remove add to cart
|
4 years ago |
Elham Rababh
|
7c15bca746
|
fix item
|
4 years ago |
mosazaid
|
6acb8031d0
|
fix bugs pharmacy home
|
4 years ago |
Mohammad Aljammal
|
76eef8625d
|
Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!411
|
4 years ago |
mosazaid
|
594b2710b3
|
fix bugs pharmacy home
|
4 years ago |
haroon amjad
|
22c6a8ce42
|
no message
|
4 years ago |
haroon amjad
|
85d68b0388
|
ereferral fixes
|
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 |
Sultan Khan
|
fed33ae4dc
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
fee23de1fd
|
hhc changes
|
4 years ago |
Elham Rababh
|
ad0c8eaffb
|
fix scaffold
|
4 years ago |
Mohammad Aljammal
|
b64a5b29c5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacy/profile/profile.dart
|
4 years ago |
Mohammad Aljammal
|
9e31d497ed
|
fix wish list issue
|
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 |
Elham Rababh
|
65cf4316ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Elham Rababh
|
bb96201c2e
|
remove the custom scaffold
|
4 years ago |
Sikander Saleem
|
28c0450544
|
lab result filterName improvement.
|
4 years ago |
hussam al-habibeh
|
f3000d0ee3
|
My account design fix
|
4 years ago |
Elham Rababh
|
e20e90c20c
|
fix quantity_box
|
4 years ago |
haroon amjad
|
f6d779431a
|
fixes
|
4 years ago |
haroon amjad
|
8133f8a23a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
46cc73bdd7
|
CMC changes
|
4 years ago |
Sultan Khan
|
6159be0f75
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
5fe0214e04
|
bug fixes
|
4 years ago |
haroon amjad
|
8cc36ae848
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
dfafb6b664
|
fixes
|
4 years ago |
Mirza.Shafique
|
c23478b838
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
205b4d6b21
|
Photo view in CMC
|
4 years ago |
Mohammad Aljammal
|
424552d672
|
Merge branch 'pharmacy_fix' into 'development'
add pharmacy icons for bottom nav
See merge request Cloud_Solution/diplomatic-quarter!403
|
4 years ago |
Elham Rababh
|
d5f1a162c0
|
replace bottom sheet button
|
4 years ago |
hussam al-habibeh
|
85e6032875
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
|
4 years ago |
mosazaid
|
185d66e342
|
fix bugs pharmacy home
|
4 years ago |
hussam al-habibeh
|
d4fd95606e
|
add pharmacy icons for bottom nav
|
4 years ago |
Sikander Saleem
|
d1f3428def
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
df32ae0142
|
lab order clinic/hospital name, prescription reminder ui, prescription availibility
|
4 years ago |
haroon amjad
|
879ce4ee06
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
7675a4496a
|
my vaccine & lab result fix
|
4 years ago |
Sultan Khan
|
a4ab22a4aa
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
5b988dff4f
|
BUG FIXES
|
4 years ago |
Mirza.Shafique
|
5e383e57d9
|
CMC error Fixes
|
4 years ago |
Elham Rababh
|
6fe41382c0
|
first step from design
|
4 years ago |
Sikander Saleem
|
3403e07aba
|
recall prescription order log when refill or cancel order.
|
4 years ago |
mosazaid
|
c558fe6bd9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
|
4 years ago |
mosazaid
|
f47d59c43f
|
fix bugs pharmacy home
|
4 years ago |
Haroon Amjad
|
062ca5c11c
|
EReferral fixes
|
4 years ago |
Haroon Amjad
|
abcb71e86e
|
Invoice details UI revamped
|
4 years ago |
haroon amjad
|
c91b8ce777
|
My Vaccines design revamped
|
4 years ago |
Elham Rababh
|
2839af658a
|
fix issues
|
4 years ago |
haroon amjad
|
dfeb249a54
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
a4a2389a78
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
f63293ef3e
|
login input rtl
|
4 years ago |
mosazaid
|
fdb61c78c5
|
fix bugs pharmacy home
|
4 years ago |
Sultan Khan
|
fc9f2fc34e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
4 years ago |
hussam al-habibeh
|
9a2d52309c
|
products categories page fix
|
4 years ago |
Sikander Saleem
|
5bdb56df60
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
5fda70decf
|
cmc & hhc order log ui improvements.
|
4 years ago |
hussam al-habibeh
|
cb2b9db0ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
|
4 years ago |
Mirza.Shafique
|
bc246b2f9f
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
f0566fb069
|
CMC Images
|
4 years ago |
Mohammad Aljammal
|
b53bd5fd62
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
Mohammad Aljammal
|
43e7bb9ff3
|
fix bottom navigation bar
|
4 years ago |
mosazaid
|
a398ede172
|
fix bugs pharmacy home
|
4 years ago |
hussam al-habibeh
|
2265487ccd
|
remove cart cout & icon from AppBar
|
4 years ago |
Elham Rababh
|
769dc4e0ac
|
first step of ProductDetailPage refactor
|
4 years ago |
Elham Rababh
|
a269b514a9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/config/config.dart
|
4 years ago |
Elham Rababh
|
c7a0d39aab
|
first step of ProductDetailPage refactor
|
4 years ago |
haroon amjad
|
184942e891
|
Covid Payment fixes
|
4 years ago |
haroon amjad
|
ab8030416c
|
Updates & fixes
|
4 years ago |
hussam al-habibeh
|
806e07e4e6
|
products categories page fix
|
4 years ago |
Mirza.Shafique
|
9b160958bb
|
Covid New Design 3
|
4 years ago |
mosazaid
|
f329eea798
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
|
4 years ago |
mosazaid
|
01a77d5352
|
fix bugs pharmacy
|
4 years ago |
Mohammad Aljammal
|
d64e2a469f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
|
4 years ago |
Mohammad Aljammal
|
8ecd4a24d8
|
fix product tile
|
4 years ago |
Mohammad Aljammal
|
8c7f397ac8
|
Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!397
|
4 years ago |
hussam al-habibeh
|
dbf7ebf287
|
fix most viewed & best sellers moduls
|
4 years ago |
Elham Rababh
|
db277a62f5
|
fix brand design
|
4 years ago |
Elham Rababh
|
a6a7ed4e1b
|
remove cart from product details
|
4 years ago |
Elham Rababh
|
9b42d411ca
|
remove cart from product details
|
4 years ago |
haroon amjad
|
0955a22616
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
fa8c739b2c
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
6e244a55f5
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
7563a2870b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
b80e2ea16e
|
Covid New Design 2
|
4 years ago |
Sikander Saleem
|
74432b6bbb
|
cmc order log ui changes
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
4 years ago |
Mirza.Shafique
|
ef8006efd8
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
# lib/pages/Covid-DriveThru/covid-payment-alert.dart
# lib/pages/Covid-DriveThru/covid-payment-details.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
|
4 years ago |
Mirza.Shafique
|
5b330b2a25
|
Covid New Design
|
4 years ago |
Elham Rababh
|
cc88f0f81e
|
first step of fixing
|
4 years ago |
Sikander Saleem
|
9f8bcc63f3
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/medical/prescriptions/prescriptions_history_details_page.dart
|
4 years ago |
Sikander Saleem
|
4ce941e01e
|
prescription order log detail view change on arabic
|
4 years ago |
Sikander Saleem
|
c96fa62363
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
e36e0ce0b7
|
h20 bottom nav bar bug fix (happen in release mode)
|
4 years ago |
hussam al-habibeh
|
7427cd68ff
|
fix bottom nav bar ui
|
4 years ago |
haroon amjad
|
19e6954bc8
|
updates
|
4 years ago |
haroon amjad
|
c3feed771c
|
merge conflicts resolved
|
4 years ago |
haroon amjad
|
5c64ce4795
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/MyAppointments/SchedulePage.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
b0f4cfcff3
|
Family file fixes
|
4 years ago |
Sultan Khan
|
c54146b3ba
|
sechedule fix
|
4 years ago |
haroon amjad
|
2fc5425884
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
f55fbd1cc2
|
UI fixes
|
4 years ago |
haroon amjad
|
4b1a2d4f3d
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/ContactUs/findus/hospitrals_page.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
|
4 years ago |
haroon amjad
|
a075d53dd5
|
UI updates & fixes
|
4 years ago |
Sultan Khan
|
54ac31a74c
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
a57facb876
|
family file fix
|
4 years ago |
Sultan Khan
|
c58023efc3
|
family file fixes
|
4 years ago |
Sikander Saleem
|
7b8093b7ba
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
c1b23b7c2a
|
improvements
|
4 years ago |
Mirza.Shafique
|
e24eaa791b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
5b47aaac6f
|
icon and find us distance
|
4 years ago |
haroon amjad
|
728c22cc68
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/insurance/insurance_approval_screen.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
0348397df3
|
insurance approval detail company name added.
|
4 years ago |
Sikander Saleem
|
4a30c59f83
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
e37781c3a6
|
insurance approval screen and detail screen ui changes.
|
4 years ago |
haroon amjad
|
ba7d0329c3
|
Dental Invoices UI
|
4 years ago |
haroon amjad
|
af7b27258c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sultan Khan
|
0e43ca173a
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
d535cb421d
|
bug fixes
|
4 years ago |
haroon amjad
|
f9b57ce4aa
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
4ac0845003
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
719cdbd2e4
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
8a4cf9f23b
|
Line Chart Fix in Vital Signs
|
4 years ago |
Sikander Saleem
|
baf4eab604
|
prescription order detail ui changes
|
4 years ago |
haroon amjad
|
bbcf22ddfa
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
|
4 years ago |
haroon amjad
|
92bfe27a6e
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
4caacb968b
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
d9405b2bd0
|
prescription order log ui changes
|
4 years ago |
Sikander Saleem
|
8e27d8210a
|
prescription detail ui changes.
|
4 years ago |
Mirza.Shafique
|
350882b1d2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
ef2bcc1c65
|
Web RTC Design implementation
|
4 years ago |
haroon amjad
|
ad3463bbfc
|
active medication design revamped
|
4 years ago |
haroon amjad
|
bf4709fef6
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/medical/prescriptions/prescription_details_page.dart
|
4 years ago |
haroon amjad
|
304ba8afa4
|
bas app client fixes
|
4 years ago |
Sikander Saleem
|
8cb342cb24
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
9d67704c67
|
prescription detail ui changes(cont).
|
4 years ago |
Sultan Khan
|
2ebfdcfdd7
|
login issue fixed
|
4 years ago |
Sikander Saleem
|
259163481c
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
4 years ago |
haroon amjad
|
05354f72cc
|
pharmacy import fixes
|
4 years ago |
haroon amjad
|
b51989e798
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/compare.dart
# lib/pages/pharmacies/my_reviews.dart
# lib/pages/pharmacies/wishlist.dart
|
4 years ago |
haroon amjad
|
b3dffc992c
|
App expandable fixes
|
4 years ago |
haroon amjad
|
a2e25f7a7a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
98837b2298
|
WebRTC implementation
|
4 years ago |
Sikander Saleem
|
f0bb94c422
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
4e0197965c
|
prescription ui changes(cont).
|
4 years ago |
Mirza.Shafique
|
999a45c711
|
App Expendable Design Change
|
4 years ago |
haroon amjad
|
1200dbeb70
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
322a32be21
|
WebRTC Implementing
|
4 years ago |
haroon amjad
|
c050633671
|
SignalR Updates
|
4 years ago |
Sultan Khan
|
f9f5a886a9
|
VITAL SIGN FIXED
|
4 years ago |
haroon amjad
|
0a90791aca
|
Push notification fixes
|
4 years ago |
haroon amjad
|
eeb20073cb
|
Medicine prescriptions fixes from appointment details page
|
4 years ago |
haroon amjad
|
298a8f4cff
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
# lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
# lib/pages/DrawerPages/family/my-family.dart
|
4 years ago |
haroon amjad
|
b1128be94f
|
Updates & fixes
|
4 years ago |
Sultan Khan
|
1d36076320
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
dd58b8637b
|
bug fixs
|
4 years ago |
haroon amjad
|
e5a636b704
|
Covid Test changes
|
4 years ago |
Fatimah Alshammari
|
b3285f4528
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/sub_categorise_page.dart
|
4 years ago |
Fatimah Alshammari
|
bdededa397
|
fixed arabic version
|
4 years ago |
hussam al-habibeh
|
e4d54f0c0b
|
parent product and sub product update
|
4 years ago |
hussam al-habibeh
|
f1c2dbbbfc
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
Conflicts:
lib/pages/parent_categorise_page.dart
lib/pages/sub_categorise_page.dart
|
4 years ago |
hussam al-habibeh
|
0a1db70229
|
parent product and sub product update
|
4 years ago |
haroon amjad
|
e8bb4e962c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
|
4 years ago |
Mirza.Shafique
|
ad3fbdf323
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
717c7b3be4
|
Lab results designs enhancements
|
4 years ago |
Zohaib Iqbal Kambrani
|
581bbe63bb
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
* 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
Images deleted from assets
CMC 1.7
CMC 1.6
CMC 1.5
|
4 years ago |
Zohaib Iqbal Kambrani
|
3f178e3e3f
|
Google_Huawei Map -> AppMap
|
4 years ago |
Fatimah Alshammari
|
7ebeb8cb4b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/parent_categorise_page.dart
# lib/pages/sub_categorise_page.dart
|
4 years ago |
Fatimah Alshammari
|
bcfbca98a1
|
fixed arabic version
|
4 years ago |
Mohammad Aljammal
|
473f372a85
|
Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering
See merge request Cloud_Solution/diplomatic-quarter!388
|
4 years ago |
hussam al-habibeh
|
cb9d8cb9d9
|
fix pharmacy products filtering
|
4 years ago |
hussam al-habibeh
|
b0165c0d29
|
fix pharmacy products filtering
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
Fatimah Alshammari
|
2caf4d4837
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
4 years ago |
haroon amjad
|
c186c9f186
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
0fe4a21388
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
d7314f7555
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
96b971ef01
|
CMC 1.6
|
4 years ago |
haroon amjad
|
32462ff5ba
|
covid translation updates
|
4 years ago |
haroon amjad
|
f946a7be4d
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
f20883184e
|
CMC 1.5
|
4 years ago |
Sultan Khan
|
32f62fbe56
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
Sultan Khan
|
c6fd52aad2
|
home health care
|
4 years ago |
haroon amjad
|
948f4fc6b8
|
CMC Add address fixes
|
4 years ago |
Sultan Khan
|
4d00664045
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
Sultan Khan
|
c6404a2a0b
|
tracker services
|
4 years ago |
haroon amjad
|
74ca9995c9
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
|
4 years ago |
haroon amjad
|
2d7c7239c5
|
Health Converters fixes
|
4 years ago |
Mirza.Shafique
|
2d38e8905b
|
CMC 1.4
|
4 years ago |
haroon amjad
|
2bba42b574
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
haroon amjad
|
f795ba24c5
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
d1bc46f451
|
CMC Marge
|
4 years ago |
Mirza.Shafique
|
a67c5afcfb
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
e890c80831
|
CMC 1.3
|
4 years ago |
Mohammad Aljammal
|
9fb4e79c34
|
Merge branch 'sep_fixes' into 'development'
Sep fixes
See merge request Cloud_Solution/diplomatic-quarter!387
|
4 years ago |
Elham Rababh
|
bb372210e0
|
PAP-938: fix Referral sent
|
4 years ago |
Elham Rababh
|
bff7020b78
|
PAP-939: fixes
|
4 years ago |