Commit Graph

289 Commits (acd3855c77786d8bc0bebbe89ed51705b399d5fb)

Author SHA1 Message Date
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
Mirza.Shafique ca3495d71c Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Sultan Khan 59892870e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 9e31a3c560 bug fixes 3 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 3 years ago
Mirza.Shafique 374a14eac4 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
Mirza.Shafique 2a4e0a604a Medical Perscription 1.1 3 years ago
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
3 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 047941fffc Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 3 years ago
Mirza.Shafique 8c8a9c7ce2 Medical Perscription 1.0 3 years ago
Sikander Saleem 350ff20a1a my doctor screen. 3 years ago
Mirza.Shafique 24b7a8a4c4 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 3 years ago
Mirza.Shafique cbadcd5feb Vital Sings Detail Page 1.0 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
Mirza.Shafique e91cf4762a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 3 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 3 years ago
Fatimah Alshammari 74d0826342 fixed issues 3 years ago
hussam al-habibeh b9d4195e20 Blood pressure translation issue 3 years ago
Sultan khan 3c2a89cd8e Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and  sugar blood

See merge request Cloud_Solution/diplomatic-quarter!354
3 years ago
Elham Rababh 8629b62fcb fix issue 3 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 3 years ago
Sikander Saleem 6ee56cba0d Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/new_design/doctor_header.dart
3 years ago
Sikander Saleem bb20d65b40 lab result detail screen. 3 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 3 years ago
Mirza.Shafique 26c30038c9 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 3 years ago
Sikander Saleem 3a1af590ff lab result detail screen (cont.) 3 years ago
hussam al-habibeh 0a3c44b5e8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 3 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 3 years ago
haroon amjad a32501f3dc My invoices implementation continued 3 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 3 years ago
hussam al-habibeh d3868844de Medication availability 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
hussam al-habibeh 02df6f4d85 PAP-664 3 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
3 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Sikander Saleem 889ae24f07 merge changes-3 3 years ago
Sikander Saleem c07a8f54c7 merge changes-2 3 years ago
Sikander Saleem 14561d0ac6 merge changes-1 3 years ago