Sultan Khan
|
cd7845b1a4
|
bug fix
|
4 years ago |
|
Sultan Khan
|
0445011e53
|
bug fixes
|
4 years ago |
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
Mohammad Aljammal
|
d477481856
|
fix security issues in pharmacy
|
4 years ago |
Mohammad Aljammal
|
bb42647c91
|
Merge branch 'development' into 'fix_pharmacy'
# Conflicts:
# lib/pages/login/login.dart
|
4 years ago |
|
Mohammad Aljammal
|
ab53ca82b1
|
fix colors issues
|
4 years ago |
 Sikander Saleem
|
8f37fbf260
|
Qr icon added, notify me api added & improvements
|
4 years ago |
|
Mohammad Aljammal
|
952e106531
|
return privilege
|
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 |
|
Sultan Khan
|
8becd4f920
|
login issue fixed
|
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
|
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 |
|
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 |
|
Sultan Khan
|
b759758a68
|
bug fixes
|
4 years ago |
Zohaib Kambrani
|
6f6ab8d987
|
no message
|
4 years ago |
Haroon Amjad
|
b9269f525a
|
hot fixes
|
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 |
|
Mohammad Aljammal
|
9cec304712
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
|
4 years ago |
|
Sultan Khan
|
21ccf1ef86
|
bug fixes
|
4 years ago |
|
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
4 years ago |
|
Sultan Khan
|
79c17de0de
|
ltr issue fixed
|
4 years ago |
|
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
|
Sultan Khan
|
8d499704dc
|
family file changes
|
4 years ago |
|
Sultan Khan
|
91be66ecdd
|
family file changes
|
4 years ago |
|
Sultan Khan
|
a16145d7f1
|
bugfixes
|
4 years ago |
|
Sultan Khan
|
3fef1b9d52
|
theme and login issues fixed
|
4 years ago |
|
Sultan Khan
|
58b1f648c1
|
setting theme
|
4 years ago |
Mohammad Aljmma
|
a077d87dd8
|
fix user authentication data
|
4 years ago |
|
Mohammad Aljmma
|
570aa514cd
|
fix user authentication data
|
4 years ago |
|
Mohammad Aljmma
|
4a4d5248a2
|
fix status issue
|
4 years ago |
|
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
4 years ago |
|
Mohammad Aljmma
|
54a7f98eff
|
fix login issues
|
4 years ago |
|
Mohammad Aljmma
|
a796e0392b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_login
Conflicts:
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
|
4 years ago |
|
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
4 years ago |
|
haroon amjad
|
af780bca76
|
registration fixes
|
4 years ago |
|
haroon amjad
|
dbb53e7821
|
fixed forgot password issue, Implemented new loader in login flow
|
4 years ago |
|
haroon amjad
|
d5118bda11
|
Login / Register UI fixes
|
4 years ago |
|
haroon amjad
|
6a630f6d33
|
logo & colors changed for login & registration flow
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
53bbafdc2b
|
fix Authenticated User Object
|
4 years ago |
|
Mohammad Aljammal
|
06416b4934
|
add Not authenticated Page
|
4 years ago |
|
Sultan Khan
|
227731f8f8
|
Merge
|
4 years ago |
|
Sultan Khan
|
ea86e88e2e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
2952fd56ab
|
Done Active Medications Service
|
4 years ago |
|
Sultan Khan
|
a535543863
|
more pages added on the voice search
|
4 years ago |
|
haroon amjad
|
823eda0d5c
|
updates
|
4 years ago |
|
Mohammad Aljammal
|
9cf5c80aae
|
add time line and appointment rate
|
4 years ago |
|
haroon amjad
|
00d9214460
|
Merge branch 'sultan' 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
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
Sultan Khan
|
ecfa1756d3
|
login changes
|
4 years ago |