haroon amjad
b475adb5c3
Updates & fixes
4 years ago
Sultan Khan
5c8b809e39
family file fixes
4 years ago
Mirza.Shafique
d664a216c6
Profile Page and Back Button Click
4 years ago
haroon amjad
e62e3dae1b
CMC APIs coverting to RC
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
cbf2e84959
fixes
4 years ago
Mirza.Shafique
d48a4ff4e3
Back Button on Landing Page
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
55df00dcd4
h20 today ui (cont.)
4 years ago
Sikander Saleem
763c16ddd0
h2o setting ui redesigned.
4 years ago
haroon amjad
259581c4f8
updates & fixes
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
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
Sikander Saleem
8b49eed6ae
hospital text replaced with branch
4 years ago
Elham Rababh
3dc28d318a
fix bugs on wish list
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
Sikander Saleem
6099738a5c
improvements
4 years ago
Haroon Amjad
19edcc210e
Rate appointment UI implemented
4 years ago
haroon amjad
89e1aa70c0
updates
4 years ago
haroon amjad
22c6a8ce42
no message
4 years ago
Sultan Khan
5fe0214e04
bug fixes
4 years ago
Haroon Amjad
062ca5c11c
EReferral fixes
4 years ago
Haroon Amjad
abcb71e86e
Invoice details UI revamped
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
dbf7ebf287
fix most viewed & best sellers moduls
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
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
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
Sultan Khan
c54146b3ba
sechedule fix
4 years ago
haroon amjad
a075d53dd5
UI updates & fixes
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
e37781c3a6
insurance approval screen and detail screen 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
d9405b2bd0
prescription order log ui changes
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
Sultan Khan
2ebfdcfdd7
login issue fixed
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
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
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
bcfbca98a1
fixed arabic version
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
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
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
2d7c7239c5
Health Converters fixes
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
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
3bb0a8b85b
Apple Pay finalized, Translation issues fixed, other updates
4 years ago
haroon amjad
25fb5decc0
Ask Doctor page fixes
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
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
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
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
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
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
faff3b90cb
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/core/service/er/am_service.dart
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
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
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
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
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
Mohammad Aljammal
36142f0f6d
Merge branch 'fix_bug_pharmacy' into 'development'
...
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
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
Sultan Khan
b116079843
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Mirza.Shafique
ad025f3d8e
Booking appointment 1.2
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
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
Zohaib Iqbal Kambrani
d33432d238
Covid Drive-Thru Questions Screen
4 years ago
haroon amjad
73097d15de
Covid Lab result generate certificate implemented
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
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
haroon amjad
5f521556dc
Dental flow fixes
4 years ago
Sikander Saleem
288d64214e
improvements
4 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
4 years ago
Sikander Saleem
5ab9dd1761
Appointment screen Changes & improvements.
4 years ago
Sultan Khan
57d87dfc03
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
11ffed2ae3
bug fixes
4 years ago
haroon amjad
cbbca5ce86
Merge branch 'development' into Haroon
4 years ago
Sikander Saleem
458dc2474b
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
0121337d1b
LiveCare Flow from book appointment flow implemented
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
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
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
Fatimah Alshammari
74d0826342
fixed issues
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
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
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
Elham Rababh
1568698b98
fix issues related to wight and sugar blood
5 years ago
Sikander Saleem
bb20d65b40
lab result detail screen.
5 years ago
hussam al-habibeh
8f5fef87e9
add blood pressure translation issue
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
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
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
5f44dece71
Ganaric Font and font implementaion
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
bb9d1bfcd5
improvements
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
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
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
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
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
bbaeec5b85
Medical Profile Complete
5 years ago
Sikander Saleem
f6ae7ed770
merge changes-4
5 years ago
Sikander Saleem
c07a8f54c7
merge changes-2
5 years ago
Sultan Khan
7c398ba40d
bug fix
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
Mirza.Shafique
49bfa2e9a7
Home page 1.3
5 years ago
Zohaib Iqbal Kambrani
e4256d6874
RRT in progress (Service implementations)
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
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
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
Sultan Khan
23ca95b9b6
bug fixes
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
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
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
4abdd9bde7
no message
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
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
Sikander Saleem
8b2feb03ea
last login and login options ui.
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
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
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
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
b4a7235fc8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
hussam al-habibeh
854352d9ce
jira bugs
5 years ago
Sikander Saleem
1f01f40ad8
PAP-681 fixed, H2O Unit changing & reflection.
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
Mohammad Aljammal
25d5105caf
Merge branch 'Apr-fixes' into 'development'
...
PAP-607: fix issue
See merge request Cloud_Solution/diplomatic-quarter!312
5 years ago
Elham Rababah
2a47564c37
PAP-607: fix issue
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
Sultan Khan
8c9c309abb
bug fixes
5 years ago
Sultan Khan
cd7845b1a4
bug fix
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
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
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
mosazaid
b623bd0dce
Merge branch 'development' into fix_bugs
5 years ago
mosazaid
e5474b3062
fix perscription pages bugs
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
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
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
haroon amjad
accc39d972
jira 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
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
e0ebb922ed
pharmacy fixes
5 years ago
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
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
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
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
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
enadhilal
0cb493d56c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
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
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
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
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
mosazaid
b70c7d7d05
fix pharmacy auth
5 years ago
enadhilal
292e983614
fixing issues
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
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
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
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
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
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
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
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
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
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
mosazaid
5bcc67b77d
Nearest Er fix design
5 years ago
Zohaib Iqbal Kambrani
e2bce87e34
resolve merge conflicts.
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
634c874eee
fix design issues
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
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
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
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
Sultan Khan
c01246acf0
hot fix
5 years ago
Sultan Khan
2b48578e07
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
016dffcb87
change
5 years ago
Mohammad Aljammal
519a474d41
fix live care label and vital sign data
5 years ago
Fatimah Alshammari
c0920e7099
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal
5e3f6363cf
fix issues
5 years ago
Mohammad Aljammal
754e60eb72
fix send email lab result
5 years ago
Zohaib Kambrani
57925e3b02
Geofence fixes by JobScheduler
5 years ago
Mohammad Aljammal
2059b76fc1
fix Medical profile
5 years ago
Mohammad Aljammal
4d8f42b517
fix issues vital sign issue
5 years ago
Mohammad Aljammal
4f015a1cda
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
5 years ago
Mohammad Aljammal
f6983c138a
fix issues
5 years ago
Sultan Khan
37ab778fd0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
b505ed1be7
blood type added
5 years ago
Mohammad Aljammal
9c12e949e8
hot fixes
5 years ago
Fatimah Alshammari
e5bf7acc52
Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
...
# Conflicts:
# lib/core/viewModels/pharmacyModule/order_model_view_model.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari
fda101840a
fixed order isuues
5 years ago
Mohammad Aljammal
9c18c69d90
hot fixes
5 years ago
Mohammad Aljammal
7167d58ce2
fix merge issues
5 years ago
Mohammad Aljammal
aa89a05f1d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
mosazaid
359eba2da0
make some updates in firebase version and update gradle, finish review order
5 years ago
Mohammad Aljammal
b29fdbb7d0
fix home issues
5 years ago
Mohammad Aljammal
d9759560c3
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
...
Conflicts:
lib/config/localized_values.dart
lib/pages/login/login.dart
5 years ago
Mohammad Aljammal
02d72fa27c
fix issues
5 years ago
Fatimah Alshammari
4a84483698
fixed order details
5 years ago
Sultan Khan
0f594059b5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
haroon amjad
a7dc2fdfd1
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
haroon amjad
781fd1c287
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
3aa592e2b0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
b759758a68
bug fixes
5 years ago
Mohammad Aljammal
f38f53587b
fix issues
5 years ago
Haroon Amjad
3308aa47e1
fixes
5 years ago
Mohammad Aljammal
19f12116c4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
5 years ago
Mohammad Aljammal
de1e352e98
fix charts and vital sign
5 years ago
Zohaib Kambrani
b7088f70cd
Merge master in to my branch with Geofence iOS
5 years ago
Haroon Amjad
c67d41701d
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Haroon Amjad
5606c88715
hot fixes
5 years ago
Mohammad Aljammal
92e6275162
Add Confirm send email dialog
5 years ago
haroon amjad
051bd1e23f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
951d9b553f
fixes & updates
5 years ago
Mohammad Aljammal
97776ce99b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
5 years ago
Mohammad Aljammal
b25bdbb6fa
fix LiveChatPage Service LabOrderResult MedicineSearch issues
5 years ago