 Sikander Saleem
|
f0bb94c422
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
Sultan Khan
|
1d36076320
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
dd58b8637b
|
bug fixs
|
3 years ago |
Fatimah Alshammari
|
bcfbca98a1
|
fixed arabic version
|
3 years ago |
|
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
3 years ago |
Mirza.Shafique
|
d7314f7555
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
96b971ef01
|
CMC 1.6
|
3 years ago |
haroon amjad
|
32462ff5ba
|
covid translation updates
|
3 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
|
3 years ago |
|
Sultan Khan
|
c6404a2a0b
|
tracker services
|
3 years ago |
|
haroon amjad
|
2d7c7239c5
|
Health Converters fixes
|
3 years ago |
|
haroon amjad
|
f795ba24c5
|
updates & 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
|
2669378da4
|
Insurance Approval API updated
|
3 years ago |
|
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
3 years ago |
|
haroon amjad
|
25fb5decc0
|
Ask Doctor page fixes
|
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 |
|
haroon amjad
|
9ffe064a3b
|
updates & fixes
|
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
|
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 |
|
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
|
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 |
|
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
|
faff3b90cb
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/core/service/er/am_service.dart
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Mohammad Aljammal
|
36142f0f6d
|
Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
|
3 years ago |
mosazaid
|
a2e60e7584
|
fix bugs pharmacy
|
3 years ago |