Commit Graph

367 Commits (25fb5decc0783c7c8cfe9c1b5f6801792506b5c1)

Author SHA1 Message Date
haroon amjad 25fb5decc0 Ask Doctor page fixes 3 years ago
Sikander Saleem 120e6c166d Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem c84707ba3f monthly report request & sick leaves ui redesigned. 3 years ago
haroon amjad 9ffe064a3b updates & fixes 3 years ago
Sultan Khan d2d22ff1fc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
Sultan Khan 73ff5c4707 Bug 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 4f85652562 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique f577905dcb eye measurment new design 3 years ago
Sultan Khan 52665fe217 login issue fixed 3 years ago
haroon amjad 4560037f97 updates 3 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 3 years ago
Sikander Saleem ca363adee2 merge & improvements 3 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
3 years ago
Mirza.Shafique ba0c0beef6 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
haroon amjad d83a611d95 FCM Permission fix 3 years ago
Mirza.Shafique bd1cf9bcc7 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
#	lib/widgets/drawer/app_drawer_widget.dart
3 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 3 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
3 years ago
Sikander Saleem 71f888ea9b improvements 3 years ago
Sikander Saleem bb18645d85 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan 301728ed3d family file fix 3 years ago
Mirza.Shafique 0a83cf8241 Bug Fixis 3 years ago
Sultan Khan 9e31a3c560 bug fixes 3 years ago
haroon amjad 3f29bbd6b3 Updates & fixes 3 years ago
Sultan Khan 11ffed2ae3 bug fixes 3 years ago
Sikander Saleem 5647ab75e5 improvements. 3 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
3 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 3 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 3 years ago
Sultan khan cd56881d7a Merge branch 'pharmacy-bugs' into 'development'
hide Covid19-driveThrow for patient out of KSA

See merge request Cloud_Solution/diplomatic-quarter!353
3 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 3 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 3 years ago
hussam al-habibeh 352cda4c70 hide Covid19-driveThrow for patient out of KSA 3 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 3 years ago
Mirza.Shafique 876463c945 Home Page Font weight 3 years ago
Mirza.Shafique 85c759a4a5 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Sultan Khan 6b7eaaafb9 fixes 3 years ago
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 3 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 3 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 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
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique e9e3b079b3 Medical Profile Complete 1.1 3 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 3 years ago