Commit Graph

1348 Commits (4152eafa176ad52ac3392f443325a5f45ac946f3)

Author SHA1 Message Date
Sikander Saleem 4152eafa17 Merge branch 'development_new_design_2.0' into new_design_sikander 3 years ago
Sikander Saleem 2ba91e54ab merge-changes 3 years ago
Sikander Saleem 94ff5cff40 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 970887b0c5 changes 3 years ago
haroon amjad 5f521556dc Dental flow fixes 3 years ago
Sikander Saleem acd3855c77 Merge branch 'development' into development_new_design_2.0 3 years ago
Sikander Saleem 71f888ea9b improvements 3 years ago
Sikander Saleem 288d64214e 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
haroon amjad 3235f489b9 Merge branch 'development' into Haroon 3 years ago
Sikander Saleem 51c398e84a Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem e9db30d3da otp clear when wrong code entered. 3 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 3 years ago
Sultan Khan 301728ed3d family file fix 3 years ago
Mirza.Shafique ca3495d71c Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 0a83cf8241 Bug Fixis 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
haroon amjad 3f29bbd6b3 Updates & fixes 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
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 11ffed2ae3 bug fixes 3 years ago
haroon amjad cbbca5ce86 Merge branch 'development' into Haroon 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
Sikander Saleem 5647ab75e5 improvements. 3 years ago
Mirza.Shafique b2bba050e8 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
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
Mohammad Aljammal b98a84bcac Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!361
3 years ago
Mohammad Aljammal 41f1704790 Merge branch 'blood_pressure' into 'development'
Blood pressure

See merge request Cloud_Solution/diplomatic-quarter!362
3 years ago
Sikander Saleem ec6693c55e improvement. 3 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 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
hussam al-habibeh fe83b91602 body fat texfield fix 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
Sikander Saleem b3fd1cb93d lab result detail flow chart screen & improvement. 3 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 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
Fatimah Alshammari 34ccb132dc fixed issues 3 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 3 years ago
Fatimah Alshammari 74d0826342 fixed issues 3 years ago