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
|
f38f53587b
|
fix issues
|
5 years ago |
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
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 |
Mohammad Aljammal
|
554ed1b50a
|
fix insurance update
|
5 years ago |
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
5 years ago |
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
5 years ago |
Mohammad Aljammal
|
3daef6e53f
|
add images info
|
5 years ago |
Sultan Khan
|
078183c1fb
|
not authenticated page updated
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
Sultan Khan
|
bedafa24cd
|
insurance details
|
5 years ago |
Mohammad Aljmma
|
6a83538544
|
add info for Medical
|
5 years ago |
Mohammad Aljmma
|
a077d87dd8
|
fix user authentication data
|
5 years ago |
Mohammad Aljmma
|
7d2f1cf318
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication
|
5 years ago |
Mohammad Aljmma
|
570aa514cd
|
fix user authentication data
|
5 years ago |
Elham Rababah
|
5ed4d76a54
|
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljmma
|
747cffacfc
|
fix lab result
|
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 |
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
5 years ago |
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
5 years ago |
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
5 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
5 years ago |
Elham Rababah
|
fa88e9055f
|
make loader center
|
5 years ago |
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
5 years ago |
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
5 years ago |
Mohammad Aljmma
|
0b90d3c687
|
fix issues
|
5 years ago |
Mohammad Aljmma
|
894494ec4e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
ios/Flutter/.last_build_id
lib/main.dart
lib/pages/landing/home_page.dart
|
5 years ago |
Mohammad Aljmma
|
874de15040
|
change the home page design
|
5 years ago |
Mohammad Aljammal
|
94c25d2188
|
Merge branch 'loader' into 'diplomatic-quarter-live'
Loader
See merge request Cloud_Solution/diplomatic-quarter!84
|
5 years ago |
Elham Rababah
|
bf412e1edf
|
Finish loader as Gif image in all cases where the network is busy
|
5 years ago |
Elham Rababah
|
cd7c354458
|
loader first step
|
5 years ago |
haroon amjad
|
3354058738
|
Branding updated according to DQ
|
5 years ago |
Sultan Khan
|
deb828b4dd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
23b48485ed
|
voice command
|
5 years ago |
jammal
|
9328f942ba
|
done ER service
|
5 years ago |
Mohammad Aljammal
|
e025321c71
|
fix issues
|
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 |
Mohammad Aljammal
|
d3d0fa00e7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
Conflicts:
lib/pages/landing/home_page.dart
|
5 years ago |
Sultan Khan
|
d0d262f139
|
robot icon updates
|
5 years ago |
Sultan Khan
|
3ad928902b
|
voice command
|
5 years ago |
Mohammad Aljammal
|
84bb68789d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
Conflicts:
lib/config/config.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/ContactUs/findus/hospitrals_page.dart
lib/pages/ContactUs/findus/pharmacies_page.dart
|
5 years ago |
Mohammad Aljammal
|
06416b4934
|
add Not authenticated Page
|
5 years ago |
Sultan Khan
|
7b6135a6c7
|
voice search
|
5 years ago |
Sultan Khan
|
8f18d1025a
|
voice search
|
5 years ago |
Sultan Khan
|
227731f8f8
|
Merge
|
5 years ago |
Sultan Khan
|
ea86e88e2e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
5c859034d6
|
voice search
|
5 years ago |