Mohammad Aljammal
|
952e106531
|
return privilege
|
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 |
Mohammad Aljammal
|
6bda03e935
|
hot fixing
|
5 years ago |
Mohammad Aljammal
|
5e3f6363cf
|
fix issues
|
5 years ago |
Sultan Khan
|
8becd4f920
|
login issue fixed
|
5 years ago |
Sultan Khan
|
73c8e00852
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
2059b76fc1
|
fix Medical profile
|
5 years ago |
Sultan Khan
|
a0baaac314
|
bug fixes
|
5 years ago |
Sultan Khan
|
040c8f38ab
|
hot fixes
|
5 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
|
5 years ago |
Zohaib Kambrani
|
d8996cf879
|
Geofence Android Finished
|
5 years ago |
Mohammad Aljammal
|
d28870a629
|
fix merge issues
|
5 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
|
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 |
Zohaib Kambrani
|
1dc9400ffc
|
Geofencing work in progress on android
|
5 years ago |
Sultan Khan
|
e312671e24
|
hot fixes
|
5 years ago |
Sultan Khan
|
cf642da661
|
landing page
|
5 years ago |
Sultan Khan
|
eec67ac930
|
big fixes
|
5 years ago |
Sultan Khan
|
8a554aa2f8
|
auth services fixed
|
5 years ago |
Sultan Khan
|
b759758a68
|
bug fixes
|
5 years ago |
Zohaib Kambrani
|
6f6ab8d987
|
no message
|
5 years ago |
Zohaib Kambrani
|
8457972fda
|
no message
|
5 years ago |
haroon amjad
|
951d9b553f
|
fixes & updates
|
5 years ago |
Zohaib Kambrani
|
92ba977fca
|
no message
|
5 years ago |
haroon amjad
|
1db5b15dcd
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
5 years ago |
haroon amjad
|
9ecaaa1b12
|
radiology fix in appointment details
|
5 years ago |
Sultan Khan
|
9d9d77ee3a
|
bug fixes
|
5 years ago |
Sultan Khan
|
e28209d4e8
|
bug fixes
|
5 years ago |
Sultan Khan
|
81c8239412
|
bug fixes
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
Sultan Khan
|
5bb780c4ac
|
push
|
5 years ago |
Sultan Khan
|
7c33c06c0c
|
fingerprint
|
5 years ago |
Sultan Khan
|
8d499704dc
|
family file changes
|
5 years ago |
Sultan Khan
|
2f454055b9
|
login fixed
|
5 years ago |
Sultan Khan
|
6e152951b4
|
notification count
|
5 years ago |
Sultan Khan
|
00b0154987
|
my family
|
5 years ago |
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
5 years ago |
Sultan Khan
|
1eb6516ea6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Mohammad Aljmma
|
5b3a4e674d
|
fix issue#2
|
5 years ago |
Mohammad Aljmma
|
27594f15b8
|
fix issue#1
|
5 years ago |
Sultan Khan
|
283473a06a
|
theme changes
|
5 years ago |
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
5 years ago |
haroon amjad
|
5020c24e8b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/services/authentication/auth_provider.dart
|
5 years ago |
Sultan Khan
|
b9b5797cbc
|
login issue fixed
|
5 years ago |
haroon amjad
|
4f53d058d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
mosazaid
|
11ff27bae3
|
Merge branch 'master' 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/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
5 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
5 years ago |
Mohammad Aljmma
|
d4be20b07b
|
add icons
|
5 years ago |