Sultan khan
|
08b4c8f86e
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/viewModels/project_view_model.dart
# lib/main.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/LiveCareHistoryCard.dart
# lib/pages/medical/eye/ContactLensPage.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/widgets/Loader/gif_loader_container.dart
# lib/widgets/data_display/medical/time_line_new_widget.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
Sultan khan
|
eee2ccf148
|
updates
|
2 years ago |
Sultan khan
|
4b28581c55
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/models/Appointments/toDoCountProviderModel.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/login/login.dart
# lib/services/authentication/auth_provider.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
2 years ago |
haroon amjad
|
fddb423451
|
Updates & fixes
|
2 years ago |
Sultan khan
|
c1fbce7eae
|
bug fixes
|
2 years ago |
Sultan khan
|
4338da513d
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/core/model/labs/request_patient_lab_special_result.dart
# lib/core/model/labs/request_send_lab_report_email.dart
# lib/core/model/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.dart
# lib/core/model/rate/appoitment_rated.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/labs_service.dart
# lib/core/service/medical/radiology_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/models/Authentication/check_activation_code_request.dart
# lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/login/confirm-login.dart
# lib/pages/login/login.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/services/authentication/auth_provider.dart
# lib/splashPage.dart
# lib/uitl/push-notification-handler.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
2 years ago |
haroon amjad
|
512db615be
|
Language ID fixes & app update to stores, VersionID 11.5
|
2 years ago |
haroon amjad
|
bcfeff2661
|
updates
|
2 years ago |
Aamir Muhammad
|
77651f9652
|
Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/project_view_model.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/login/confirm-login.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/push-notification-handler.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/uitl/utils_new.dart
# lib/widgets/avatar/large_avatar.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/bottom_options/BottomSheet.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
devamirsaleemahmad
|
ed748a626b
|
changes
|
2 years ago |
devamirsaleemahmad
|
3f1ba19c64
|
changes & Null to Dynamic
|
2 years ago |
Sultan khan
|
c63a1fadf5
|
code updated in-progress
|
2 years ago |
haroon amjad
|
2fea4b2b07
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/pages/landing/widgets/services_view.dart
|
3 years ago |
Sultan khan
|
c48f393f95
|
Dubai registration fixed
|
3 years ago |
haroon amjad
|
128bd2ec54
|
Inpatient services implementation
|
3 years ago |
haroon amjad
|
d75615a2eb
|
Updates & fixes
|
3 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
3 years ago |
haroon amjad
|
2ba744c3a6
|
Timezone fixes & Activate/Deactivate file changes
|
3 years ago |
haroon amjad
|
3107d1e86d
|
Updates & fixes
|
4 years ago |
Sultan Khan
|
496c6ce32e
|
registration done
|
4 years ago |
Sultan Khan
|
e3a7c08e7c
|
blood type changes
|
4 years ago |
Sultan Khan
|
2ebfdcfdd7
|
login issue fixed
|
4 years ago |
Sultan Khan
|
b1453b52e3
|
registration
|
4 years ago |
Sultan Khan
|
97d7f9225e
|
package name changed
|
4 years ago |
Sikander Saleem
|
eb9005510d
|
bug fixes and insurance approvals improvements.
|
5 years ago |
Sultan Khan
|
3d6858d0ec
|
bug fixes
|
5 years ago |
Sultan Khan
|
1b770420be
|
bug fixes
|
5 years ago |
Sultan Khan
|
c65983bfdb
|
code merged
|
5 years ago |
Sultan Khan
|
f5b7d35f23
|
bug fixes
|
5 years ago |
Sultan Khan
|
571bda9100
|
permission
|
5 years ago |
Sultan Khan
|
2f454055b9
|
login fixed
|
5 years ago |
Sultan Khan
|
6e152951b4
|
notification count
|
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
|
f05b235cd0
|
login issue
|
5 years ago |
Sultan Khan
|
aa8f9f18e1
|
forgot password
|
5 years ago |
Sultan Khan
|
b9b5797cbc
|
login issue fixed
|
5 years ago |
haroon amjad
|
dbb53e7821
|
fixed forgot password issue, Implemented new loader in login flow
|
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
|
53bbafdc2b
|
fix Authenticated User Object
|
5 years ago |
Sultan Khan
|
8f18d1025a
|
voice search
|
5 years ago |
Mohammad Aljammal
|
54b766de81
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Mohammad Aljammal
|
01a011a03d
|
done dashboard page
|
5 years ago |
Sultan Khan
|
4c1a8dc38f
|
new changes
|
5 years ago |
haroon amjad
|
7d0efda1c4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/medical_profile_page.dart
# lib/services/authentication/auth_provider.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
6 years ago |
Sultan Khan
|
8ee3b3b557
|
family files.
|
6 years ago |
Sultan Khan
|
8e3fb6831d
|
registration changes
|
6 years ago |
Sultan Khan
|
e735855c33
|
registration done.
|
6 years ago |
haroon amjad
|
28fde5c500
|
My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates
|
6 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
|
6 years ago |