Commit Graph

73 Commits (bebcd8555751f1c2552aaeb5bcd3e71718a6e640)

Author SHA1 Message Date
Mirza.Shafique 1a6802ce24 Child Vaccine 3 3 years ago
Mirza.Shafique a766c2522e Child Vaccine 1.0 3 years ago
Mirza.Shafique dde16a13fe General page in profile 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 3 years ago
haroon amjad f795ba24c5 updates & fixes 3 years ago
Sikander Saleem d9c1b8b8ea Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/main.dart
#	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
#	lib/pages/medical/eye/EyeMeasurementsPage.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
haroon amjad 4469ae1209 updates & fixes 3 years ago
Mirza.Shafique f577905dcb eye measurment new design 3 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
3 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 3 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 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
3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 3 years ago
Sultan Khan 23ca95b9b6 bug fixes 3 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 3 years ago
Elham Rababah 6e7f62ca21 PAP-612: show ok and cancel options 4 years ago
Sultan Khan 66acce3b40 ancillary order pages added 4 years ago
Sultan Khan b891c1bd80 theme issue 4 years ago
Sikander Saleem aef4c7bfac H2O feature improvement 4 years ago
Sikander Saleem 3b4e791017 H2O feature improvement 4 years ago
mosazaid f5d478fd27 re-design child vaccine and fix some funcrionalities 4 years ago
Mohammad Aljammal 952e106531 return privilege 4 years ago
Mohammad Aljammal 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
4 years ago
Sultan Khan 040c8f38ab hot fixes 4 years ago
Mohammad Aljammal a57d5eb69f hot fixes 4 years ago
haroon amjad 951d9b553f fixes & updates 4 years ago
haroon amjad 9d046fd971 updates & fixes 4 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 4 years ago
Sultan Khan d69b3676a4 weather indicator in progress 4 years ago
Sultan Khan 81c8239412 bug fixes 4 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 4 years ago
Sultan Khan 648d9d245d health weather indicator 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
Mohammad Aljmma e42ebfbf64 fix issue #16 4 years ago
Mohammad Aljmma 59defa4532 fix issue #15 4 years ago
Elham Rababah 9f2beceb22 First step from notifications_page 4 years ago
Mohammad Aljmma f79d8eb8f9 fix login issues 4 years ago
Mohammad Aljmma e7e32a414b fix barcode 4 years ago
Sultan Khan deb828b4dd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad dfa7e0e02f updates & fixes 4 years ago
Sultan Khan f03a711dff symptom checker gender page updated 4 years ago
Mohammad Aljammal 29f0402cbd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/services/appointment_services/GetDoctorsList.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal d3d0fa00e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 4 years ago
Sultan Khan da317431ba Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal 847ccb9c07 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!62
4 years ago