Commit Graph

1169 Commits (75c0de091f2b35f446779c688958e2af09444f8e)

Author SHA1 Message Date
haroon amjad 44d59ed01a updates & fixes 3 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
3 years ago
haroon amjad b83318faf8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!382
3 years ago
haroon amjad f8c295defe Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!381
3 years ago
haroon amjad 8cb9a5e619 updates 3 years ago
haroon amjad faff3b90cb Merge branch 'development' into Haroon
# Conflicts:
#	lib/core/service/er/am_service.dart
3 years ago
haroon amjad e9ec2e2faf Ambulance request APIs revamped 3 years ago
Zohaib Iqbal Kambrani d9672c47a0 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  BUG FIXES
  fix issues  PAP-910,PAP-911
  fix bugs pharmacy
  Dental procedures implemented
  Revert "Merge branch 'foote_in_all_pages' into 'development'"
  fixed products issues
  calendar events changes
  Covid passport CR implemented in Covid test flow
  doctor schedule
  Covid certificate passport CR implemented
  Covid Lab result generate certificate implemented
  return bottom sheet inside appointments list
  fix issues related to footer
  remove unused code
  remove footer from pharmacy pages
  first step from add footer for all pages

# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari f09cdd944d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari 827d8733a1 fixed shopping cart issue 3 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan d1fc4751ad BUG FIXES 3 years ago
Zohaib Iqbal Kambrani d1c99d1d82 ER Average waiting time label applied 3 years ago
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 3 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 3 years ago
Elham Rababh 2e2f7334d5 fix issues PAP-910,PAP-911 3 years ago
Fatimah Alshammari b6981299d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari 239ad530ce fixed isuues 3 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!375
3 years ago
Mohammad Aljammal 8abbb04f02 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!373
3 years ago
mosazaid a2e60e7584 fix bugs pharmacy 3 years ago
haroon amjad e9c26ee85f Dental procedures implemented 3 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
3 years ago
Fatimah Alshammari 72ba0c7c74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 3 years ago
Sultan Khan b116079843 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 1a501a3b2a calendar events changes 3 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 3 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 3 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 3 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 3 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
3 years ago
Zohaib Iqbal Kambrani d33432d238 Covid Drive-Thru Questions Screen 3 years ago
Elham Rababh 9777b3f2ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 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
haroon amjad 5f521556dc Dental flow fixes 3 years ago
haroon amjad 3235f489b9 Merge branch 'development' into Haroon 3 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 3 years ago
Sultan Khan 301728ed3d family file fix 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
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
3 years ago
Elham Rababh 1fefbfb76e return bottom sheet inside appointments list 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
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 3 years ago
haroon amjad cbbca5ce86 Merge branch 'development' into Haroon 3 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 3 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 3 years ago