Commit Graph

1111 Commits (3b4e7910171b3b53da48b7acb6561275f5e4ca10)
 

Author SHA1 Message Date
mosazaid c058cf0e93 finish address add/edit/delete/select 4 years ago
haroon amjad 75de755ccd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid 6ac8d67b83 finish address add/edit/delete/select 4 years ago
Zohaib Kambrani c10d024700 no message 4 years ago
Mohammad Aljammal 7bf181f3a6 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix

See merge request Cloud_Solution/diplomatic-quarter!175
4 years ago
Mohammad Aljammal 08aa2de69b fix Prescriptions Service and design issues 4 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 4 years ago
Mohammad Aljammal a2ec01be5d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 4 years ago
haroon amjad 740a294867 Translation & bug fixes 4 years ago
Mohammad Aljammal 62b923b25e fix send rad report email 4 years ago
Mohammad Aljammal 5083080ba3 fix vital sign details 4 years ago
haroon amjad 1db5b15dcd Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
haroon amjad 9ecaaa1b12 radiology fix in appointment details 4 years ago
Mohammad Aljammal 6fd405e9eb Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!173
4 years ago
Sultan Khan e71c28472d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 9d9d77ee3a bug fixes 4 years ago
Mohammad Aljammal 4705a79245 Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes

See merge request Cloud_Solution/diplomatic-quarter!170
4 years ago
Sultan Khan c813deea29 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal be586892d3 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!171
4 years ago
haroon amjad d14e7e5223 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan e28209d4e8 bug fixes 4 years ago
Haroon Amjad 9d3c64200e fixes 4 years ago
Mohammad Aljammal 9cec304712 Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes

See merge request Cloud_Solution/diplomatic-quarter!168
4 years ago
Mohammad Aljammal f9ac57e5b9 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix

See merge request Cloud_Solution/diplomatic-quarter!169
4 years ago
Mohammad Aljammal eca2266f7b hot fixing 4 years ago
Sultan Khan 21ccf1ef86 bug fixes 4 years ago
hussam al-habibeh e85b21c08f parent_categorise_page update 4 years ago
haroon amjad c4bb75eab4 Doctor rating fixed 4 years ago
haroon amjad 8d20762050 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 33956db22a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad b55681a056 Working on steps tracking 4 years ago
Mohammad Aljammal f7ee16f115 Merge branch 'privileges' into 'master'
Privileges

See merge request Cloud_Solution/diplomatic-quarter!167
4 years ago
Mohammad Aljammal a1e92e1fdd fix merge issue 4 years ago
Mohammad Aljammal 9dfd8a71dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
 Conflicts:
	lib/locator.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/login/confirm-login.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/widgets/bottom_navigation/bottom_nav_bar.dart
	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mohammad Aljammal 9b8599a2cf remove load user from SplashScreen 4 years ago
Mohammad Aljammal 735ed91f9c Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
fix LabResult

See merge request Cloud_Solution/diplomatic-quarter!166
4 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 4 years ago
haroon amjad 8cd3ae915b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 468bb0356c updates & fixes 4 years ago
Mohammad Aljammal 6ae2bfe790 Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
remove updated button

See merge request Cloud_Solution/diplomatic-quarter!164
4 years ago
Mohammad Aljammal 14f92f6c58 remove updated button 4 years ago
Mohammad Aljammal 1b90ba54df Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
Fix insurance update

See merge request Cloud_Solution/diplomatic-quarter!163
4 years ago
Mohammad Aljammal 554ed1b50a fix insurance update 4 years ago
Mohammad Aljammal 9fecf8e89f fix insurance update 4 years ago
Mohammad Aljammal 935e72975c add new privilege 4 years ago
haroon amjad e495d3e5ad Health Data integration implementing 4 years ago
enadhilal 727940c5c6 fixed merging issues 4 years ago
haroon amjad cf6686e413 Merge branch 'master' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid 378562b781 adding some changes in order pages like translate texts 4 years ago