Mohammad Aljammal
|
6827efc1b6
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge
|
4 years ago |
Mohammad Aljammal
|
d7fe93b3f3
|
Merge branch 'pharmacy-hussam' into 'pharmacy'
parent_categorise_page update
See merge request Cloud_Solution/diplomatic-quarter!226
|
4 years ago |
|
Mohammad Aljammal
|
298b4d6525
|
change color
|
4 years ago |
|
Mohammad Aljammal
|
1968eb4682
|
return privilege
|
4 years ago |
|
Mohammad Aljammal
|
952e106531
|
return privilege
|
4 years ago |
|
Mohammad Aljammal
|
f77d2b497e
|
fix issues
|
4 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
|
4 years ago |
enadhilal
|
10734d5994
|
connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
|
4 years ago |
|
Mohammad Aljammal
|
6bda03e935
|
hot fixing
|
4 years ago |
Sultan Khan
|
e6a94f8014
|
login design
|
4 years ago |
|
Sultan Khan
|
b992978af4
|
login
|
4 years ago |
|
Sultan Khan
|
764e706000
|
dashboard issue fixed
|
4 years ago |
|
Sultan Khan
|
c01246acf0
|
hot fix
|
4 years ago |
|
Sultan Khan
|
2b48578e07
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
016dffcb87
|
change
|
4 years ago |
|
Mohammad Aljammal
|
4263672f00
|
fim last vital sign data
|
4 years ago |
|
Mohammad Aljammal
|
80da19555c
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!218
|
4 years ago |
|
Mohammad Aljammal
|
519a474d41
|
fix live care label and vital sign data
|
4 years ago |
Fatimah Alshammari
|
c0920e7099
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Fatimah Alshammari
|
5fa5e9b7c8
|
fixed orders and profile
|
4 years ago |
|
Mohammad Aljammal
|
5e3f6363cf
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
754e60eb72
|
fix send email lab result
|
4 years ago |
|
Sultan Khan
|
6b4bae7370
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
827768e96d
|
language change
|
4 years ago |
|
Mohammad Aljammal
|
591d56e624
|
change the info images and change the out patient color
|
4 years ago |
|
Mohammad Aljammal
|
5c8e43c163
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Sultan Khan
|
8becd4f920
|
login issue fixed
|
4 years ago |
|
Sultan Khan
|
3edae19ad6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
c9538c6a84
|
family files
|
4 years ago |
Zohaib Kambrani
|
57925e3b02
|
Geofence fixes by JobScheduler
|
4 years ago |
|
Mohammad Aljammal
|
33c61afd2a
|
add powered by
|
4 years ago |
|
Mohammad Aljammal
|
5e29dff448
|
fix issues insurance and medical profile order
|
4 years ago |
|
Sultan Khan
|
355286768a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
73c8e00852
|
bug fixes
|
4 years ago |
Haroon Amjad
|
b0ea1fc262
|
updates & fixes
|
4 years ago |
|
Sultan Khan
|
18f492e52f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
d53031b0e6
|
blood type update for family files
|
4 years ago |
|
Mohammad Aljammal
|
b9958acd53
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
2059b76fc1
|
fix Medical profile
|
4 years ago |
|
Mohammad Aljammal
|
4d8f42b517
|
fix issues vital sign issue
|
4 years ago |
|
Mohammad Aljammal
|
4f015a1cda
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Mohammad Aljammal
|
f6983c138a
|
fix issues
|
4 years ago |
|
Sultan Khan
|
37ab778fd0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
b505ed1be7
|
blood type added
|
4 years ago |
|
Zohaib Kambrani
|
a11d93332d
|
Wifi check network available - android
tweaking at geofence code
|
4 years ago |
|
Mohammad Aljammal
|
09a85d9127
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
4 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
|
4 years ago |
|
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
4 years ago |
Zohaib Kambrani
|
508bc191be
|
geofencing login check fix
|
4 years ago |
|
Sultan Khan
|
6b1e7587a8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
a0baaac314
|
bug fixes
|
4 years ago |
|
Zohaib Kambrani
|
d8bd7d145d
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
a8b0af9ee1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Mohammad Aljammal
|
9c18c69d90
|
hot fixes
|
4 years ago |
haroon amjad
|
53282e3ae6
|
ToDo back issue fixed
|
4 years ago |
|
haroon amjad
|
ac3bebd59e
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
8c9762c24f
|
Fixes
|
4 years ago |
|
Sultan Khan
|
073e79c325
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
040c8f38ab
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
7bc8fdb819
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
3c2af11084
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
Conflicts:
lib/pages/landing/landing_page.dart
|
4 years ago |
|
Zohaib Kambrani
|
d8996cf879
|
Geofence Android Finished
|
4 years ago |
|
Mohammad Aljammal
|
d28870a629
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
6d7cb1b970
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
Conflicts:
ios/Runner.xcodeproj/project.pbxproj
lib/core/service/AuthenticatedUserObject.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
|
Mohammad Aljammal
|
a57d5eb69f
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
d9a70e7f75
|
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
hot fixes
See merge request Cloud_Solution/diplomatic-quarter!199
|
4 years ago |
|
Mohammad Aljammal
|
8329c534a3
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
4e2979cd64
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
4 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
|
4 years ago |
mosazaid
|
359eba2da0
|
make some updates in firebase version and update gradle, finish review order
|
4 years ago |
|
Zohaib Kambrani
|
1dc9400ffc
|
Geofencing work in progress on android
|
4 years ago |
|
Sultan Khan
|
e312671e24
|
hot fixes
|
4 years ago |
|
Sultan Khan
|
cf642da661
|
landing page
|
4 years ago |
|
Sultan Khan
|
eec67ac930
|
big fixes
|
4 years ago |
|
Sultan Khan
|
99ee5b4545
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
b29fdbb7d0
|
fix home issues
|
4 years ago |
|
Sultan Khan
|
8a554aa2f8
|
auth services fixed
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
02d72fa27c
|
fix issues
|
4 years ago |
|
Fatimah Alshammari
|
4a84483698
|
fixed order details
|
4 years ago |
|
Sultan Khan
|
0f594059b5
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
haroon amjad
|
a7dc2fdfd1
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 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
|
4 years ago |
|
Sultan Khan
|
3aa592e2b0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
9a578cafc2
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
b759758a68
|
bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
3860a08b53
|
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix issues
See merge request Cloud_Solution/diplomatic-quarter!188
|
4 years ago |
|
Mohammad Aljammal
|
f38f53587b
|
fix issues
|
4 years ago |
|
Haroon Amjad
|
3308aa47e1
|
fixes
|
4 years ago |
|
Sultan Khan
|
9e3db622fa
|
login loader issue fixed
|
4 years ago |
|
Zohaib Kambrani
|
78928335ef
|
Geofences Login check (unregister/register geozones on logout/logout)
|
4 years ago |
|
Zohaib Kambrani
|
6f6ab8d987
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
3122f2438b
|
fix import dialog
|
4 years ago |
|
Mohammad Aljammal
|
19f12116c4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
|
4 years ago |
|
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
4 years ago |
|
Zohaib Kambrani
|
53775d113d
|
commented code offers and packages
|
4 years ago |
|
Zohaib Kambrani
|
9947b30d3f
|
fix merge conflict
|
4 years ago |
|
Zohaib Kambrani
|
9ea779e48a
|
no message
|
4 years ago |
|
Zohaib Kambrani
|
b7088f70cd
|
Merge master in to my branch with Geofence iOS
|
4 years ago |
|
haroon amjad
|
965c97d262
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
bf999e611b
|
my appointment fix
|
4 years ago |
|
Sultan Khan
|
d779c6dd0a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
a2e385f282
|
family file drawer
|
4 years ago |
|
Haroon Amjad
|
b9269f525a
|
hot fixes
|
4 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
|
4 years ago |
|
Haroon Amjad
|
5606c88715
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
92e6275162
|
Add Confirm send email dialog
|
4 years ago |
|
Haroon Amjad
|
81b51bef51
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 years ago |
|
Mohammad Aljammal
|
4e823c2be4
|
fix chart and duplicated data in Patient Lab Result
|
4 years ago |
|
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Zohaib Kambrani
|
67f4b4e167
|
iOS Geofence in progress
|
4 years ago |
|
Mohammad Aljammal
|
4a43bcefe1
|
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
remove ErOptions
See merge request Cloud_Solution/diplomatic-quarter!179
|
4 years ago |
|
Mohammad Aljammal
|
a6d3fce6fc
|
remove ErOptions
|
4 years ago |
|
Zohaib Kambrani
|
8457972fda
|
no message
|
4 years ago |
|
haroon amjad
|
b13a56ffbd
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
951d9b553f
|
fixes & updates
|
4 years ago |
|
Sultan Khan
|
71592adf32
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
1f0d01b6cc
|
language issue fixed
|
4 years ago |
|
Sultan Khan
|
2c50402aa8
|
language issue fixed
|
4 years ago |
|
haroon amjad
|
f394433b6e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
9d046fd971
|
updates & fixes
|
4 years ago |
|
Mohammad Aljammal
|
97776ce99b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
|
4 years ago |
|
Mohammad Aljammal
|
b25bdbb6fa
|
fix LiveChatPage Service LabOrderResult MedicineSearch issues
|
4 years ago |
|
Zohaib Kambrani
|
92ba977fca
|
no message
|
4 years ago |
|
mosazaid
|
c058cf0e93
|
finish address add/edit/delete/select
|
4 years ago |
|
Sultan Khan
|
557b8e814f
|
voice command
|
4 years ago |
|
haroon amjad
|
75de755ccd
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
6ac8d67b83
|
finish address add/edit/delete/select
|
4 years ago |
|
Zohaib Kambrani
|
c10d024700
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
08aa2de69b
|
fix Prescriptions Service and design issues
|
4 years ago |
|
Zohaib Kambrani
|
8d5d55a150
|
Geofencing in progress
|
4 years ago |
|
Mohammad Aljammal
|
a2ec01be5d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
Conflicts:
lib/config/localized_values.dart
lib/pages/landing/home_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
2f77592bac
|
fix Prescriptions Service and design issues
|
4 years ago |
|
haroon amjad
|
740a294867
|
Translation & bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
62b923b25e
|
fix send rad report email
|
4 years ago |
|
Mohammad Aljammal
|
5083080ba3
|
fix vital sign details
|
4 years ago |
|
haroon amjad
|
1db5b15dcd
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
9ecaaa1b12
|
radiology fix in appointment details
|
4 years ago |
|
Sultan Khan
|
9d9d77ee3a
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
c813deea29
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
188b72bb90
|
voice command
|
4 years ago |
|
haroon amjad
|
d14e7e5223
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Sultan Khan
|
e28209d4e8
|
bug fixes
|
4 years ago |
|
Haroon Amjad
|
9d3c64200e
|
fixes
|
4 years ago |
|
Mohammad Aljammal
|
9cec304712
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
|
4 years ago |
|
Mohammad Aljammal
|
eca2266f7b
|
hot fixing
|
4 years ago |
|
Sultan Khan
|
21ccf1ef86
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
7742313923
|
voice command
|
4 years ago |
|
Sultan Khan
|
ce7a64e86e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
hussam al-habibeh
|
e85b21c08f
|
parent_categorise_page update
|
4 years ago |
|
haroon amjad
|
c4bb75eab4
|
Doctor rating fixed
|
4 years ago |
|
haroon amjad
|
8d20762050
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
33956db22a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
|
4 years ago |
|
haroon amjad
|
b55681a056
|
Working on steps tracking
|
4 years ago |
|
Mohammad Aljammal
|
a1e92e1fdd
|
fix merge issue
|
4 years ago |
|
Mohammad Aljammal
|
9dfd8a71dc
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
Conflicts:
lib/locator.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/login/confirm-login.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/widgets/bottom_navigation/bottom_nav_bar.dart
lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
|
Mohammad Aljammal
|
9b8599a2cf
|
remove load user from SplashScreen
|
4 years ago |
|
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
4 years ago |
|
haroon amjad
|
8cd3ae915b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
468bb0356c
|
updates & fixes
|
4 years ago |
|
Mohammad Aljammal
|
14f92f6c58
|
remove updated button
|
4 years ago |
|
Mohammad Aljammal
|
554ed1b50a
|
fix insurance update
|
4 years ago |
|
Sultan Khan
|
7f44677242
|
voice command priv
|
4 years ago |
|
Mohammad Aljammal
|
9fecf8e89f
|
fix insurance update
|
4 years ago |
|
Mohammad Aljammal
|
935e72975c
|
add new privilege
|
4 years ago |
|
haroon amjad
|
e495d3e5ad
|
Health Data integration implementing
|
4 years ago |
|
Sultan Khan
|
a004610ac3
|
voice command updatd
|
4 years ago |
|
Sultan Khan
|
542335364e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
c050c3f189
|
voice command updated
|
4 years ago |
|
Sultan Khan
|
f083912d43
|
voice command updated
|
4 years ago |
|
enadhilal
|
727940c5c6
|
fixed merging issues
|
4 years ago |
|
haroon amjad
|
cf6686e413
|
Merge branch 'master' into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
378562b781
|
adding some changes in order pages like translate texts
|
4 years ago |
|
enadhilal
|
9c55571072
|
Merge branch 'pharmacy' into enad_pharmacy2
|
4 years ago |
|
enadhilal
|
c22ca4e29e
|
Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
enadhilal
|
888a74fb9b
|
add these pages
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
|
4 years ago |
|
Fatimah Alshammari
|
ed68eed9df
|
added links for profile
|
4 years ago |
|
Mohammad Aljammal
|
2e2a29145c
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
459ba828d9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
4 years ago |
|
haroon amjad
|
59aba6608d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
haroon amjad
|
a1f91d99b3
|
added countdown timer in my appointments
|
4 years ago |
|
Fatimah Alshammari
|
706980248a
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
4 years ago |
|
Fatimah Alshammari
|
9b8103bfd6
|
fixe order and order details
|
4 years ago |
|
Sultan Khan
|
af1c59394c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
496163a61a
|
voice command updated
|
4 years ago |
|
Mohammad Aljammal
|
47e4b99f11
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
9e8def6584
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
Conflicts:
lib/config/localized_values.dart
|
4 years ago |
|
Mohammad Aljammal
|
7f23f356f1
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!151
|
4 years ago |
|
Mohammad Aljammal
|
4e2c955b09
|
add missing translation
|
4 years ago |
|
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
4 years ago |
|
hussam al-habibeh
|
5dc3c53550
|
mousa and hussam branch
|
4 years ago |
|
hussam al-habibeh
|
a1906a4072
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
4 years ago |
|
hussam al-habibeh
|
800565407d
|
12/6
|
4 years ago |
|
mosazaid
|
4c9a1862d2
|
make pharmacy home page load data even without login, and some mini changes
|
4 years ago |
|
haroon amjad
|
257dc3d76d
|
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
create terms-condition in pharmacy order page
See merge request Cloud_Solution/diplomatic-quarter!154
|
4 years ago |
|
mosazaid
|
7ee7ef58c4
|
working on dynamic title on pharmacy
|
4 years ago |
 umasoodch
|
b5413d1749
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
709ba2ce97
|
create terms-condition in pharmacy order page
|
4 years ago |
|
mosazaid
|
2a91ae787f
|
commit
|
4 years ago |
|
Sultan Khan
|
92b0b6d6ea
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
hussam al-habibeh
|
8b8207cb0d
|
search
|
4 years ago |
|
Sultan Khan
|
e34a5c3c13
|
multiple login calls fixed
|
4 years ago |
|
Sultan Khan
|
f5b7d35f23
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
a3e01ff938
|
flutter tts
|
4 years ago |
|
Sultan Khan
|
e3e868e47c
|
flutter tts updated
|
4 years ago |
|
Sultan Khan
|
8c5746f7b1
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
8d7cc20b70
|
localized value updated
|
4 years ago |
|
Sultan Khan
|
321d31b3bd
|
voice search page updated
|
4 years ago |
|
Sultan Khan
|
d69b3676a4
|
weather indicator in progress
|
4 years ago |
|
hussam al-habibeh
|
64cbae3602
|
Search
|
4 years ago |
|
Sultan Khan
|
81c8239412
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
fc0117754d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
1c23e28081
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
ced86de9fe
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
Conflicts:
lib/config/localized_values.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/balance/my_balance_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
4 years ago |
|
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
4 years ago |
|
haroon amjad
|
f1a8e09a59
|
Added info images description
|
4 years ago |
|
haroon amjad
|
47b030eb82
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# ios/Flutter/.last_build_id
# lib/config/config.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
7edb0c8009
|
Doctor rating dialog revamped
|
4 years ago |
|
Sultan Khan
|
3a055aa02b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
79c17de0de
|
ltr issue fixed
|
4 years ago |
|
Mohammad Aljammal
|
3daef6e53f
|
add images info
|
4 years ago |
|
Mohammad Aljammal
|
dc898a799d
|
Add Privileges
|
4 years ago |
|
Sultan Khan
|
3ab513d9d0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
98f84c2161
|
voice search in progress
|
4 years ago |
Elham Rababah
|
713e44cf8b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Elham Rababah
|
ea195ea9bf
|
Finish translate CMC HHC
|
4 years ago |
|
haroon amjad
|
ff0d66ccdb
|
Covid test translations
|
4 years ago |
|
haroon amjad
|
4f1f7dcefd
|
ereferral implementation completed
|
4 years ago |
|
haroon amjad
|
65fbd7af8e
|
referral finalised
|
4 years ago |
|
Zohaib Kambrani
|
1155466d19
|
Packages and Offer Slider at home
|
4 years ago |
|
mosazaid
|
98f660e29b
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
mosazaid
|
951c77feb5
|
working on lakum account
|
4 years ago |
|
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
4 years ago |
|
Elham Rababah
|
5bf63174c9
|
First step from translations
|
4 years ago |
|
haroon amjad
|
82e23efd32
|
working on ereferral
|
4 years ago |
|
umasoodch
|
0431eb1ac8
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
4 years ago |
|
Sultan Khan
|
8de838a6dc
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
2fb0ccfdbd
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
haroon amjad
|
6846a8501a
|
Merge branch 'master' 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
|
4 years ago |
|
haroon amjad
|
0181043da8
|
Ereferral fixes, smartwatch health data integration
|
4 years ago |
|
Mohammad Aljammal
|
2185f5ce11
|
Merge branch 'hhc_cmc' into 'master'
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
|
4 years ago |
|
Elham Rababah
|
1e1677a365
|
naming issue fix
|
4 years ago |
|
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
4 years ago |
|
Sultan Khan
|
078183c1fb
|
not authenticated page updated
|
4 years ago |
|
Elham Rababah
|
68e4b92717
|
Address Added Successfully
|
4 years ago |
|
Sultan Khan
|
de2a5e55eb
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
7d3c1ac852
|
weather indicator updated
|
4 years ago |
|
Sultan Khan
|
648d9d245d
|
health weather indicator
|
4 years ago |
|
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
|
Elham Rababah
|
ed56476d81
|
second step from location fixes
|
4 years ago |
|
Mohammad Aljammal
|
54d8965773
|
done child Vaccination
|
4 years ago |
|
haroon amjad
|
97b8aeeff5
|
Version Control finished
|
4 years ago |
|
haroon amjad
|
a03d5c6d57
|
App initial release to stores
|
4 years ago |
|
Sultan Khan
|
e7c862c801
|
health weather indicator
|
4 years ago |
|
Sultan Khan
|
909401cc7e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
a9cb645833
|
health weather indicator
|
4 years ago |
|
Sultan Khan
|
19d6057f66
|
health weather indicator
|
4 years ago |
|
Elham Rababah
|
7aa7af6de7
|
finish CMC module
|
4 years ago |
|
haroon amjad
|
92db2b2be9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Elham Rababah
|
fd80afeb5a
|
finish hhc module
|
4 years ago |
|
Elham Rababah
|
3ef22be7da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
Conflicts:
lib/config/config.dart
|
4 years ago |
|
Elham Rababah
|
a87855f445
|
Fix issues on hhc module
|
4 years ago |
|
Mohammad Aljammal
|
49974f81db
|
add translations to child Vaccination
|
4 years ago |
|
Sultan Khan
|
5e6bcadec0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
603833db37
|
login changes
|
4 years ago |
|
Sultan Khan
|
340b9770c8
|
login
|
4 years ago |
|
haroon amjad
|
e5feef8a9d
|
Updates & UI Fixes
|
4 years ago |
|
Sultan Khan
|
799fca346b
|
health weather indicator
|
4 years ago |
|
Sultan Khan
|
8612ae91c4
|
sultan
|
4 years ago |
|
Sultan Khan
|
0f80224016
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
fa01d132c7
|
merger DQ live and fix some issues on Child Vaccines
|
4 years ago |
|
Mohammad Aljammal
|
a556e8c1f8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/config.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
|
4 years ago |
|
haroon amjad
|
01512e6332
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Mohammad Aljammal
|
482ec536de
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
Conflicts:
lib/config/config.dart
|
4 years ago |
|
Mohammad Aljammal
|
b6d2878cf1
|
add Radiology translations and colors
|
4 years ago |
|
Fatimah Alshammari
|
d328c74fc4
|
fix order and orderdetails
|
4 years ago |
|
Sultan Khan
|
22676fcbd1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
5bb780c4ac
|
push
|
4 years ago |
|
haroon amjad
|
ebb8a8fa2c
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Mohammad Aljammal
|
d0891ba16b
|
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix lab result translations and colors
See merge request Cloud_Solution/diplomatic-quarter!128
|
4 years ago |
|
Mohammad Aljammal
|
b504f379de
|
fix lab result translations and colors
|
4 years ago |
|
Mohammad Aljammal
|
2731c5b1d4
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!127
|
4 years ago |
|
Sultan Khan
|
d6a0188c76
|
fingerprint
|
4 years ago |
|
Sultan Khan
|
7c33c06c0c
|
fingerprint
|
4 years ago |
|
Sultan Khan
|
1b678e0aca
|
fingerprint
|
4 years ago |
|
Sultan Khan
|
6a14214a0f
|
no message
|
4 years ago |
|
Sultan Khan
|
24b7bca471
|
no message
|
4 years ago |
|
haroon amjad
|
c74ac3b7ca
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
85062859c8
|
updates
|
4 years ago |
|
Mohammad Aljammal
|
0ac599ea1c
|
fix vital Sign
|
4 years ago |
|
haroon amjad
|
10025103ac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
21c7c94ef2
|
updates & fixes
|
4 years ago |
|
Sultan Khan
|
b61e734f80
|
feedback permission
|
4 years ago |
|
Sultan Khan
|
6bbdf05f90
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
857fc813cd
|
button feedback
|
4 years ago |
|
Sultan Khan
|
571bda9100
|
permission
|
4 years ago |