Commit Graph

100 Commits (4338da513ddae769c3cfb88b2c473dc4dcf529d2)

Author SHA1 Message Date
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
Sultan khan 359a177797 updates 2 years ago
Sultan khan f2079d4bbd payment fix 2 years ago
Aamir Muhammad 542864c89c Gif Loader & My Family Fixes 2 years ago
Sultan khan 8c46d2577d updated with assets 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 1c19b36d2d models updates -> 3.13.6 2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
Sultan khan abcf82346e Excluded change 2 years ago
Sultan khan 83859e05f1 family file approve reject button refresh 3 years ago
haroon amjad fcf0c589a0 Updates & fixes 3 years ago
haroon amjad bc97cfa95b Update Insurance changes 4 years ago
Sikander Saleem 27d0d80017 Merge branch 'development_v2.5' into sikander_family_profile_switch
# Conflicts:
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Sikander Saleem bcf746aa0b Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 4 years ago
Sikander Saleem 1b82146303 my family switch profile on dashboard. 4 years ago
Sikander Saleem fd73c248e2 my family switch profile improvement. 4 years ago
haroon amjad a918d409fb updates & fixes 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad 14b85cc407 Family files API changes 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 4 years ago
haroon amjad 0c895348e7 my family fix 4 years ago
haroon amjad a710406317 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
Haroon Amjad 59dac89118 updates 4 years ago
haroon amjad 43a672cc68 Updates & fixes 4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
Sultan Khan 18f35a22bb FAMILY FILE 4 years ago
Sultan Khan 5a9ab457e5 family files 4 years ago
Sultan Khan 4780039cc7 family file change 4 years ago
Sultan Khan 448a3aaa48 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 881644a22e family files changes 4 years ago
Sultan khan f5b17444fe Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family

See merge request Cloud_Solution/diplomatic-quarter!441
4 years ago
Sultan Khan a39658206d my family 4 years ago
haroon amjad 40cbca565a fixes 4 years ago
Sultan Khan e3a7c08e7c blood type changes 4 years ago
Sultan Khan 3b4e03c618 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan b5cd6afa4b family file fixs 4 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
4 years ago
haroon amjad 022b1bd000 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan Khan 02f5b43b64 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan ca70926050 family file fixes 4 years ago
haroon amjad cb220031dd Updates & fixes 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
Haroon Amjad 1fa6a4409b Family files fixes 4 years ago
Sultan Khan 9010558dc9 family files changes 4 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
4 years ago
Sultan Khan 2c1d7c511e family file changes 4 years ago