Commit Graph

2997 Commits (a60f66a0691b5beaf802425bdf85a35ca60febfe)
 

Author SHA1 Message Date
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago
haroon amjad f98f1dae88 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!364
4 years ago
haroon amjad cbbca5ce86 Merge branch 'development' into Haroon 4 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 047941fffc Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 5647ab75e5 improvements. 4 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
4 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 4 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 5 years ago
Mirza.Shafique 8c8a9c7ce2 Medical Perscription 1.0 5 years ago
Sikander Saleem 350ff20a1a my doctor screen. 5 years ago
Mohammad Aljammal b98a84bcac Merge branch 'fatima-new' into 'development'
Fatima new

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

See merge request Cloud_Solution/diplomatic-quarter!362
5 years ago
Sikander Saleem ec6693c55e improvement. 5 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 5 years ago
Mirza.Shafique 24b7a8a4c4 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 5 years ago
Mirza.Shafique cbadcd5feb Vital Sings Detail Page 1.0 5 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
5 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
5 years ago
Elham Rababh d028ce22dc remove unused code 5 years ago
hussam al-habibeh fe83b91602 body fat texfield fix 5 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 5 years ago
Mirza.Shafique e91cf4762a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 5 years ago
Sikander Saleem b3fd1cb93d lab result detail flow chart screen & improvement. 5 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 5 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
5 years ago
Fatimah Alshammari 34ccb132dc fixed issues 5 years ago
Mohammad Aljammal 10f4a30921 Merge branch 'fix_feedback' into 'development'
Fix feedback

See merge request Cloud_Solution/diplomatic-quarter!360
5 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 5 years ago
Fatimah Alshammari d3eeaa15ac Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 74d0826342 fixed issues 5 years ago
Sultan khan 04a68c5bd3 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!358
5 years ago
Sultan khan b8d75b5604 Merge branch 'blood_pressure' into 'development'
add blood pressure translation issue

See merge request Cloud_Solution/diplomatic-quarter!356
5 years ago
Sultan khan 6a0acd8afb Merge branch 'fix-bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!355
5 years ago
Sultan Khan 5b656b0b51 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9610ff640e feedback changes 5 years ago
haroon amjad 335bc9a673 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!357
5 years ago
haroon amjad cbbef80bd5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad eadba3f767 Working on livecare appointment booking page 5 years ago
hussam al-habibeh b9d4195e20 Blood pressure translation issue 5 years ago
hussam al-habibeh 9c6f83600b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
mosazaid 3077624c58 fix bugs 5 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
5 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
5 years ago
Sultan khan 8eb67791ca Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!349
5 years ago
Sultan khan d321f07e82 Merge branch 'medication_availability' into 'development'
Medication availability

See merge request Cloud_Solution/diplomatic-quarter!348
5 years ago
Elham Rababh 8629b62fcb fix issue 5 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 5 years ago