Commit Graph

215 Commits (dc898a799d9019fa26effd4e4accbd6054d3f3fa)

Author SHA1 Message Date
Mohammad Aljammal dc898a799d Add Privileges 5 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 5 years ago
Mohammad Aljammal a556e8c1f8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/config.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 5 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 5 years ago
Sultan Khan 391e178484 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8d499704dc family file changes 5 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 5 years ago
Mohammad Aljammal dcbc0de69f fix prescription 5 years ago
Mohammad Aljammal 0d098def04 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
 Conflicts:
	assets/app_icons/config.json
	assets/app_icons/fonts/DQIcons.ttf
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/d_q_icons_icons.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/uitl/utils.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 5 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
5 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 5 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 5 years ago
Mohammad Aljmma 6523a1dea9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 5 years ago
Sultan Khan 3589b21590 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljmma 770d28033d fix issues#26 & 27 & 28 5 years ago
Mohammad Aljmma ed7b9d609f fix lab result 5 years ago
haroon amjad b81af62551 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad b89c1f03b3 language translation fixes 5 years ago
Sultan Khan 1f4f81b454 insurance card details 5 years ago
Sultan Khan bedafa24cd insurance details 5 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 5 years ago
Sultan Khan 1eb6516ea6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 5 years ago
Mohammad Aljmma a1684bdd9e fix issue #17 & 18 5 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 5 years ago
Sultan Khan d1336eec8b login type 5 years ago
Sultan Khan f05b235cd0 login issue 5 years ago
haroon amjad 506e32e8c8 Payment issues resolved 5 years ago
haroon amjad 05ad8f8db5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 5 years ago
haroon amjad ffbc7c4af4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljmma 7d2f1cf318 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication 5 years ago
Mohammad Aljmma 570aa514cd fix user authentication data 5 years ago
haroon amjad b7b7ead3ba Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad f0897881d1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Elham Rababah 124d388ee1 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
5 years ago
Mohammad Aljmma 4a4d5248a2 fix status issue 5 years ago
haroon amjad 5020c24e8b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/services/authentication/auth_provider.dart
5 years ago
Elham Rababah 5ed4d76a54 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 15a8e64e7c updates & fixes 5 years ago
Elham Rababah 41b919183f Fix bug on read notifications_page.dart 5 years ago
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 5 years ago
Mohammad Aljmma 747cffacfc fix lab result 5 years ago
mosazaid 2095f2c62a fix merge issue 5 years ago
mosazaid 11ff27bae3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 5 years ago