 haroon amjad
|
20bfdc3652
|
Project Name Top & Bottom changes implemented
|
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 |
|
Sultan khan
|
86f5e81fea
|
merge with 3.3
|
3 years ago |
|
Sultan khan
|
d0c7b08eac
|
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/service/client/base_app_client.dart
lib/core/viewModels/er/EdOnlineViewModel.dart
lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
lib/pages/BookAppointment/DentalComplaints.dart
lib/pages/BookAppointment/components/SearchByClinic.dart
lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/landing/landing_page.dart
lib/pages/livecare/widgets/clinic_card.dart
lib/pages/login/login.dart
lib/pages/rateAppointment/rate_appointment_clinic.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/services/clinic_services/get_clinic_service.dart
lib/uitl/push-notification-handler.dart
lib/widgets/others/bottom_bar.dart
pubspec.yaml
|
3 years ago |
|
haroon amjad
|
4ac11b2169
|
LanguageID Fixes
|
3 years ago |
devamirsaleemahmad
|
9d1b153739
|
Dropdown Changed
|
3 years ago |
|
devamirsaleemahmad
|
2c9e51aef0
|
changes
|
3 years ago |
|
devamirsaleemahmad
|
9c2948db29
|
models updates -> 3.13.6
|
3 years ago |
|
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
3 years ago |
haroon amjad
|
75989bdc01
|
Health Calculators translations
|
5 years ago |
|
haroon amjad
|
d2834bb3dd
|
Health calculator fixes
|
5 years ago |
devmirza121
|
d4eab13982
|
Health Calculator 2.0
|
5 years ago |
|
devmirza121
|
0b8600605b
|
Health Calculator 1.0
|
5 years ago |
|
haroon amjad
|
73822300f9
|
Health Calculators APIs updated
|
5 years ago |
|
haroon amjad
|
7467da7409
|
Imports organized
|
5 years ago |
 Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
5 years ago |
|
Sikander Saleem
|
c07a8f54c7
|
merge changes-2
|
5 years ago |
hussam al-habibeh
|
bb6e7e931b
|
pharmacy-bugs
|
5 years ago |
|
hussam al-habibeh
|
14939d3513
|
jira bugs (Health Calculator)
|
5 years ago |
|
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
5 years ago |
mosazaid
|
0444b21101
|
Merge branch 'development' into hmg-services-fixing
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
6 years ago |
|
hussam al-habibeh
|
1ce0ef7b6c
|
health-converter fix
|
6 years ago |
|
hussam al-habibeh
|
cd36749e4e
|
files import fix
|
6 years ago |
|
hussam al-habibeh
|
dbda69baa1
|
health Calculator'General Health'
|
6 years ago |