Commit Graph

13 Commits (6c9ab32d98669e70b173207c4c009aded655ffdb)

Author SHA1 Message Date
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
8 months ago
haroon amjad fe37de9621 Loading dialog updates 8 months ago
Aamir Muhammad 542864c89c Gif Loader & My Family Fixes 11 months ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 12 months ago
Sultan khan b45cbbcf29 updates 1 year ago
haroon amjad 106334c9cf updates & fixes 2 years ago
haroon amjad 2ba744c3a6 Timezone fixes & Activate/Deactivate file changes 2 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 3 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 4 years ago
Mohammad Aljmma 54a7f98eff fix login issues 4 years ago
Elham Rababah fa88e9055f make loader center 4 years ago
Elham Rababah 6f5b5ed0c2 move gif loader utils 4 years ago
Elham Rababah bf412e1edf Finish loader as Gif image in all cases where the network is busy 4 years ago