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
|
3 years ago |
|
haroon amjad
|
2d7c7239c5
|
Health Converters fixes
|
3 years ago |
Mirza.Shafique
|
2d38e8905b
|
CMC 1.4
|
3 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
|
3 years ago |
|
haroon amjad
|
f795ba24c5
|
updates & fixes
|
3 years ago |
|
Mirza.Shafique
|
d1bc46f451
|
CMC Marge
|
3 years ago |
|
Mirza.Shafique
|
a67c5afcfb
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
e890c80831
|
CMC 1.3
|
3 years ago |
Mohammad Aljammal
|
9fb4e79c34
|
Merge branch 'sep_fixes' into 'development'
Sep fixes
See merge request Cloud_Solution/diplomatic-quarter!387
|
3 years ago |
Elham Rababh
|
bb372210e0
|
PAP-938: fix Referral sent
|
3 years ago |
|
Elham Rababh
|
bff7020b78
|
PAP-939: fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
ec646a7039
|
My Invoice fixes, Prescription page fixes
|
3 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
|
3 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
|
3 years ago |
|
Sultan Khan
|
169aafa26b
|
hmc services design fixed
|
3 years ago |
|
Mirza.Shafique
|
831780555c
|
CMC 1.0
|
3 years ago |
|
haroon amjad
|
aadcfdc7bc
|
Insurance Approval fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
3 years ago |
 Sikander Saleem
|
aa047afef7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
3 years ago |
|
Mirza.Shafique
|
afb08fcd0a
|
Booking Filters Update
|
3 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
|
3 years ago |
|
Mirza.Shafique
|
a234618df8
|
Update, Insurance card and My Balance Design
|
3 years ago |
|
Sikander Saleem
|
1db8c96ed7
|
title improvement for book appointment clinic search.
|
3 years ago |
|
haroon amjad
|
ebcc2559ce
|
Ask doctor issue resolved, Translation & font family issues resolved
|
3 years ago |
|
haroon amjad
|
25fb5decc0
|
Ask Doctor page fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
d4a4165ef3
|
Minor fixes in Eye Measurements
|
3 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
|
3 years ago |
|
Sultan Khan
|
0086875d0d
|
Design Updated for tracker
|
3 years ago |
|
Sikander Saleem
|
a09b43ef8c
|
monthly report ui redesigned.
|
3 years ago |
|
Sikander Saleem
|
120e6c166d
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
c84707ba3f
|
monthly report request & sick leaves ui redesigned.
|
3 years ago |
|
haroon amjad
|
9ffe064a3b
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
cd85ad4f8a
|
feedback ui redesigned.
|
3 years ago |
|
haroon amjad
|
45272d251c
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
8e7786cb96
|
updates & fixes
|
3 years ago |
Fatimah Alshammari
|
62167baec5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
3 years ago |
|
Sikander Saleem
|
1b7b7b6334
|
live chat ui redesigned.
|
3 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
|
3 years ago |
|
Sultan Khan
|
73ff5c4707
|
Bug fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
4469ae1209
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
ef5f737084
|
Merge branch 'development' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
4f85652562
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
f577905dcb
|
eye measurment new design
|
3 years ago |
|
haroon amjad
|
e679c7df0d
|
updates & fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
44d59ed01a
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
e3758cfbba
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
ff5fbbdf7c
|
Service info app bar fixed.
|
3 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
|
3 years ago |
|
Sikander Saleem
|
6a86d8d1c1
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
62ca009404
|
improvement.
|
3 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
|
3 years ago |
|
Sultan Khan
|
52665fe217
|
login issue fixed
|
3 years ago |
|
Mohammad Aljammal
|
55f9bbcba4
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!379
|
3 years ago |
|
Sikander Saleem
|
7df76842b2
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
3 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
|
3 years ago |
|
Sikander Saleem
|
f3d7686a10
|
improvement.
|
3 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
|
3 years ago |
|
Sultan Khan
|
233a273316
|
shcedule page
|
3 years ago |
|
Mirza.Shafique
|
3f0d8626e7
|
Marge issue
|
3 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
|
3 years ago |
|
Mirza.Shafique
|
e1e3741abf
|
Event Reminder
|
3 years ago |
haroon amjad
|
b83318faf8
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!382
|
3 years ago |
|
haroon amjad
|
f8c295defe
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!381
|
3 years ago |
|
haroon amjad
|
8cb9a5e619
|
updates
|
3 years ago |
|
haroon amjad
|
faff3b90cb
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/core/service/er/am_service.dart
|
3 years ago |
|
haroon amjad
|
e9ec2e2faf
|
Ambulance request APIs revamped
|
3 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
|
3 years ago |
|
Sultan Khan
|
abcd207554
|
schedule page fix
|
3 years ago |
|
haroon amjad
|
3abd7227ec
|
fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
4560037f97
|
updates
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
827d8733a1
|
fixed shopping cart issue
|
3 years ago |
|
Sikander Saleem
|
402cf5936a
|
improvement.
|
3 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
|
3 years ago |
|
Sikander Saleem
|
bf920d4188
|
find us redesigned.
|
3 years ago |
|
Sultan Khan
|
1726f8cc11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
d1fc4751ad
|
BUG FIXES
|
3 years ago |
|
Mirza.Shafique
|
ebf293736d
|
Booking appointment Marge
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
d1c99d1d82
|
ER Average waiting time label applied
|
3 years ago |
|
haroon amjad
|
4c2b70fcb5
|
Merge branch 'development' into Haroon
|
3 years ago |
|
haroon amjad
|
21c3686e05
|
Ambulance request services revamping
|
3 years ago |
|
Sikander Saleem
|
363cf78884
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
b78f8f76db
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
1c020134e8
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 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
|
3 years ago |
|
Mirza.Shafique
|
089ad0d321
|
Booking appointment 1.3
|
3 years ago |
|
Elham Rababh
|
2e2f7334d5
|
fix issues PAP-910,PAP-911
|
3 years ago |
|
Sikander Saleem
|
cfa3ca62b6
|
prescription tab bar improvement.
|
3 years ago |
|
Sikander Saleem
|
3cc18cfb24
|
medical reports ui redesigned.
|
3 years ago |
|
Sikander Saleem
|
9fdebc2db7
|
ask doctor ui redesigned
|
3 years ago |
|
Fatimah Alshammari
|
b6981299d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
239ad530ce
|
fixed isuues
|
3 years ago |
|
Mohammad Aljammal
|
36142f0f6d
|
Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
|
3 years ago |