haroon amjad
|
46cc73bdd7
|
CMC changes
|
3 years ago |
Sultan Khan
|
6159be0f75
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
5fe0214e04
|
bug fixes
|
3 years ago |
|
haroon amjad
|
8cc36ae848
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
dfafb6b664
|
fixes
|
3 years ago |
Mirza.Shafique
|
c23478b838
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
205b4d6b21
|
Photo view in CMC
|
3 years ago |
 Sikander Saleem
|
d1f3428def
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
df32ae0142
|
lab order clinic/hospital name, prescription reminder ui, prescription availibility
|
3 years ago |
|
haroon amjad
|
879ce4ee06
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
7675a4496a
|
my vaccine & lab result fix
|
3 years ago |
|
Sultan Khan
|
a4ab22a4aa
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
5b988dff4f
|
BUG FIXES
|
3 years ago |
|
Mirza.Shafique
|
5e383e57d9
|
CMC error Fixes
|
3 years ago |
|
Sikander Saleem
|
3403e07aba
|
recall prescription order log when refill or cancel order.
|
3 years ago |
Haroon Amjad
|
062ca5c11c
|
EReferral fixes
|
3 years ago |
|
Haroon Amjad
|
abcb71e86e
|
Invoice details UI revamped
|
3 years ago |
|
haroon amjad
|
c91b8ce777
|
My Vaccines design revamped
|
3 years ago |
|
haroon amjad
|
dfeb249a54
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
a4a2389a78
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
f63293ef3e
|
login input rtl
|
3 years ago |
|
Sultan Khan
|
fc9f2fc34e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
3 years ago |
|
Sikander Saleem
|
5bdb56df60
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
5fda70decf
|
cmc & hhc order log ui improvements.
|
3 years ago |
|
Mirza.Shafique
|
bc246b2f9f
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
Mirza.Shafique
|
f0566fb069
|
CMC Images
|
3 years ago |
|
haroon amjad
|
184942e891
|
Covid Payment fixes
|
3 years ago |
|
haroon amjad
|
ab8030416c
|
Updates & fixes
|
3 years ago |
|
Mirza.Shafique
|
9b160958bb
|
Covid New Design 3
|
3 years ago |
|
haroon amjad
|
0955a22616
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
fa8c739b2c
|
updates & fixes
|
3 years ago |
|
Mirza.Shafique
|
6e244a55f5
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
7563a2870b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
b80e2ea16e
|
Covid New Design 2
|
3 years ago |
|
Sikander Saleem
|
74432b6bbb
|
cmc order log ui changes
|
3 years ago |
|
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
3 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
|
3 years ago |
|
Mirza.Shafique
|
5b330b2a25
|
Covid New Design
|
3 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
|
3 years ago |
|
Sikander Saleem
|
4ce941e01e
|
prescription order log detail view change on arabic
|
3 years ago |
|
haroon amjad
|
19e6954bc8
|
updates
|
3 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
|
3 years ago |
|
haroon amjad
|
b0f4cfcff3
|
Family file fixes
|
3 years ago |
|
Sultan Khan
|
c54146b3ba
|
sechedule fix
|
3 years ago |
|
haroon amjad
|
2fc5425884
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
f55fbd1cc2
|
UI fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
a075d53dd5
|
UI updates & fixes
|
3 years ago |
|
Sultan Khan
|
54ac31a74c
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
a57facb876
|
family file fix
|
3 years ago |
|
Sultan Khan
|
c58023efc3
|
family file fixes
|
3 years ago |
|
Sikander Saleem
|
7b8093b7ba
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
c1b23b7c2a
|
improvements
|
3 years ago |
|
Mirza.Shafique
|
e24eaa791b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
5b47aaac6f
|
icon and find us distance
|
3 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
|
3 years ago |
|
Sikander Saleem
|
0348397df3
|
insurance approval detail company name added.
|
3 years ago |
|
Sikander Saleem
|
4a30c59f83
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
e37781c3a6
|
insurance approval screen and detail screen ui changes.
|
3 years ago |
|
haroon amjad
|
ba7d0329c3
|
Dental Invoices UI
|
3 years ago |
|
haroon amjad
|
af7b27258c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
Sultan Khan
|
0e43ca173a
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
d535cb421d
|
bug fixes
|
3 years ago |
|
haroon amjad
|
f9b57ce4aa
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
4ac0845003
|
updates & fixes
|
3 years ago |
|
Mirza.Shafique
|
719cdbd2e4
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
8a4cf9f23b
|
Line Chart Fix in Vital Signs
|
3 years ago |
|
Sikander Saleem
|
baf4eab604
|
prescription order detail ui changes
|
3 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
|
3 years ago |
|
haroon amjad
|
92bfe27a6e
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
4caacb968b
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
d9405b2bd0
|
prescription order log ui changes
|
3 years ago |
|
Sikander Saleem
|
8e27d8210a
|
prescription detail ui changes.
|
3 years ago |
|
Mirza.Shafique
|
350882b1d2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
ef2bcc1c65
|
Web RTC Design implementation
|
3 years ago |
|
haroon amjad
|
ad3463bbfc
|
active medication design revamped
|
3 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
|
3 years ago |
|
Sikander Saleem
|
8cb342cb24
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
9d67704c67
|
prescription detail ui changes(cont).
|
3 years ago |
|
Sultan Khan
|
2ebfdcfdd7
|
login issue fixed
|
3 years ago |
|
Sikander Saleem
|
259163481c
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
3 years ago |
|
haroon amjad
|
05354f72cc
|
pharmacy import fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
a2e25f7a7a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
98837b2298
|
WebRTC implementation
|
3 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
|
3 years ago |
|
Sikander Saleem
|
4e0197965c
|
prescription ui changes(cont).
|
3 years ago |
|
Mirza.Shafique
|
999a45c711
|
App Expendable Design Change
|
3 years ago |
|
haroon amjad
|
322a32be21
|
WebRTC Implementing
|
3 years ago |
|
haroon amjad
|
c050633671
|
SignalR Updates
|
3 years ago |
|
haroon amjad
|
0a90791aca
|
Push notification fixes
|
3 years ago |
|
haroon amjad
|
eeb20073cb
|
Medicine prescriptions fixes from appointment details page
|
3 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
|
3 years ago |
|
haroon amjad
|
b1128be94f
|
Updates & fixes
|
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 |
|
haroon amjad
|
e5a636b704
|
Covid Test changes
|
3 years ago |
hussam al-habibeh
|
e4d54f0c0b
|
parent product and sub product update
|
3 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
|
3 years ago |
|
hussam al-habibeh
|
0a1db70229
|
parent product and sub product update
|
3 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
|
3 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
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
3f178e3e3f
|
Google_Huawei Map -> AppMap
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
bcfbca98a1
|
fixed arabic version
|
3 years ago |
Mohammad Aljammal
|
473f372a85
|
Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering
See merge request Cloud_Solution/diplomatic-quarter!388
|
3 years ago |
|
hussam al-habibeh
|
cb9d8cb9d9
|
fix pharmacy products filtering
|
3 years ago |
|
hussam al-habibeh
|
b0165c0d29
|
fix pharmacy products filtering
|
3 years ago |
|
haroon amjad
|
7467da7409
|
Imports organized
|
3 years ago |
|
Fatimah Alshammari
|
2caf4d4837
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
3 years ago |
|
haroon amjad
|
c186c9f186
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
0fe4a21388
|
updates & fixes
|
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
|
f946a7be4d
|
updates & fixes
|
3 years ago |
|
Mirza.Shafique
|
f20883184e
|
CMC 1.5
|
3 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
|
3 years ago |
|
Sultan Khan
|
c6fd52aad2
|
home health care
|
3 years ago |
|
haroon amjad
|
948f4fc6b8
|
CMC Add address fixes
|
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
|
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 |