Commit Graph

22 Commits (068b6c84945adb6fb0805a8a0b29ec8daec5b11e)

Author SHA1 Message Date
Aamir.Muhammad 29c2fd067e Null fixes after merge from 3.13 2 years ago
Aamir.Muhammad 8441a0ef00 Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/pages/login/login.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	lib/uitl/utils.dart
#	lib/widgets/dialogs/radio_selection_dialog.dart
2 years ago
haroon amjad 6e30df2a29 WeCare service added 2 years ago
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
haroon amjad 5256d8873f ToDo & Appo Timeline changes 2 years ago
haroon amjad fe37de9621 Loading dialog updates 2 years ago
Sultan khan eee2ccf148 updates 2 years ago
Aamir Muhammad b6d222a7ea JIRA Fixes 2 years ago
devamirsaleemahmad 8f591654a5 changes 3 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 3 years ago
Sultan khan 0c534cffae code update in progress 3 years ago
Sultan khan 6a8de14d5d code update in progress 3 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 3 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 5 years ago
Sultan Khan 5c8b809e39 family file fixes 5 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 5 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 5 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 5 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 5 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago