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
|
30c14c2167
|
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
# ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
# lib/core/model/reports/Reports.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/medical/ask_doctor_view_model.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/PrescriptionReport.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/medical/eye/EyeHomePage.dart
# lib/pages/medical/reports/report_list_widget.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/location_util.dart
# lib/uitl/utils.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
3 years ago |
 haroon amjad
|
e5d8505c2d
|
Updates & fixes
|
3 years ago |
|
Sultan khan
|
8c46d2577d
|
updated with assets
|
3 years ago |
devamirsaleemahmad
|
971bab465c
|
models updates -> 3.13.6
|
3 years ago |
|
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
3 years ago |
haroon amjad
|
106334c9cf
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
4ba37d342c
|
RRT Updates
|
4 years ago |
|
haroon amjad
|
b752b42a34
|
Updates & fixes
|
5 years ago |
|
haroon amjad
|
72784f68b9
|
Fixes & updates
|
5 years ago |
|
haroon amjad
|
1fff2dad25
|
Smartwatch updates
|
5 years ago |
|
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
5 years ago |
|
haroon amjad
|
259581c4f8
|
updates & fixes
|
5 years ago |
Sultan Khan
|
2c1d7c511e
|
family file changes
|
5 years ago |
|
haroon amjad
|
f6d779431a
|
fixes
|
5 years ago |
|
Sultan Khan
|
fc9f2fc34e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
5 years ago |
|
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
5 years ago |
|
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
5 years ago |
|
haroon amjad
|
7467da7409
|
Imports organized
|
5 years ago |
|
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
5 years ago |
|
Zohaib Iqbal Kambrani
|
e4256d6874
|
RRT in progress (Service implementations)
|
5 years ago |
|
Zohaib Iqbal Kambrani
|
4da163d186
|
RRT in progress in stage
|
5 years ago |