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
|
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 |
haroon amjad
|
3dc82a0547
|
Pharmacy updates
|
4 years ago |
haroon amjad
|
eed4fd2509
|
Pharmacy prescriptions page design
|
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
|
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 |
Zohaib Iqbal Kambrani
|
aad071ac67
|
Packages and Offers apply token
|
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 |
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 |
Mirza.Shafique
|
a766c2522e
|
Child Vaccine 1.0
|
4 years ago |
Mirza.Shafique
|
3d480bac5c
|
design fixes 3
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
Mirza.Shafique
|
0ba4e9047b
|
design fixes 1.0
|
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
|
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 |
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
|
f60684ad08
|
Notifications UI redesigned
|
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
|
58c78656bf
|
Rating dialog updates
|
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 |
Mirza.Shafique
|
d664a216c6
|
Profile Page and Back Button Click
|
4 years ago |
Elham Rababh
|
75fdadafbd
|
refactor widget in the cart preview
|
4 years ago |
Mirza.Shafique
|
6261f01ab6
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
9c7e8e3637
|
Back Button on Landing Page 1
|
4 years ago |
haroon amjad
|
022b1bd000
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
cb220031dd
|
Updates & fixes
|
4 years ago |
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
4 years ago |
mosazaid
|
9a1dc3c678
|
pharmacy cart and wishlist fixes
|
4 years ago |
haroon amjad
|
2c4ff16f0c
|
updates & fixes
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 years ago |
mosazaid
|
a41980b252
|
fix bugs pharmacy wishlist
|
4 years ago |
Mirza.Shafique
|
06c5ee269b
|
Bug Fixes
|
4 years ago |
mosazaid
|
0d2d4c64c2
|
fix bugs pharmacy home and increase performance
|
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
|
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 |
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 |
mosazaid
|
185d66e342
|
fix bugs pharmacy home
|
4 years ago |
Haroon Amjad
|
062ca5c11c
|
EReferral fixes
|
4 years ago |
Mohammad Aljammal
|
43e7bb9ff3
|
fix bottom navigation bar
|
4 years ago |
Elham Rababh
|
c7a0d39aab
|
first step of ProductDetailPage refactor
|
4 years ago |
haroon amjad
|
0955a22616
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sikander Saleem
|
74432b6bbb
|
cmc order log ui changes
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
4 years ago |
haroon amjad
|
b0f4cfcff3
|
Family file fixes
|
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 |
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
|
c58023efc3
|
family file fixes
|
4 years ago |
Mirza.Shafique
|
5b47aaac6f
|
icon and find us distance
|
4 years ago |
haroon amjad
|
4ac0845003
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
8a4cf9f23b
|
Line Chart Fix in Vital Signs
|
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 |
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
|
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 |
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 |
haroon amjad
|
c050633671
|
SignalR Updates
|
4 years ago |
haroon amjad
|
0a90791aca
|
Push notification fixes
|
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
|
7467da7409
|
Imports organized
|
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
|
96b971ef01
|
CMC 1.6
|
4 years ago |
haroon amjad
|
f795ba24c5
|
updates & fixes
|
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 |
Mirza.Shafique
|
831780555c
|
CMC 1.0
|
4 years ago |
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
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 |
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
|
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 |
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 |
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 |
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 |
Sultan Khan
|
52665fe217
|
login issue fixed
|
5 years ago |
haroon amjad
|
4560037f97
|
updates
|
5 years ago |
Mirza.Shafique
|
089ad0d321
|
Booking appointment 1.3
|
5 years ago |
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
5 years ago |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
5 years ago |
Mirza.Shafique
|
ba0c0beef6
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
5 years ago |
haroon amjad
|
d83a611d95
|
FCM Permission fix
|
5 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
|
5 years ago |
Mirza.Shafique
|
62631677ad
|
Booking appointment 1.0
|
5 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
|
5 years ago |
Sikander Saleem
|
71f888ea9b
|
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 |
Sultan Khan
|
301728ed3d
|
family file fix
|
5 years ago |
Mirza.Shafique
|
0a83cf8241
|
Bug Fixis
|
5 years ago |
Sultan Khan
|
9e31a3c560
|
bug fixes
|
5 years ago |
haroon amjad
|
3f29bbd6b3
|
Updates & fixes
|
5 years ago |
Sultan Khan
|
11ffed2ae3
|
bug fixes
|
5 years ago |
Sikander Saleem
|
5647ab75e5
|
improvements.
|
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
|
69df61afb1
|
remove footer from pharmacy pages
|
5 years ago |
Mirza.Shafique
|
d865e97ce1
|
Vital Sings Home Page
|
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 |
Mirza.Shafique
|
66efbc1bac
|
Radiology Implementation
|
5 years ago |
Mirza.Shafique
|
29fd552874
|
Weight, height and blood pressure on Home Page
|
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 |
Mirza.Shafique
|
876463c945
|
Home Page Font weight
|
5 years ago |
Mirza.Shafique
|
85c759a4a5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
5 years ago |
Sultan Khan
|
6b7eaaafb9
|
fixes
|
5 years ago |
Mirza.Shafique
|
5f44dece71
|
Ganaric Font and font implementaion
|
5 years ago |
Sikander Saleem
|
56c0adaada
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
5 years ago |
Mirza.Shafique
|
38465eaafb
|
Home page icons and drawer
|
5 years ago |
Mirza.Shafique
|
06f877b8d4
|
Home page new design & drawer
|
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 |
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
|
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 |
Mirza.Shafique
|
bbaeec5b85
|
Medical Profile Complete
|
5 years ago |
Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
5 years ago |
Sultan Khan
|
7c398ba40d
|
bug fix
|
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 |
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 |
Sultan Khan
|
ed20ba65b3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
23ca95b9b6
|
bug fixes
|
5 years ago |