Fatimah Alshammari
78fc77159c
fix lakum issues
4 years ago
haroon amjad
8d6278a59b
Pharmacy fixes
4 years ago
haroon amjad
925e3cb686
Merge branch 'development' into haroon-new-design
...
# Conflicts:
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/landing_page_pharmcy.dart
# lib/pages/login/login.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/screens/product-details/product-detail.dart
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/pharmacy/profile/profile.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
haroon amjad
585e26b091
Registration fix
4 years ago
Mohammad Aljammal
fd46259701
Merge branch 'bottom_nav_pharmacy' into 'development'
...
show bottom nav in pharmacy all pages
See merge request Cloud_Solution/diplomatic-quarter!479
4 years ago
hussam al-habibeh
cb85085969
show bottom nav in pharmacy all pages
4 years ago
Sikander Saleem
d6a5f68312
Merge branch 'new_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Mohammad Aljammal
c0cf2f71a2
Merge branch 'bottom_nav_pharmacy' into 'development'
...
Bottom nav pharmacy
See merge request Cloud_Solution/diplomatic-quarter!478
4 years ago
hussam al-habibeh
46d7e7ee14
show bottom nav in pharmacy all pages
4 years ago
Sikander Saleem
cd81f05a8d
laser clinic design (cont.)
4 years ago
haroon amjad
f15090c634
Merge branch 'development_new_design_2.0' into 'sultan_new_design'
...
# Conflicts:
# lib/pages/login/register.dart
4 years ago
haroon amjad
8c99bba17b
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
e7f5fc8434
Blood donation fixes
4 years ago
Sultan Khan
64e62235c4
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
4 years ago
Sultan Khan
a471824507
register issues
4 years ago
Mirza.Shafique
fa986476ee
feedback status bar
4 years ago
haroon amjad
e82b8d4439
Lakum & other fixes
4 years ago
haroon amjad
f029aaa1c6
Fixes & code optimizations
4 years ago
Mohammad Aljammal
f9e33e7212
Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
...
Zik new design 2.0
See merge request Cloud_Solution/diplomatic-quarter!467
4 years ago
Mohammad Aljammal
60d2496f0a
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!472
4 years ago
Mohammad Aljammal
f424315a19
last commit 😄
4 years ago
Mohammad Aljammal
d4283c0116
fix merge issue
4 years ago
Mohammad Aljammal
4cb63e353b
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
4 years ago
Fatimah Alshammari
9cececf3f1
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
4 years ago
Fatimah Alshammari
044f74865e
fixed issues
4 years ago
haroon amjad
5692bc66a9
Removing anatomy pub from project
4 years ago
Elham Rababh
d486b76116
fix merge issue
4 years ago
hussam al-habibeh
bc91b9ad88
bottom nav pharmacy
4 years ago
haroon amjad
668d725b25
Laser booking
4 years ago
Elham Rababh
c97c39ea11
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
...
Conflicts:
lib/config/config.dart
lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
4 years ago
haroon amjad
fa5fd8e323
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
0853ecdc27
Body added
4 years ago
mosazaid
4939fe63d1
pharmacy cart fixe counter
4 years ago
haroon amjad
0c2e3f772b
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
...
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!468
4 years ago
Mirza.Shafique
f547dc105c
Merge branch 'development_new_design_2.0' into mirza_home_page
4 years ago
Mirza.Shafique
69db41364f
icon fixs
4 years ago
Fatimah Alshammari
42e74759e4
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
...
# Conflicts:
# lib/pages/search_products_page.dart
4 years ago
haroon amjad
62974b7b72
Updates & fixes
4 years ago
Fatimah Alshammari
e6378b7ada
fix issues
4 years ago
Elham Rababh
616748dc6f
fix proceed button
4 years ago
Zohaib Iqbal Kambrani
94a5cac27d
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
...
* development_new_design_2.0:
LiveCare Schedule fixes
improvements.
live care design 3.0
dialog ui changes in wallet & improvements.
LiveCare Schedule API fix
live care design 2.0
Health converters UI done
Health Calculators APIs updated
Translation updates
SessionID update
live care design 1.0
Updates & fixes
blood sugar dialog improvement.
# Conflicts: Rseloved
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Zohaib Iqbal Kambrani
9d71793e88
no message
4 years ago
haroon amjad
57ea450662
LiveCare Schedule fixes
4 years ago
Sikander Saleem
455f65a5e5
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
d2223da3c2
improvements.
4 years ago
Mirza.Shafique
f56ae8ff5b
Merge branch 'development_new_design_2.0' into mirza_home_page
4 years ago
Mirza.Shafique
6af1747f12
live care design 3.0
4 years ago
Sikander Saleem
8c27773f7f
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
40c63ae53b
dialog ui changes in wallet & improvements.
4 years ago
haroon amjad
853ca033d2
LiveCare Schedule API fix
4 years ago
Mirza.Shafique
a805273049
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
4a8fc38626
live care design 2.0
4 years ago
haroon amjad
2a212149ed
Health converters UI done
4 years ago
haroon amjad
73822300f9
Health Calculators APIs updated
4 years ago
haroon amjad
7123ed34ab
Translation updates
4 years ago
haroon amjad
fd07d543fa
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
cb69684bb8
SessionID update
4 years ago
Mirza.Shafique
cacdd5907c
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
fd26a59b2d
live care design 1.0
4 years ago
haroon amjad
5e5f540431
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/config.dart
4 years ago
haroon amjad
b08dfb117c
Updates & fixes
4 years ago
Zohaib Iqbal Kambrani
4c5b9b4244
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
...
* development_new_design_2.0:
Translation update
Fixes & updates
Blood donation fixes
Pharmacy Payment method design fix, Blood Donation fix
improvements
blood donation dialog change & improvements.
Pharmacy updates
Pharmacy prescriptions page design
LiveCare design fixes
4 years ago
Zohaib Iqbal Kambrani
9fd2304d33
tamara.
4 years ago
Sikander Saleem
c1ce3a0489
blood sugar dialog improvement.
4 years ago
Elham Rababh
2c30b5a494
fix issues
4 years ago
Fatimah Alshammari
c242910aa2
fixed issues
4 years ago
haroon amjad
5474ecf2cc
Translation update
4 years ago
haroon amjad
b53d912996
Fixes & updates
4 years ago
haroon amjad
df7d8a8603
Blood donation fixes
4 years ago
haroon amjad
924f685342
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/Blood/blood_donation.dart
4 years ago
haroon amjad
ddf764897a
Pharmacy Payment method design fix, Blood Donation fix
4 years ago
Sikander Saleem
ebb4c026c6
improvements
4 years ago
Sikander Saleem
d8476df6dd
Merge branch 'new_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
4 years ago
Sikander Saleem
4858f8883a
blood donation dialog change & improvements.
4 years ago
Fatimah Alshammari
428791c725
fixed design
4 years ago
Fatimah Alshammari
5e75860d43
Merge branch 'development_new_design_2.0' into Fatima-New-Design
...
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
# lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
4 years ago
Fatimah Alshammari
1089ce3aa3
Updates
4 years ago
haroon amjad
3dc82a0547
Pharmacy updates
4 years ago
haroon amjad
eed4fd2509
Pharmacy prescriptions page design
4 years ago
haroon amjad
20076f2f2b
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
2cff7c3246
LiveCare design fixes
4 years ago
Zohaib Iqbal Kambrani
ebfa9cd630
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
...
* development_new_design_2.0:
Layout files
pharmacy updates
fixed issues
Updates
UI fixes
Updates
Smartwatch updates
Smartwatch updates
fixed issues
fixed loader issue
4 years ago
Zohaib Iqbal Kambrani
f3462dfc19
Applied cost from api at cart
4 years ago
haroon amjad
6f92a093ab
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/config.dart
4 years ago
haroon amjad
9dbe922259
pharmacy updates
4 years ago
haroon amjad
e58b925382
Merge branch 'development' into haroon-new-design
...
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
4 years ago
Fatimah Alshammari
a4f404386b
fixed issues
4 years ago
haroon amjad
41822d2cf1
Merge branch 'development' into haroon-new-design
4 years ago
haroon amjad
e913316c54
Updates
4 years ago
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
940441106a
UI fixes
4 years ago
haroon amjad
be91844868
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
30c6f1dedb
Updates
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
haroon amjad
1fff2dad25
Smartwatch updates
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
b52c719351
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
1f077f71f8
no message
4 years ago
Mirza.Shafique
957ff9039b
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
1a6802ce24
Child Vaccine 3
4 years ago
Fatimah Alshammari
e494c9304d
fixed issues
4 years ago
haroon amjad
5287260b85
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
haroon amjad
745b167c47
register
4 years ago
Sultan Khan
58ab90f6d3
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
4 years ago
Sultan Khan
c14f40dae2
register page
4 years ago
haroon amjad
983fb55747
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad
2032053cb7
Working on Health data
4 years ago
Mirza.Shafique
4f7666cfd8
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
ce115e1037
Child Vaccine 2
4 years ago
Sultan Khan
eaea14ce3d
registration
4 years ago
haroon amjad
2062b96652
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
3db4094585
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
4 years ago
Sultan Khan
a59c60f79a
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
4 years ago
Sultan Khan
496c6ce32e
registration done
4 years ago
Mirza.Shafique
a766c2522e
Child Vaccine 1.0
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
41db218e9a
oder log merge fix
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
Sikander Saleem
4dca22bec1
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
afad83182d
h20 dialog ui changes
4 years ago
haroon amjad
0c895348e7
my family fix
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
75d3751719
Offers API
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
haroon amjad
1858be18b7
Feedback Status fixes
4 years ago
Sikander Saleem
554b9558b1
add reminder & send mail button color change.
4 years ago
Sikander Saleem
14ccae993e
my tracker tabs switching issue fixed.
4 years ago
Haroon Amjad
59dac89118
updates
4 years ago
haroon amjad
ade3cb0899
File no & UI changes
4 years ago
haroon amjad
1dcfe44e96
Translations
4 years ago
haroon amjad
2ed8008790
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
832d48971f
updates
4 years ago
Mirza.Shafique
4cf9a9b2c2
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
Mirza.Shafique
3dbef4095f
Payment page design
4 years ago
Sikander Saleem
ba4792cd38
merge improvements.
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
Mirza.Shafique
ab6f7b8915
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
Mirza.Shafique
eeaf7d9d2f
HMG Services Detail View
4 years ago
Sikander Saleem
f13871de9a
find us and prescription availability hospital location ui changes,
4 years ago
Fatimah Alshammari
f649701276
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
4 years ago
Fatimah Alshammari
3be7f7f899
fixed loader issue
4 years ago
haroon amjad
ed4fca2d4c
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!444
4 years ago
haroon amjad
babb48b1db
base app client changes
4 years ago
haroon amjad
cf7291e379
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
haroon amjad
03882c166c
Translation & UI updates
4 years ago
haroon amjad
90843252c3
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
# lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Fatimah Alshammari
9cf0794cf6
Fixed out of stuck items issues
4 years ago
Sultan Khan
18f35a22bb
FAMILY FILE
4 years ago
Sultan Khan
5a9ab457e5
family files
4 years ago
haroon amjad
6d3ead24e1
localisation update
4 years ago
Sultan Khan
a31f55aaa7
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
4 years ago
Sultan Khan
4780039cc7
family file change
4 years ago
Mirza.Shafique
05a6860081
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
e1b79ef5c1
E-Refreal design
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
2db050a228
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
e564cdc7e5
Updates & fixes
4 years ago
Sikander Saleem
0b4305de03
all dialog changes and improvements (cont).
4 years ago
haroon amjad
6511ca8dc7
UI fixes & updates
4 years ago
Sultan Khan
448a3aaa48
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
4 years ago
Sultan Khan
881644a22e
family files changes
4 years ago
Fatimah Alshammari
e2763a5bd5
fixed cart shopping issues
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
haroon amjad
43c67a5a84
Notifications UI fix
4 years ago
Sikander Saleem
a026fbf940
feedback status added.
4 years ago
haroon amjad
f60684ad08
Notifications UI redesigned
4 years ago
haroon amjad
8cf6642c79
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
803f5a786b
Blood pressure chart fix
4 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
4 years ago
haroon amjad
07a98d75c6
My tracker fixes
4 years ago
Sultan Khan
a39658206d
my family
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
haroon amjad
8ea6a5de04
localization fix
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
54c3beadf2
improvements.
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
Mirza.Shafique
dde16a13fe
General page in profile
4 years ago
Sikander Saleem
21863cfe06
improvements.
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
haroon amjad
4a2e01b8b1
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
b475adb5c3
Updates & fixes
4 years ago
Sultan Khan
5c8b809e39
family file fixes
4 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
4 years ago
Fatimah Alshammari
30a1353be6
fixed brands design and recommended products issues
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
Elham Rababh
2526d6bc6f
fix issue in cart page
4 years ago
haroon amjad
e62e3dae1b
CMC APIs coverting to RC
4 years ago
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
haroon amjad
f33272f8d9
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
ec646a7039
My Invoice fixes, Prescription page fixes
4 years ago
Mirza.Shafique
b3f3558eac
CMC 1.2
4 years ago
Mirza.Shafique
82a1d410db
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/landing/widgets/logged_slider_view.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan
2019e804f0
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
169aafa26b
hmc services design fixed
4 years ago
Mirza.Shafique
831780555c
CMC 1.0
4 years ago
haroon amjad
2669378da4
Insurance Approval API updated
4 years ago
haroon amjad
aadcfdc7bc
Insurance Approval fixes
4 years ago
haroon amjad
5396138962
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
...
# Conflicts:
# lib/pages/ToDoList/payment_method_select.dart
# lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad
3bb0a8b85b
Apple Pay finalized, Translation issues fixed, other updates
4 years ago
Sikander Saleem
aa047afef7
Merge branch 'new_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Mirza.Shafique
afb08fcd0a
Booking Filters Update
4 years ago
Mirza.Shafique
3af1676730
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/insurance/insurance_card_screen.dart
# lib/pages/medical/balance/advance_payment_page.dart
# lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Mirza.Shafique
a234618df8
Update, Insurance card and My Balance Design
4 years ago
Sikander Saleem
1db8c96ed7
title improvement for book appointment clinic search.
4 years ago
haroon amjad
ebcc2559ce
Ask doctor issue resolved, Translation & font family issues resolved
4 years ago
haroon amjad
25fb5decc0
Ask Doctor page fixes
4 years ago
haroon amjad
106489b085
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
d4a4165ef3
Minor fixes in Eye Measurements
4 years ago
Sultan Khan
671c432cd7
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
0086875d0d
Design Updated for tracker
4 years ago
Sikander Saleem
a09b43ef8c
monthly report ui redesigned.
4 years ago
Sikander Saleem
120e6c166d
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
c84707ba3f
monthly report request & sick leaves ui redesigned.
4 years ago
haroon amjad
9ffe064a3b
updates & fixes
4 years ago
Sikander Saleem
cd85ad4f8a
feedback ui redesigned.
4 years ago
haroon amjad
45272d251c
Updates & fixes
4 years ago
haroon amjad
8e7786cb96
updates & fixes
4 years ago
Fatimah Alshammari
62167baec5
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
4 years ago
Fatimah Alshammari
6d72be2a73
fixed cart order issues
4 years ago
Sikander Saleem
1b7b7b6334
live chat ui redesigned.
4 years ago
Sultan Khan
d2d22ff1fc
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
4 years ago
Sikander Saleem
d1b7c94d6e
improvement.
4 years ago
Sultan Khan
73ff5c4707
Bug fixes
4 years ago
Sikander Saleem
d9c1b8b8ea
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/main.dart
# lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
# lib/pages/medical/eye/EyeMeasurementsPage.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
4 years ago
haroon amjad
4469ae1209
updates & fixes
4 years ago
Sikander Saleem
ef5f737084
Merge branch 'development' into development_new_design_2.0
4 years ago
Mirza.Shafique
4f85652562
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
f577905dcb
eye measurment new design
4 years ago
haroon amjad
e679c7df0d
updates & fixes
4 years ago
haroon amjad
a10253736a
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/pages/login/confirm-login.dart
# lib/pages/login/login.dart
4 years ago
haroon amjad
44d59ed01a
updates & fixes
4 years ago
Sikander Saleem
e3758cfbba
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
ff5fbbdf7c
Service info app bar fixed.
4 years ago
Sikander Saleem
fab051f9e7
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
4 years ago
Sikander Saleem
6a86d8d1c1
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
62ca009404
improvement.
4 years ago
Sultan Khan
c6e7c8cd37
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
52665fe217
login issue fixed
4 years ago
Mohammad Aljammal
55f9bbcba4
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!379
4 years ago
Sikander Saleem
7df76842b2
Merge branch 'development_new_design_2.0' into new_design_sikander
4 years ago
Sikander Saleem
a61fea551c
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem
f3d7686a10
improvement.
4 years ago
Sultan Khan
ad7527ee65
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
233a273316
shcedule page
4 years ago
Mirza.Shafique
3f0d8626e7
Marge issue
4 years ago
Mirza.Shafique
590ea48ea9
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/MyAppointments/SchedulePage.dart
4 years ago
Mirza.Shafique
e1e3741abf
Event Reminder
4 years ago
haroon amjad
b83318faf8
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!382
4 years ago
haroon amjad
f8c295defe
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!381
4 years ago
haroon amjad
8cb9a5e619
updates
4 years ago
haroon amjad
faff3b90cb
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/core/service/er/am_service.dart
4 years ago
haroon amjad
e9ec2e2faf
Ambulance request APIs revamped
4 years ago
Zohaib Iqbal Kambrani
d9672c47a0
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
BUG FIXES
fix issues PAP-910,PAP-911
fix bugs pharmacy
Dental procedures implemented
Revert "Merge branch 'foote_in_all_pages' into 'development'"
fixed products issues
calendar events changes
Covid passport CR implemented in Covid test flow
doctor schedule
Covid certificate passport CR implemented
Covid Lab result generate certificate implemented
return bottom sheet inside appointments list
fix issues related to footer
remove unused code
remove footer from pharmacy pages
first step from add footer for all pages
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan
abcd207554
schedule page fix
4 years ago
haroon amjad
3abd7227ec
fixes
4 years ago
haroon amjad
9cf9e297cf
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
...
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
4 years ago
haroon amjad
4560037f97
updates
4 years ago
Fatimah Alshammari
f09cdd944d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
4 years ago
Fatimah Alshammari
827d8733a1
fixed shopping cart issue
4 years ago
Sikander Saleem
402cf5936a
improvement.
4 years ago
Sikander Saleem
1a0e1f47a6
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem
bf920d4188
find us redesigned.
4 years ago
Sultan Khan
1726f8cc11
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
d1fc4751ad
BUG FIXES
4 years ago
Mirza.Shafique
ebf293736d
Booking appointment Marge
4 years ago
Zohaib Iqbal Kambrani
d1c99d1d82
ER Average waiting time label applied
4 years ago
haroon amjad
4c2b70fcb5
Merge branch 'development' into Haroon
4 years ago
haroon amjad
21c3686e05
Ambulance request services revamping
4 years ago
Sikander Saleem
363cf78884
improvement.
4 years ago
Sikander Saleem
b78f8f76db
improvement.
4 years ago
Sikander Saleem
1c020134e8
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
bdb7f29d4c
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/login/login.dart
4 years ago
Mirza.Shafique
089ad0d321
Booking appointment 1.3
4 years ago
Elham Rababh
2e2f7334d5
fix issues PAP-910,PAP-911
4 years ago
Sikander Saleem
cfa3ca62b6
prescription tab bar improvement.
4 years ago
Sikander Saleem
3cc18cfb24
medical reports ui redesigned.
4 years ago
Sikander Saleem
9fdebc2db7
ask doctor ui redesigned
4 years ago
Fatimah Alshammari
b6981299d9
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
4 years ago
Fatimah Alshammari
239ad530ce
fixed isuues
4 years ago
Mohammad Aljammal
36142f0f6d
Merge branch 'fix_bug_pharmacy' into 'development'
...
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
4 years ago
Mohammad Aljammal
8abbb04f02
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!373
4 years ago
mosazaid
a2e60e7584
fix bugs pharmacy
4 years ago
haroon amjad
e9c26ee85f
Dental procedures implemented
4 years ago
Sikander Saleem
ca363adee2
merge & improvements
4 years ago
Sikander Saleem
6191377914
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
4 years ago
Mohammad Aljammal
8b3a0b3ada
Revert "Merge branch 'foote_in_all_pages' into 'development'"
...
This reverts merge request !369
4 years ago
Fatimah Alshammari
72ba0c7c74
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
4 years ago
Fatimah Alshammari
f3b545ff74
fixed products issues
4 years ago
Sikander Saleem
9e75a45cd5
improvement.
4 years ago
Sikander Saleem
8367fc09f3
Merge branch 'new_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
4 years ago
Sikander Saleem
d605084a91
appointment list and detail ui changed
4 years ago
Sultan Khan
b116079843
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
1a501a3b2a
calendar events changes
4 years ago
Mirza.Shafique
ad025f3d8e
Booking appointment 1.2
4 years ago
haroon amjad
0d1d68273b
Covid passport CR implemented in Covid test flow
4 years ago
Sultan Khan
4325bd3448
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
5fe6a6c3dd
doctor schedule
4 years ago
Mirza.Shafique
ba0c0beef6
Merge branch 'development_new_design_2.0' into mirza_home_page
4 years ago
Mirza.Shafique
d2b2b4063d
Booking appointment 1.1
4 years ago
haroon amjad
72dbdd2c2b
Merge branch 'development' into Haroon
4 years ago
haroon amjad
e96157c74a
Covid certificate passport CR implemented
4 years ago
Mohammad Aljammal
68491631f3
Merge branch 'foote_in_all_pages' into 'development'
...
Foote in all pages
See merge request Cloud_Solution/diplomatic-quarter!369
4 years ago
Zohaib Iqbal Kambrani
d33432d238
Covid Drive-Thru Questions Screen
4 years ago
haroon amjad
73097d15de
Covid Lab result generate certificate implemented
4 years ago
haroon amjad
d83a611d95
FCM Permission fix
4 years ago
Mirza.Shafique
bd1cf9bcc7
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
# lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mirza.Shafique
62631677ad
Booking appointment 1.0
4 years ago
Sikander Saleem
4152eafa17
Merge branch 'development_new_design_2.0' into new_design_sikander
4 years ago
Sikander Saleem
2ba91e54ab
merge-changes
4 years ago
Sikander Saleem
94ff5cff40
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
970887b0c5
changes
4 years ago
Elham Rababh
9777b3f2ab
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
4 years ago
Elham Rababh
ceeda154d5
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
...
Conflicts:
lib/pages/landing/landing_page.dart
4 years ago
haroon amjad
5f521556dc
Dental flow fixes
5 years ago
Sikander Saleem
acd3855c77
Merge branch 'development' into development_new_design_2.0
5 years ago
Sikander Saleem
71f888ea9b
improvements
5 years ago
Sikander Saleem
288d64214e
improvements
5 years ago
Sikander Saleem
bb18645d85
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
3235f489b9
Merge branch 'development' into Haroon
5 years ago
Sikander Saleem
51c398e84a
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
e9db30d3da
otp clear when wrong code entered.
5 years ago
haroon amjad
5009e48f64
Updates in Ambulance Request & Covid test
5 years ago
Sultan Khan
301728ed3d
family file fix
5 years ago
Mirza.Shafique
ca3495d71c
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
0a83cf8241
Bug Fixis
5 years ago
Sultan Khan
59892870e2
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9e31a3c560
bug fixes
5 years ago
Sikander Saleem
5ab9dd1761
Appointment screen Changes & improvements.
5 years ago
Mirza.Shafique
374a14eac4
Merge branch 'development_new_design_2.0' into mirza_home_page
5 years ago
Mirza.Shafique
2a4e0a604a
Medical Perscription 1.1
5 years ago
haroon amjad
3f29bbd6b3
Updates & fixes
5 years ago
Mohammad Aljammal
db128e5091
Merge branch 'blood_pressure' into 'development'
...
fix prescription add reminder
See merge request Cloud_Solution/diplomatic-quarter!363
5 years ago
Elham Rababh
1fefbfb76e
return bottom sheet inside appointments list
5 years ago
Sultan Khan
57d87dfc03
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
11ffed2ae3
bug fixes
5 years ago
Elham Rababh
13737548bb
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
5 years ago
haroon amjad
cbbca5ce86
Merge branch 'development' into Haroon
5 years ago
Sikander Saleem
458dc2474b
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
047941fffc
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
5647ab75e5
improvements.
5 years ago
Mirza.Shafique
b2bba050e8
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
5 years ago
Elham Rababh
ab2fc6aa2c
fix issues related to footer
5 years ago
hussam al-habibeh
428b45528b
fix prescription add reminder
5 years ago
Mirza.Shafique
8c8a9c7ce2
Medical Perscription 1.0
5 years ago
Sikander Saleem
350ff20a1a
my doctor screen.
5 years ago
Mohammad Aljammal
b98a84bcac
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!361
5 years ago
Mohammad Aljammal
41f1704790
Merge branch 'blood_pressure' into 'development'
...
Blood pressure
See merge request Cloud_Solution/diplomatic-quarter!362
5 years ago
Sikander Saleem
ec6693c55e
improvement.
5 years ago
haroon amjad
0121337d1b
LiveCare Flow from book appointment flow implemented
5 years ago
Mirza.Shafique
24b7a8a4c4
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Sikander Saleem
6c8f1c6185
merge improvement.
5 years ago
Mirza.Shafique
cbadcd5feb
Vital Sings Detail Page 1.0
5 years ago
Sikander Saleem
197e7d5742
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
5 years ago
Elham Rababh
f85c359cf4
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
...
Conflicts:
lib/pages/landing/landing_page.dart
5 years ago
Elham Rababh
d028ce22dc
remove unused code
5 years ago
hussam al-habibeh
fe83b91602
body fat texfield fix
5 years ago
Elham Rababh
69df61afb1
remove footer from pharmacy pages
5 years ago
Mirza.Shafique
e91cf4762a
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Mirza.Shafique
d865e97ce1
Vital Sings Home Page
5 years ago
Sikander Saleem
b3fd1cb93d
lab result detail flow chart screen & improvement.
5 years ago
hussam al-habibeh
864f849425
Baby age in ovulation period
5 years ago
Fatimah Alshammari
787b55a803
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
...
# Conflicts:
# lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari
34ccb132dc
fixed issues
5 years ago
Mohammad Aljammal
d9fabbab17
Fix feedback
5 years ago
Fatimah Alshammari
74d0826342
fixed issues
5 years ago
Sultan khan
04a68c5bd3
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!358
5 years ago
Sultan khan
b8d75b5604
Merge branch 'blood_pressure' into 'development'
...
add blood pressure translation issue
See merge request Cloud_Solution/diplomatic-quarter!356
5 years ago
Sultan khan
6a0acd8afb
Merge branch 'fix-bugs' into 'development'
...
Fix bugs
See merge request Cloud_Solution/diplomatic-quarter!355
5 years ago
Sultan Khan
5b656b0b51
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9610ff640e
feedback changes
5 years ago
haroon amjad
cbbef80bd5
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
eadba3f767
Working on livecare appointment booking page
5 years ago
hussam al-habibeh
b9d4195e20
Blood pressure translation issue
5 years ago
hussam al-habibeh
9c6f83600b
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
mosazaid
3077624c58
fix bugs
5 years ago
Sultan khan
3c2a89cd8e
Merge branch 'Aug_fixes' into 'development'
...
fix issues related to wight and sugar blood
See merge request Cloud_Solution/diplomatic-quarter!354
5 years ago
Sultan khan
cd56881d7a
Merge branch 'pharmacy-bugs' into 'development'
...
hide Covid19-driveThrow for patient out of KSA
See merge request Cloud_Solution/diplomatic-quarter!353
5 years ago
Sultan khan
8eb67791ca
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!349
5 years ago
Elham Rababh
8629b62fcb
fix issue
5 years ago
Elham Rababh
1568698b98
fix issues related to wight and sugar blood
5 years ago
Sikander Saleem
6ee56cba0d
Merge branch 'login_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/new_design/doctor_header.dart
5 years ago
Sikander Saleem
bb20d65b40
lab result detail screen.
5 years ago
Mirza.Shafique
66efbc1bac
Radiology Implementation
5 years ago
hussam al-habibeh
8f5fef87e9
add blood pressure translation issue
5 years ago
Mirza.Shafique
26c30038c9
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Mirza.Shafique
29fd552874
Weight, height and blood pressure on Home Page
5 years ago
Sikander Saleem
35b5d38b82
Merge branch 'login_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
3a1af590ff
lab result detail screen (cont.)
5 years ago
hussam al-habibeh
a33a6b0b2f
push request after conflict resolve
5 years ago
hussam al-habibeh
0a3c44b5e8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh
352cda4c70
hide Covid19-driveThrow for patient out of KSA
5 years ago
Elham Rababh
8626b4f269
first step from add footer for all pages
5 years ago
haroon amjad
5c8e9f4e19
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!352
5 years ago
haroon amjad
2242b78116
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
5 years ago
haroon amjad
e28fdaade1
Dental Invoices implementation completed
5 years ago
Zohaib Iqbal Kambrani
c215b22cf7
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
fixes
registration
5 years ago
Zohaib Iqbal Kambrani
f442cc251c
Pre Post Images Dental Doctor Profile
5 years ago
Mirza.Shafique
876463c945
Home Page Font weight
5 years ago
Sikander Saleem
d1b45c8bcc
Merge branch 'login_design_sikander' into development_new_design_2.0
5 years ago
Mirza.Shafique
85c759a4a5
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Sikander Saleem
5b778f0493
appointment ui (cont.) & improvement.
5 years ago
Sultan Khan
1586f02542
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
6b7eaaafb9
fixes
5 years ago
Mirza.Shafique
a699740897
Medical File Fonts Implementation
5 years ago
Mirza.Shafique
5f44dece71
Ganaric Font and font implementaion
5 years ago
Fatimah Alshammari
bbb8e04066
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
5 years ago
Sultan khan
ce867b85f2
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!347
5 years ago
haroon amjad
a32501f3dc
My invoices implementation continued
5 years ago
Sikander Saleem
ff55ae1908
improvements
5 years ago
Sikander Saleem
bb3d11ccf8
remove spaces.
5 years ago
Sikander Saleem
56c0adaada
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Sikander Saleem
bb9d1bfcd5
improvements
5 years ago
hussam al-habibeh
4b90f16ab9
baby age in ovulation period
5 years ago
Fatimah Alshammari
e86dfd1a34
Merge branch 'development' into fatima-new
5 years ago
Fatimah Alshammari
86d67247be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Fatimah Alshammari
0d3f6237ce
fixed issues
5 years ago
Sikander Saleem
80c50e29bf
Merge branch 'login_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
5 years ago
Sikander Saleem
4db432b351
lab results working(cont.) & improvements
5 years ago
Sultan Khan
b1453b52e3
registration
5 years ago
Mirza.Shafique
38465eaafb
Home page icons and drawer
5 years ago
Zohaib Iqbal Kambrani
429fcb1e60
Merge branch 'development' into ZohaibIqbalKambrani
...
* development: (32 commits)
changes
package name changed
Jira Fixes
Jira fixes
PAP-664
PAP-664
PAP-664
langauge issue
bug fix
PAP-777
PAP-729
fix button
fix translate issues
CONFIG
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
bug fixes
fix bugs
fixing dashboard issue
fixing dashboard issue
jira bugs
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
5 years ago
hussam al-habibeh
d3868844de
Medication availability
5 years ago
Mirza.Shafique
1bea9d39b5
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
06f877b8d4
Home page new design & drawer
5 years ago
Sultan Khan
57864f949d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Sultan Khan
bd85854fa4
changes
5 years ago
Zohaib Iqbal Kambrani
10a147860c
no message
5 years ago
Zohaib Iqbal Kambrani
bf303a7be0
RRT Implementation
5 years ago
Sultan Khan
97d7f9225e
package name changed
5 years ago
haroon amjad
709877b5f1
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/pages/login/forgot-password.dart
# lib/pages/medical/radiology/radiology_details_page.dart
5 years ago
haroon amjad
90db04cee1
Jira Fixes
5 years ago
Fatimah Alshammari
b8ba80b361
Merge branch 'fatima-new' into development
5 years ago
Fatimah Alshammari
39ba2cfde7
fixed issues.
5 years ago
Sikander Saleem
2d64426cd4
Merge branch 'login_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
70614d3555
merge improvements-1.
5 years ago
haroon amjad
5007064105
Jira fixes
5 years ago
Mirza.Shafique
99c6318410
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
2d62822536
Medical Profile Page improvements
5 years ago
Sikander Saleem
f482595d6b
merge improvements.
5 years ago
Sikander Saleem
083d696c62
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique
4ebf5f900b
improvements.
5 years ago
Mirza.Shafique
32e867421f
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/date_uitl.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique
e9e3b079b3
Medical Profile Complete 1.1
5 years ago
hussam al-habibeh
02df6f4d85
PAP-664
5 years ago
hussam al-habibeh
60aaf2a31a
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
hussam al-habibeh
352fd912de
PAP-664
5 years ago
hussam al-habibeh
29249dc9a9
PAP-664
5 years ago
Sultan Khan
e5fb16ad69
langauge issue
5 years ago
Mirza.Shafique
bbaeec5b85
Medical Profile Complete
5 years ago
Sikander Saleem
f6ae7ed770
merge changes-4
5 years ago
Sikander Saleem
889ae24f07
merge changes-3
5 years ago
Sikander Saleem
c07a8f54c7
merge changes-2
5 years ago
Sikander Saleem
14561d0ac6
merge changes-1
5 years ago
Sultan Khan
c9fe036b99
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
7c398ba40d
bug fix
5 years ago
Sikander Saleem
a5d40f090a
improvements-test
5 years ago
hussam al-habibeh
146fc5d2b2
PAP-777
5 years ago
Mirza.Shafique
2665e4cd0c
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Mirza.Shafique
a20185b2b9
Home page 1.4 (Homepage changes)
5 years ago
Sikander Saleem
2cb59a286f
Merge branch 'login_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
473315f8a1
improvements
5 years ago
hussam al-habibeh
6ea06ce442
PAP-729
5 years ago
Mirza.Shafique
3c438406b5
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
53e4815866
no auth ui modifications
5 years ago
Mirza.Shafique
49bfa2e9a7
Home page 1.3
5 years ago
Elham Rababh
8b8e239d3f
fix button
5 years ago
Zohaib Iqbal Kambrani
e4256d6874
RRT in progress (Service implementations)
5 years ago
Elham Rababh
b01961e45f
fix translate issues
5 years ago
Sultan Khan
d88e3faa6b
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
d6fd03b571
CONFIG
5 years ago
Sultan khan
772dcba287
Merge branch 'Aug_fixes' into 'development'
...
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
See merge request Cloud_Solution/diplomatic-quarter!338
5 years ago
Sultan khan
ba32a37a17
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!339
5 years ago
Zohaib Iqbal Kambrani
4da163d186
RRT in progress in stage
5 years ago
Sultan Khan
6534ca8349
Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
54e1d51f18
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!337
5 years ago
Zohaib Iqbal Kambrani
5f1d753895
no message
5 years ago
Sikander Saleem
907d90b987
login ui and forgot password ui added.
5 years ago
Sultan Khan
ed20ba65b3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Elham Rababh
7ad4e03c1a
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
5 years ago
Sultan Khan
23ca95b9b6
bug fixes
5 years ago
Mohammad Aljammal
9b3a679948
Merge branch 'fix-bugs' into 'development'
...
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!336
5 years ago
Mohammad Aljammal
b34402ffa8
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!335
5 years ago
Mohammad Aljammal
ed5079e3a0
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!334
5 years ago
mosazaid
e9dbc4be7a
fix bugs
5 years ago
Haroon Amjad
47e521fe1d
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
hussam al-habibeh
50d3a42743
fixing dashboard issue
5 years ago
hussam al-habibeh
1ed76e91aa
fixing dashboard issue
5 years ago
Sultan Khan
6442ce178d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
a67e320a8e
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
Sultan Khan
8766a69928
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
hussam al-habibeh
d5c76b5400
jira bugs
5 years ago
hussam al-habibeh
6dc0d89f61
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
lib/uitl/utils.dart
5 years ago
hussam al-habibeh
981e78936e
jira bugs
5 years ago
Zohaib Iqbal Kambrani
08e0ce52c8
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
fix bugs
5 years ago
Zohaib Iqbal Kambrani
4abdd9bde7
no message
5 years ago
Mohammad Aljammal
4ac6bf628b
Merge branch 'fix-bugs' into 'development'
...
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!331
5 years ago
Zohaib Iqbal Kambrani
882d5f090a
Merge branch 'zik-analytics' into ZohaibIqbalKambrani
...
* zik-analytics:
no message
5 years ago
mosazaid
2e33c2b240
fix bugs
5 years ago
Mirza.Shafique
b0dfbef52a
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Mirza.Shafique
d37f225c1b
Home page 1.2
5 years ago
Sikander Saleem
3707b13986
login type ui & icons added.
5 years ago
Sultan Khan
446f86dbcf
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Elham Rababh
5d05b09345
PAP-712 : fixes on Blood sugar
5 years ago
Sultan Khan
c88bea4461
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9acb5b087d
bug fixes
5 years ago
Mirza.Shafique
090556f4d1
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
5dc88f51c3
Home Page 1.0
5 years ago
Sikander Saleem
8b2feb03ea
last login and login options ui.
5 years ago
Elham Rababh
86414b46fd
PAP-304 : show CBC details
5 years ago
Elham Rababh
52816a9cfe
PAP-723 : system should display the empty graph in the blood pressure screen.
5 years ago
Elham Rababh
f824063e82
PAP-726 : fix show Arabic values for the select Arm
5 years ago
Elham Rababh
f92567f877
PAP-718 : fix show data after save
5 years ago
Elham Rababh
f830bfdb19
PAP-722 : fix send email
5 years ago
Sultan khan
9196367da4
Merge branch 'bug_fix_mirza' into 'development'
...
Medical Profile Buttons Lock
See merge request Cloud_Solution/diplomatic-quarter!329
5 years ago
Sultan khan
f54b9a63aa
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!328
5 years ago
Mirza.Shafique
2fda47baf6
Medical Profile Buttons Lock
5 years ago
Zohaib Iqbal Kambrani
dbf525c484
no message
5 years ago
Haroon Amjad
213d104d57
Covid test procedure selection implemented
5 years ago
Sultan khan
487d63ec7f
Merge branch 'bug_fix_mirza' into 'development'
...
Check-In NFC
See merge request Cloud_Solution/diplomatic-quarter!326
5 years ago
Sikander Saleem
eb9005510d
bug fixes and insurance approvals improvements.
5 years ago
Sultan Khan
3c2539d5b9
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
14ef096c32
changes and fixes
5 years ago
Mirza.Shafique
b31813770e
Check-In NFC done
5 years ago
Haroon Amjad
fde658fd5d
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
5 years ago
Mirza.Shafique
fb0a67e5bd
PAP 828 and 792 issue fix
5 years ago
Mirza.Shafique
e934e7cd2c
Merge Fix
5 years ago
haroon amjad
7cf66934bc
Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
4504b4bf75
config
5 years ago
haroon amjad
f310f9d0ab
config
5 years ago
haroon amjad
0d2a91c124
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
hussam al-habibeh
8d8fbc3edc
jira bugs
5 years ago
Sultan khan
15f620d720
Merge branch 'Jul_fixes' into 'development'
...
Jul fixes
See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
hussam al-habibeh
fefde8f575
jira bugs
5 years ago
haroon amjad
7b6270c67f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
bcb4f48785
build fix
5 years ago
Sultan khan
f048f5229b
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!321
5 years ago
Sultan khan
924f9bedc0
Merge branch 'bug_fixing' into 'development'
...
Bug fixing
See merge request Cloud_Solution/diplomatic-quarter!319
5 years ago
Sultan khan
10f8ee5e81
Merge branch 'bug_fix_mirza' into 'development'
...
Bug Fix: 873, 878 to 881
See merge request Cloud_Solution/diplomatic-quarter!320
5 years ago
Sultan Khan
33465b04e5
permission
5 years ago
Mirza.Shafique
58d5734f1a
Bug Fix: 873, 878 to 881
5 years ago
Sultan Khan
d5d48703f9
camera permission fixed
5 years ago
Sultan Khan
85e803651c
permission issue fixed
5 years ago
Sikander Saleem
38f134b6ff
Bug PAP-884 fixed, email was not updating.
5 years ago
Sultan Khan
b4a7235fc8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
hussam al-habibeh
446021eb90
adding doctor list to health calculator
5 years ago
hussam al-habibeh
854352d9ce
jira bugs
5 years ago
Sikander Saleem
d0c8c4f017
Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen.
5 years ago
Sikander Saleem
b2e9060c3f
Bug PAP-877 fixed, blood tracker exception.
5 years ago
Elham Rababh
2e1c9780d7
PAP-610: prevent show send email button if user have no vaccine
5 years ago
Elham Rababh
c6a68083a4
PAP-667: fix blood type
5 years ago
Elham Rababh
c14adccb49
PAP-667: add unit to home page
5 years ago
Elham Rababh
dd1dff01d6
PAP-790: fix Alignment of mobile number
5 years ago
Elham Rababh
4217fc0826
PAP-685: fix issue
5 years ago
Sikander Saleem
3128810fb0
improvements.
5 years ago
Sikander Saleem
b7fbee3252
improvements
5 years ago
Sikander Saleem
d6566d4abf
PAP-678 fixed, month & days in axis are aligned now.
5 years ago
Sikander Saleem
1f01f40ad8
PAP-681 fixed, H2O Unit changing & reflection.
5 years ago
Sikander Saleem
e41040b1b9
PAP-675 fixed, H2O Week chart vales from -1 to 1.
5 years ago
Sikander Saleem
7771b8f320
PAP-886 fixed, Insurance image button added.
5 years ago
Sikander Saleem
db84090694
PAP-872 & PAP-593 fixed, Water addition was not visible.
5 years ago
Sultan Khan
da2df9b348
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
bcabd81f88
BUG FIXES
5 years ago
Haroon Amjad
e13a13189c
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
865afd7761
fix bugs
5 years ago
Mohammad Aljammal
234e69c02d
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!315
5 years ago
hussam al-habibeh
bb6e7e931b
pharmacy-bugs
5 years ago
Mohammad Aljammal
b37dd57804
Merge branch 'pharmacy-Fatima' into 'development'
...
fixed prescription issue
See merge request Cloud_Solution/diplomatic-quarter!313
5 years ago
Mohammad Aljammal
25d5105caf
Merge branch 'Apr-fixes' into 'development'
...
PAP-607: fix issue
See merge request Cloud_Solution/diplomatic-quarter!312
5 years ago
Fatimah Alshammari
b98d8b3a46
fixed prescription issue
5 years ago
Elham Rababah
2a47564c37
PAP-607: fix issue
5 years ago
Mohammad Aljammal
268f0c8fa4
Merge branch 'fix-bugs' into 'development'
...
fix-design
See merge request Cloud_Solution/diplomatic-quarter!311
5 years ago
Mohammad Aljammal
bd451f1283
Merge branch 'Apr-fixes' into 'development'
...
Apr fixes
See merge request Cloud_Solution/diplomatic-quarter!310
5 years ago
mosazaid
116a4af845
fix-design
5 years ago
Elham Rababah
36d422c7aa
PAP-563: fix pickup location from hospital
5 years ago
Elham Rababah
aa1c92c142
PAP-562: fix status
5 years ago
hussam al-habibeh
14939d3513
jira bugs (Health Calculator)
5 years ago
Elham Rababah
8c5b3742b6
PAP-643: fix button
5 years ago
Elham Rababah
aab33b3e03
PAP-609: fix text align
5 years ago
Fatimah Alshammari
174e0d9673
Merge branch 'development' into pharmacy-Fatima
5 years ago
Fatimah Alshammari
2481e4c9ea
fixed categories issues and home page button
5 years ago
Elham Rababah
1f70d086e0
PAP-634: Add search button.
5 years ago
Elham Rababah
9588b134fb
PAP-645: resized calculator
5 years ago
Mohammad Aljammal
f4f4a0977e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!307
5 years ago
Fatimah Alshammari
ef53338971
Merge branch 'development' into pharmacy-Fatima
5 years ago
Fatimah Alshammari
faa8a13778
fixed isuue-product details
5 years ago
Sultan Khan
9adc4a974c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
8c9c309abb
bug fixes
5 years ago
Mohammad Aljammal
1607aecb4a
Merge branch 'pharmacy-Fatima' into 'development'
...
fixed an issue in recommended page
See merge request Cloud_Solution/diplomatic-quarter!304
5 years ago
Sultan Khan
3a8b889b74
bug fixes
5 years ago
Sultan Khan
724e0098fb
bug fixes
5 years ago
Sultan Khan
1cd4d93488
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
cd7845b1a4
bug fix
5 years ago
Fatimah Alshammari
265d13b970
fixed an issue in recommended page
5 years ago
Zohaib Iqbal Kambrani
c7c96f913f
no message
5 years ago
haroon amjad
6b675acc94
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
5 years ago
haroon amjad
353a5157f2
fixes
5 years ago
Mohammad Aljammal
e04421079e
Merge branch 'fix_bugs_Mar' into 'development'
...
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!301
5 years ago
Sultan Khan
0245875358
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
3d6858d0ec
bug fixes
5 years ago
Elham Rababah
96117fd191
PAP-625: add option “not classified”.
5 years ago
Elham Rababah
6e7f62ca21
PAP-612: show ok and cancel options
5 years ago
Mohammad Aljammal
6fa79ef8d0
Merge branch 'pharmacy-bugs' into 'development'
...
jira bug PAP-530
See merge request Cloud_Solution/diplomatic-quarter!300
5 years ago
Elham Rababah
66a9239698
PAP-558: Remove the choose Drop-off
5 years ago
Elham Rababah
1b393d6601
PAP-559: remove the km
5 years ago
Elham Rababah
5dd2e9986e
PAP-559: fix hospital_service
5 years ago
hussam al-habibeh
1ce10f4d78
jira bug PAP-530
5 years ago
Mohammad Aljammal
0a4f17dc88
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!298
5 years ago
Mohammad Aljammal
dcc98a35ac
Merge branch 'fix_advance_payment' into 'development'
...
fix advance payment
See merge request Cloud_Solution/diplomatic-quarter!299
5 years ago
Mohammad Aljammal
9a850d0ca3
fix advance payment
5 years ago
haroon amjad
a6a9a92c6f
JIRA bug fixes
5 years ago
Fatimah Alshammari
bb622f248c
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy_categorise.dart
5 years ago
Fatimah Alshammari
235fdfba54
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Fatimah Alshammari
71a393df68
fixed categories issue
5 years ago
haroon amjad
f754e48034
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad
49c454b132
fixes
5 years ago
Mohammad Aljammal
008a39f043
Merge branch 'fix_bugs_Mar' into 'development'
...
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!297
5 years ago
Sultan Khan
8e255f1f22
bug fix
5 years ago
Elham Rababah
86dda2b6d6
PAP-560: fix design
5 years ago
Elham Rababah
a1ecfbf16a
PAP-560: fix design
5 years ago
Elham Rababah
efb6ea68b8
PAP-561: fix design
5 years ago
Sultan Khan
d4c3b03a5f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
1b770420be
bug fixes
5 years ago
Elham Rababah
2e035e2c6b
PAP-576: fix design
5 years ago
Elham Rababah
fa23c607bd
Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar
5 years ago
mosazaid
b623bd0dce
Merge branch 'development' into fix_bugs
5 years ago
mosazaid
e5474b3062
fix perscription pages bugs
5 years ago
Fatimah Alshammari
39daaa16a7
added buttens in categories page
5 years ago
Mohammad Aljammal
126fad61c0
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
...
Conflicts:
lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal
53e4dfa99d
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal
7c1fd8043b
fix chart and eye and balance
5 years ago
Elham Rababah
7bdf31000f
PAP-356: fix chart design
5 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
5 years ago
hussam al-habibeh
a6ec7326b2
jira bugs
5 years ago
hussam al-habibeh
f9b8191a5e
jira bugs
5 years ago
Zohaib Iqbal Kambrani
6f2c947687
Packages And offers..
5 years ago
haroon amjad
9c1fdf96f4
Merge branch 'development' into Haroon
5 years ago
haroon amjad
33e1bf8103
Jira fixes
5 years ago
Mohammad Aljammal
a613fe08e4
Merge branch 'fix_theme_issues' into 'development'
...
fix the line chart issues
See merge request Cloud_Solution/diplomatic-quarter!289
5 years ago
haroon amjad
accc39d972
jira bug fixes
5 years ago
Mohammad Aljammal
ced7761a32
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues
5 years ago
Mohammad Aljammal
b36e00d2a5
fix the line chart issues
5 years ago
Sultan Khan
60b1688bb4
chatbot
5 years ago
Sultan Khan
9bfd725e4f
bug fixes
5 years ago
Sultan Khan
ca2a48e860
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
0445011e53
bug fixes
5 years ago
Mohammad Aljammal
ad88f6de04
fix theme issues
5 years ago
haroon amjad
8d16d0a69d
Merge branch 'development' into Haroon
5 years ago
haroon amjad
12c4250654
home page ereferral fix
5 years ago
Sultan Khan
35c940a209
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
80d96ba785
Privilege issue fixed
5 years ago
haroon amjad
573f5110f5
Merge branch 'development' into Haroon
5 years ago
haroon amjad
454957ebba
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
5 years ago
Sultan Khan
616212828d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
66acce3b40
ancillary order pages added
5 years ago
haroon amjad
db0fcd51cc
pharmacy updates
5 years ago
haroon amjad
74671d2f25
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/order-preview-service.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
5 years ago
haroon amjad
e0ebb922ed
pharmacy fixes
5 years ago
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
5 years ago
mosazaid
ed1626f8ee
Merge branch 'development' into fix_order_checkout_payment
5 years ago
mosazaid
74dd274502
working on pharmacy some fixes on cart page and request body
5 years ago
haroon amjad
ed3dba3eb3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
b9a12341d5
updates & fixes
5 years ago
Mohammad Aljammal
4dcb70d7eb
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!282
5 years ago
hussam al-habibeh
a534b1415e
products filtering fix
5 years ago
Mohammad Aljammal
861dba9a94
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
ec401d4848
Done Ed online
5 years ago
Mohammad Aljammal
cacb6722b9
Merge branch 'pharmacy-bugs' into 'development'
...
daynimic listing
See merge request Cloud_Solution/diplomatic-quarter!279
5 years ago
hussam al-habibeh
b39e88d9c8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
5 years ago
Sultan Khan
a6196d3c30
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b891c1bd80
theme issue
5 years ago
hussam al-habibeh
2723422bbf
daynimic listing
5 years ago
haroon amjad
798840ee2f
Merge branch 'development' into Haroon
5 years ago
Mohammad Aljammal
123b1de1a4
Merge branch 'pharmacy-bugs' into 'development'
...
hussam
See merge request Cloud_Solution/diplomatic-quarter!278
5 years ago
Mohammad Aljammal
50a45528d1
Merge branch 'pharmacy-bug-fixes' into 'development'
...
bug-fixes
See merge request Cloud_Solution/diplomatic-quarter!276
5 years ago
hussam al-habibeh
299a1bed25
hussam
5 years ago
hussam al-habibeh
790fbbcf6c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/pharmacy_categorise.dart
5 years ago
hussam al-habibeh
3af37a6a5c
hussam
5 years ago
Fatimah Alshammari
8624d695dc
fixed order details
5 years ago
Fatimah Alshammari
747763c4be
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
5 years ago
haroon amjad
44b041d499
Merge branch 'development' into Haroon
5 years ago
haroon amjad
5fb92c7816
covid drive-thru
5 years ago
mosazaid
44287db553
bug-fixes
5 years ago
Mohammad Aljammal
576181a72e
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!251
5 years ago
Sultan Khan
6f68cf5a15
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Fatimah Alshammari
a46dddea9a
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/model/pharmacies/order_model.dart
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/profile/profile.dart
5 years ago
mosazaid
dfeb70c892
Merge branch 'development' into pharmacy-payment-feature
...
# Conflicts:
# lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
mosazaid
0b2002d4dd
finish payment order
5 years ago
Sultan Khan
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
e61c26b853
Auto SMS, Themes, Voice Command
5 years ago
Fatimah Alshammari
c629fcb85c
fixed recommended products new design
5 years ago
haroon amjad
da3ad90ddd
added app-wide route transition animation
5 years ago
Fatimah Alshammari
e5829d8513
fix recommended for you
5 years ago
haroon amjad
d8e11f7187
Merge branch 'development' into Haroon
5 years ago
haroon amjad
deb0b40cfe
fixes
5 years ago
mosazaid
c64769e422
Merge branch 'development' into pharmacy-payment-feature
5 years ago
mosazaid
f3cdd08857
adding fharmacy payment feature
5 years ago
enadhilal
0cb493d56c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
5 years ago
enadhilal
0c6fb67718
fixed issues
5 years ago
Fatimah Alshammari
42bf76f712
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
5 years ago
Zohaib Iqbal Kambrani
15ec3ec9b9
Translation Track Driver, enhancement, initial camera
5 years ago
Zohaib Iqbal Kambrani
63663f1b24
Track Delivery Driver Completed
5 years ago
Fatimah Alshammari
ac32ba998c
fixed order isuee
5 years ago
Zohaib Iqbal Kambrani
516df96e21
no message
5 years ago
hussam al-habibeh
e050f87a64
pharmacy bugs
5 years ago
hussam al-habibeh
8c58dced7d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/core/service/pharmacy_categorise_service.dart
lib/pages/final_products_page.dart
5 years ago
hussam al-habibeh
1b76d9c192
pharmacy bugs fixed
5 years ago
mosazaid
125dd27a00
Merge branch 'development' into fix-pharmacy
5 years ago
mosazaid
5d0a122689
fix bugs
5 years ago
Mohammad Aljammal
e6da54c201
Merge branch 'development' 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
5 years ago
Mohammad Aljammal
20ad10b9dc
Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
8899bdf460
Done Prescription Delivery Address
5 years ago
mosazaid
d02b74142a
Merge branch 'development' into fix-pharmacy
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
5 years ago
mosazaid
1a45f99606
some fixes on pharmacy
5 years ago
haroon amjad
5e8e3806d6
Covid Drive-Thru implemented
5 years ago
Sultan Khan
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b3e6c4efda
voice command changes
5 years ago
haroon amjad
ba10014b46
Merge branch 'development' into Haroon
5 years ago
enadhilal
60648d368f
Merge branch 'development' into enad_pharmacy2
5 years ago
enadhilal
830e871e2c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
5 years ago
Mohammad Aljammal
0632af3fb5
Fix the Authentication Pharmacy
5 years ago
Mohammad Aljammal
0098345d05
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
5 years ago
haroon amjad
83cca264f1
Merge branch 'LamaHerbish' into Haroon
5 years ago
HMG\Lama.Herbish
031be1ac56
fixes
5 years ago
haroon amjad
0dc35f1270
Merge branch 'development' into Haroon
5 years ago
mosazaid
b70c7d7d05
fix pharmacy auth
5 years ago
enadhilal
292e983614
fixing issues
5 years ago
haroon amjad
f72c860516
Merge branch 'development' into Haroon
5 years ago
haroon amjad
60ea0465fd
fixes & updates
5 years ago
Mohammad Aljammal
87ad027d33
Merge branch 'improve_hhc' into 'development'
...
Improve hhc
See merge request Cloud_Solution/diplomatic-quarter!264
5 years ago
haroon amjad
13f6015cf0
Merge branch 'development' into Haroon
5 years ago
haroon amjad
69649ff7f8
added verified icon in homepage when patient is logged in
5 years ago
Mohammad Aljammal
29f4e6acb6
Merge branch 'hmg-services-fixing' into 'development'
...
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
5 years ago
haroon amjad
9ecf745747
fixes
5 years ago
haroon amjad
b6c617888b
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Fatimah Alshammari
ef8312f2b8
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/pharmacies/product_detail.dart
5 years ago
Fatimah Alshammari
ce64da11e4
homepage and product details design
5 years ago
mosazaid
cbe422cbc6
Merge branch 'hmg-services-fixing' into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
0444b21101
Merge branch 'development' into hmg-services-fixing
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
94ee969406
hhc msg translation
5 years ago
Elham Rababah
8a1924cca2
fix images in hhc
5 years ago
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9fca52efca
voice command
5 years ago
Sultan Khan
eeb073fb17
voice command
5 years ago
Mohammad Aljammal
e964afd4f2
Merge branch 'fix_security_issue' into 'development'
...
fix security issues in pharmacy
See merge request Cloud_Solution/diplomatic-quarter!261
5 years ago
Mohammad Aljammal
d477481856
fix security issues in pharmacy
5 years ago
Mohammad Aljammal
63657cb7c4
Merge branch 'h2o_improvement' into 'development'
...
H2O feature, setting page added
See merge request Cloud_Solution/diplomatic-quarter!260
5 years ago
Sikander Saleem
e40ad85d61
H2O feature, setting page added
5 years ago
Mohammad Aljammal
1d724a8db6
Merge branch 'h2o_improvement' into 'development'
...
H2o improvement
See merge request Cloud_Solution/diplomatic-quarter!259
5 years ago
Sikander Saleem
bd062150c1
H2O feature improvement
5 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
5 years ago
haroon amjad
0b83089b86
Merge branch 'development' into Haroon
5 years ago
haroon amjad
3832cee1ad
Translation fixes
5 years ago
Sikander Saleem
3b4e791017
H2O feature improvement
5 years ago
Mohammad Aljammal
bb42647c91
Merge branch 'development' into 'fix_pharmacy'
...
# Conflicts:
# lib/pages/login/login.dart
5 years ago
Mohammad Aljammal
ab53ca82b1
fix colors issues
5 years ago
mosazaid
822defbd04
working on bmi calculator design and functionality
5 years ago
haroon amjad
3bad0a3804
Merge branch 'development' into Haroon
5 years ago
haroon amjad
146019432a
LiveCare schedule implemented
5 years ago
Sikander Saleem
8f37fbf260
Qr icon added, notify me api added & improvements
5 years ago
Sultan Khan
3ac69692be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
0213264b7f
bug fixes
5 years ago
Mohammad Aljammal
3e441c55b2
fix bottom nav bar
5 years ago
Mohammad Aljammal
9d8c1ddf63
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
484cca086e
fix my my Trackers
5 years ago
haroon amjad
ab158e14e9
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
5 years ago
hussam al-habibeh
b767748315
health-converter fix
5 years ago
hussam al-habibeh
97919c217f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh
1ce0ef7b6c
health-converter fix
5 years ago
haroon amjad
dde10cd27b
working in LiveCare Scheduling
5 years ago
Mohammad Aljammal
db2376f50c
fix blood and weight on my trackers
5 years ago
Sultan Khan
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
haroon amjad
6945230965
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
5 years ago
mosazaid
38d52b52c8
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
5 years ago
Sultan Khan
68f7a9ff9c
login chnages
5 years ago
mosazaid
174534d8a5
fix Blood donation functionality and design
5 years ago
Mohammad Aljammal
405f67be1e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
5 years ago
Fatimah Alshammari
7a516cae51
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
Mohammad Aljammal
f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
0b1014a91c
fix blood sugar service on my tracker
5 years ago
Fatimah Alshammari
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
5 years ago
Zohaib Iqbal Kambrani
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Sultan Khan
c65983bfdb
code merged
5 years ago
Sultan Khan
86cf9300e1
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter : (136 commits)
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
some design enhancments
fix design
fix android
fix merge issues
fix merge issues
commit
fix merge issues
change color
return privilege
return privilege
fix issues
...
5 years ago
Zohaib Iqbal Kambrani
bbd953ae43
Order Delivery Driver tracking [inprogress]
5 years ago
mosazaid
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
f5d478fd27
re-design child vaccine and fix some funcrionalities
5 years ago
Mohammad Aljammal
4457b5f109
add translation to ER service
5 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
5 years ago
Elham Rababah
4ecce79258
first step from fix CMC
5 years ago
Elham Rababah
c9edb37a3c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
5 years ago
Mohammad Aljammal
1cb5e250ed
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!241
5 years ago
Mohammad Aljammal
b63025a9b3
return CMC HHC
5 years ago
mosazaid
5bcc67b77d
Nearest Er fix design
5 years ago
mosazaid
01bfe84644
solving NearestEr design problem
5 years ago
mosazaid
e71a56ed51
Merge branch 'development' into fix_design
5 years ago
mosazaid
d2e1a323ce
simple fix
5 years ago
Zohaib Iqbal Kambrani
e2bce87e34
resolve merge conflicts.
5 years ago
Mohammad Aljammal
30ddea6419
hot fixing
5 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
5 years ago
Mohammad Aljammal
ed729689a9
Merge branch 'design_issues' into 'development'
...
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
5 years ago
Mohammad Aljammal
634c874eee
fix design issues
5 years ago
Fatimah Alshammari
a1b2709ac8
fixed orders
5 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
5 years ago
Fatimah Alshammari
52fa0f6f89
fixed orders
5 years ago
mosazaid
2843b1393e
some design enhancments
5 years ago
Mohammad Aljammal
72290f041f
fix design
5 years ago
Mohammad Aljammal
de1b7cc1d0
fix merge issues
5 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
5 years ago
Mohammad Aljammal
c82f01cd1a
fix merge issues
5 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
5 years ago
mosazaid
d77a607b78
commit
5 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
5 years ago
Mohammad Aljammal
6827efc1b6
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge
5 years ago
Mohammad Aljammal
d7fe93b3f3
Merge branch 'pharmacy-hussam' into 'pharmacy'
...
parent_categorise_page update
See merge request Cloud_Solution/diplomatic-quarter!226
5 years ago
Mohammad Aljammal
298b4d6525
change color
5 years ago
Mohammad Aljammal
1968eb4682
return privilege
5 years ago
Mohammad Aljammal
952e106531
return privilege
5 years ago
Mohammad Aljammal
f77d2b497e
fix issues
5 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
5 years ago
enadhilal
10734d5994
connecting pages.
...
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago