Commit Graph

1603 Commits (e97354e574267e462dded0ea223418b08dbb6bdc)
 

Author SHA1 Message Date
Mohammad Aljammal e97354e574 Merge branch 'revert-68491631' into 'development'
Revert "Merge branch 'foote_in_all_pages' into 'development'"

See merge request Cloud_Solution/diplomatic-quarter!374
4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
haroon amjad 1db2f9ab03 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!372
4 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 4 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 4 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 4 years ago
Mohammad Aljammal 68491631f3 Merge branch 'foote_in_all_pages' into 'development'
Foote in all pages

See merge request Cloud_Solution/diplomatic-quarter!369
4 years ago
Mohammad Aljammal 79430e2243 Merge branch 'ZohaibIqbalKambrani' into 'development'
Covid Drive-Thru Questions Screen

See merge request Cloud_Solution/diplomatic-quarter!371
4 years ago
Zohaib Iqbal Kambrani d33432d238 Covid Drive-Thru Questions Screen 4 years ago
haroon amjad 73097d15de Covid Lab result generate certificate implemented 4 years ago
Elham Rababh 9777b3f2ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago
haroon amjad 6a692ebd08 Merge branch 'Haroon' into 'development'
Dental flow fixes

See merge request Cloud_Solution/diplomatic-quarter!368
4 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
4 years ago
haroon amjad 5f521556dc Dental flow fixes 4 years ago
Sultan khan 7348baa62c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!367
4 years ago
haroon amjad 3235f489b9 Merge branch 'development' into Haroon 4 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 4 years ago
Sultan khan 66f6b403c0 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!366
4 years ago
Sultan Khan 301728ed3d family file fix 4 years ago
Sultan Khan 59892870e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 9e31a3c560 bug fixes 4 years ago
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
4 years ago
Elham Rababh 1fefbfb76e return bottom sheet inside appointments list 4 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 11ffed2ae3 bug fixes 4 years ago
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
Elham Rababh ab2fc6aa2c fix issues related to footer 4 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 4 years ago
Mohammad Aljammal b98a84bcac Merge branch 'fatima-new' into 'development'
Fatima new

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

See merge request Cloud_Solution/diplomatic-quarter!362
4 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 4 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
4 years ago
Elham Rababh d028ce22dc remove unused code 4 years ago
hussam al-habibeh fe83b91602 body fat texfield fix 4 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 4 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 4 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
4 years ago
Fatimah Alshammari 34ccb132dc fixed issues 4 years ago
Mohammad Aljammal 10f4a30921 Merge branch 'fix_feedback' into 'development'
Fix feedback

See merge request Cloud_Solution/diplomatic-quarter!360
4 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 4 years ago
Fatimah Alshammari 74d0826342 fixed issues 4 years ago
Sultan khan 04a68c5bd3 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

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

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

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

See merge request Cloud_Solution/diplomatic-quarter!357
4 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
4 years ago