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 |
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 |
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Zohaib Kambrani
|
67f4b4e167
|
iOS Geofence in progress
|
5 years ago |
Mohammad Aljammal
|
b25bdbb6fa
|
fix LiveChatPage Service LabOrderResult MedicineSearch issues
|
5 years ago |
Mohammad Aljammal
|
9cec304712
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
|
5 years ago |
Sultan Khan
|
21ccf1ef86
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
5 years ago |
Sultan Khan
|
f5b7d35f23
|
bug fixes
|
5 years ago |
haroon amjad
|
7edb0c8009
|
Doctor rating dialog revamped
|
5 years ago |
Zohaib Kambrani
|
1155466d19
|
Packages and Offer Slider at home
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
Sultan Khan
|
340b9770c8
|
login
|
5 years ago |
Mohammad Aljammal
|
0ac599ea1c
|
fix vital Sign
|
5 years ago |
Sultan Khan
|
8d499704dc
|
family file changes
|
5 years ago |
Mohammad Aljammal
|
0966269537
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
|
5 years ago |
Mohammad Aljammal
|
b785f87dac
|
fix App drawer after logout
|
5 years ago |
Sultan Khan
|
3589b21590
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
haroon amjad
|
b89c1f03b3
|
language translation fixes
|
5 years ago |
Sultan Khan
|
3fef1b9d52
|
theme and login issues fixed
|
5 years ago |
Sultan Khan
|
d1336eec8b
|
login type
|
5 years ago |
Sultan Khan
|
f05b235cd0
|
login issue
|
5 years ago |
mosazaid
|
2095f2c62a
|
fix merge issue
|
5 years ago |
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
5 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
5 years ago |
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
5 years ago |
jammal
|
9328f942ba
|
done ER service
|
5 years ago |
Mohammad Aljammal
|
29f0402cbd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
Conflicts:
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/pages/AlHabibMedicalService/ health_calculators.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/services/appointment_services/GetDoctorsList.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Sultan Khan
|
3ad928902b
|
voice command
|
5 years ago |
Mohammad Aljammal
|
06416b4934
|
add Not authenticated Page
|
5 years ago |
Elham Rababah
|
37d9eae9ea
|
improve E-referral
|
5 years ago |
haroon amjad
|
0628aef62a
|
applied dental change in SearchByClinic
|
5 years ago |
haroon amjad
|
cbf19f0cd1
|
Merge branch 'master' into 'Haroon'
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
5 years ago |
Mohammad Aljammal
|
b0f0b87345
|
fix merge issues
|
5 years ago |
haroon amjad
|
c5794e5c70
|
Dental flow in my appointments
|
5 years ago |
Mohammad Aljammal
|
68466c8d03
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/models/Appointments/DoctorListResponse.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
|
5 years ago |
Mohammad Aljammal
|
fe66ee5993
|
fix lab result issues
|
5 years ago |
haroon amjad
|
51078227ab
|
Dental appointment flow implemented
|
5 years ago |
Mohammad Aljammal
|
1b3a780a29
|
add ar lan for medical profile
|
5 years ago |
Mohammad Aljammal
|
ef4a57223c
|
fix DoctorView.dart UI issues
|
5 years ago |
Mohammad Aljammal
|
4bc806671a
|
Merge branch 'amjad_amireh' into 'master'
filter doctor by department
See merge request Cloud_Solution/diplomatic-quarter!33
|
5 years ago |
Mohammad Aljammal
|
9e47dc19f9
|
filter doctor by department
|
5 years ago |
Sultan Khan
|
3247378c02
|
search
|
5 years ago |
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Mohammad Aljammal
|
8989fbc9b7
|
done design dashboard
|
5 years ago |
Sultan Khan
|
8887ba85fe
|
family file
|
5 years ago |
Sultan Khan
|
cb99b2a7a7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
327c4585a6
|
family file change
|
5 years ago |