Mohammad Aljammal
|
d64e2a469f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
|
4 years ago |
Mohammad Aljammal
|
8ecd4a24d8
|
fix product tile
|
4 years ago |
Mohammad Aljammal
|
8c7f397ac8
|
Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!397
|
4 years ago |
hussam al-habibeh
|
dbf7ebf287
|
fix most viewed & best sellers moduls
|
4 years ago |
Elham Rababh
|
a6a7ed4e1b
|
remove cart from product details
|
4 years ago |
haroon amjad
|
0955a22616
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
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 |
Sikander Saleem
|
c96fa62363
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
e36e0ce0b7
|
h20 bottom nav bar bug fix (happen in release mode)
|
4 years ago |
hussam al-habibeh
|
7427cd68ff
|
fix bottom nav bar ui
|
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
|
a075d53dd5
|
UI updates & fixes
|
4 years ago |
Sultan Khan
|
a57facb876
|
family file fix
|
4 years ago |
haroon amjad
|
af7b27258c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sultan Khan
|
0e43ca173a
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
d535cb421d
|
bug fixes
|
4 years ago |
haroon amjad
|
4ac0845003
|
updates & fixes
|
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
|
8e27d8210a
|
prescription detail 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 |
Sikander Saleem
|
9d67704c67
|
prescription detail ui changes(cont).
|
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 |
haroon amjad
|
b3dffc992c
|
App expandable fixes
|
4 years ago |
haroon amjad
|
a2e25f7a7a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
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 |
Mirza.Shafique
|
999a45c711
|
App Expendable Design Change
|
4 years ago |
haroon amjad
|
322a32be21
|
WebRTC Implementing
|
4 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
|
4 years ago |
Mirza.Shafique
|
ad3fbdf323
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
717c7b3be4
|
Lab results designs enhancements
|
4 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
|
4 years ago |
Zohaib Iqbal Kambrani
|
3f178e3e3f
|
Google_Huawei Map -> AppMap
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
Mirza.Shafique
|
96b971ef01
|
CMC 1.6
|
4 years ago |
Mirza.Shafique
|
a67c5afcfb
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
e890c80831
|
CMC 1.3
|
4 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
|
4 years ago |
haroon amjad
|
ec646a7039
|
My Invoice fixes, Prescription page 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
|
aadcfdc7bc
|
Insurance Approval fixes
|
4 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
|
4 years ago |
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
4 years ago |
Sikander Saleem
|
aa047afef7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
4 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
|
4 years ago |
Mirza.Shafique
|
a234618df8
|
Update, Insurance card and My Balance Design
|
4 years ago |
Sikander Saleem
|
1db8c96ed7
|
title improvement for book appointment clinic search.
|
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
|
a09b43ef8c
|
monthly report ui redesigned.
|
4 years ago |
Sikander Saleem
|
120e6c166d
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
haroon amjad
|
9ffe064a3b
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
cd85ad4f8a
|
feedback ui redesigned.
|
4 years ago |
Fatimah Alshammari
|
62167baec5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
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
|
ef5f737084
|
Merge branch 'development' into development_new_design_2.0
|
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 |
haroon amjad
|
e679c7df0d
|
updates & fixes
|
4 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
|
4 years ago |
haroon amjad
|
44d59ed01a
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
e3758cfbba
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
ff5fbbdf7c
|
Service info app bar fixed.
|
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 |
Sikander Saleem
|
6a86d8d1c1
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
62ca009404
|
improvement.
|
4 years ago |
Sultan Khan
|
52665fe217
|
login issue fixed
|
4 years ago |
Fatimah Alshammari
|
827d8733a1
|
fixed shopping cart issue
|
4 years ago |
Sikander Saleem
|
bf920d4188
|
find us redesigned.
|
4 years ago |
Sikander Saleem
|
1c020134e8
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
089ad0d321
|
Booking appointment 1.3
|
4 years ago |
Sikander Saleem
|
cfa3ca62b6
|
prescription tab bar improvement.
|
4 years ago |
Sikander Saleem
|
9fdebc2db7
|
ask doctor ui redesigned
|
4 years ago |
Fatimah Alshammari
|
b6981299d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Fatimah Alshammari
|
239ad530ce
|
fixed isuues
|
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 |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
4 years ago |
Sikander Saleem
|
9e75a45cd5
|
improvement.
|
4 years ago |
Sikander Saleem
|
8367fc09f3
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
|
4 years ago |
Sikander Saleem
|
d605084a91
|
appointment list and detail ui changed
|
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 |
haroon amjad
|
73097d15de
|
Covid Lab result generate certificate implemented
|
4 years ago |
Mirza.Shafique
|
62631677ad
|
Booking appointment 1.0
|
4 years ago |
Sikander Saleem
|
970887b0c5
|
changes
|
4 years ago |
Sikander Saleem
|
71f888ea9b
|
improvements
|
4 years ago |
Sikander Saleem
|
51c398e84a
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
e9db30d3da
|
otp clear when wrong code entered.
|
4 years ago |
Mirza.Shafique
|
ca3495d71c
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
0a83cf8241
|
Bug Fixis
|
4 years ago |
Sikander Saleem
|
5ab9dd1761
|
Appointment screen Changes & improvements.
|
4 years ago |
haroon amjad
|
3f29bbd6b3
|
Updates & fixes
|
4 years ago |
Elham Rababh
|
13737548bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
|
4 years ago |
Sikander Saleem
|
458dc2474b
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
047941fffc
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
5647ab75e5
|
improvements.
|
4 years ago |
Mirza.Shafique
|
b2bba050e8
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
|
4 years ago |
Elham Rababh
|
ab2fc6aa2c
|
fix issues related to footer
|
4 years ago |
Mirza.Shafique
|
8c8a9c7ce2
|
Medical Perscription 1.0
|
4 years ago |
Sikander Saleem
|
ec6693c55e
|
improvement.
|
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
|
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
|
74d0826342
|
fixed issues
|
5 years ago |
Sikander Saleem
|
6ee56cba0d
|
Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/new_design/doctor_header.dart
|
5 years ago |
Sikander Saleem
|
bb20d65b40
|
lab result detail screen.
|
5 years ago |
Mirza.Shafique
|
66efbc1bac
|
Radiology Implementation
|
5 years ago |
Mirza.Shafique
|
26c30038c9
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
5 years ago |
Mirza.Shafique
|
29fd552874
|
Weight, height and blood pressure on Home Page
|
5 years ago |
Sikander Saleem
|
3a1af590ff
|
lab result detail screen (cont.)
|
5 years ago |
Elham Rababh
|
8626b4f269
|
first step from add footer for all pages
|
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 |
Mirza.Shafique
|
a699740897
|
Medical File Fonts Implementation
|
5 years ago |
Mirza.Shafique
|
5f44dece71
|
Ganaric Font and font implementaion
|
5 years ago |
Fatimah Alshammari
|
bbb8e04066
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
5 years ago |
Sikander Saleem
|
ff55ae1908
|
improvements
|
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 |
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
|
10a147860c
|
no message
|
5 years ago |
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
5 years ago |
Fatimah Alshammari
|
b8ba80b361
|
Merge branch 'fatima-new' into development
|
5 years ago |
Fatimah Alshammari
|
39ba2cfde7
|
fixed issues.
|
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 |