Commit Graph

112 Commits (6a74cdd2da0aeea6130701aa0e6097ab0fc4e31e)

Author SHA1 Message Date
Sultan khan 6a74cdd2da Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan 70077c97db local auth change 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
haroon amjad 70176e0cb1 updates 2 years ago
devamirsaleemahmad 8f591654a5 changes 2 years ago
devamirsaleemahmad cbc38940ea changes 2 years ago
devamirsaleemahmad c1fd6313b1 changes 2 years ago
haroon amjad c5e88ac7ba fixes 2 years ago
haroon amjad a9ae44ca89 Implemented checks for InPatient CR 3 years ago
haroon amjad d251ca0e1c Inpatient medical instructions implemented 3 years ago
haroon amjad d261557cd7 Admitted patient API changed 3 years ago
haroon amjad 078482c21d updates 3 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
haroon amjad 9d2df00d87 Get General instructions implemented 3 years ago
Sultan khan c48f393f95 Dubai registration fixed 3 years ago
haroon amjad 9a7d0af6ea InPatient API implemented 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 4 years ago
haroon amjad 7018696328 E-Cens sign off 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
Zohaib Iqbal Kambrani 1523fd5ade Analytics for login registration 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
Zohaib Iqbal Kambrani a8e1ba6b86 no message 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad 2cff7c3246 LiveCare design fixes 4 years ago
haroon amjad 1f077f71f8 no message 4 years ago
Sultan Khan eaea14ce3d registration 4 years ago
Sultan Khan 496c6ce32e registration done 4 years ago
Sultan Khan e3a7c08e7c blood type changes 4 years ago
Sultan Khan 5c8b809e39 family file fixes 4 years ago
haroon amjad 2c4ff16f0c updates & fixes 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Sultan Khan 76e16594ba FAMILY FILES 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
Sultan Khan 2ebfdcfdd7 login issue fixed 4 years ago
Sultan Khan dd58b8637b bug fixs 4 years ago
haroon amjad f795ba24c5 updates & fixes 5 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 5 years ago
haroon amjad 9ffe064a3b updates & fixes 5 years ago
haroon amjad a10253736a Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
5 years ago
haroon amjad 44d59ed01a updates & fixes 5 years ago
Sikander Saleem ca363adee2 merge & improvements 5 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
5 years ago
Sikander Saleem e9db30d3da otp clear when wrong code entered. 5 years ago
Sikander Saleem 5647ab75e5 improvements. 5 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 5 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 5 years ago
Sikander Saleem 70614d3555 merge improvements-1. 5 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem f6ae7ed770 merge changes-4 5 years ago