Commit Graph

154 Commits (ff0d66ccdbb9c6df99504dbd05c1b7cb446ca6e2)

Author SHA1 Message Date
haroon amjad ff0d66ccdb Covid test translations 5 years ago
haroon amjad 65fbd7af8e referral finalised 5 years ago
haroon amjad 6846a8501a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 5 years ago
Mohammad Aljammal 2185f5ce11 Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!138
5 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 5 years ago
haroon amjad 97b8aeeff5 Version Control finished 5 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah a87855f445 Fix issues on hhc module 5 years ago
Mohammad Aljammal 49974f81db add translations to 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 b6d2878cf1 add Radiology translations and colors 5 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 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 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
5 years ago
Mohammad Aljammal 3c1257b379 fix Medicine Search 5 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 91be66ecdd family file changes 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
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
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
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 59defa4532 fix issue #15 5 years ago
Mohammad Aljmma 5e8b61bf2d fix issue #13 5 years ago
Mohammad Aljmma a742f896be fix issue#4 5 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 5 years ago
Sultan Khan 283473a06a theme changes 5 years ago
Sultan Khan 4976870d2e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 875bf10c73 settings page added 5 years ago
Mohammad Aljmma 6a83538544 add info for Medical 5 years ago
Elham Rababah 64f970c40c Fix issues after the merge 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
Sultan Khan 0443a37886 register page updated 5 years ago
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 5 years ago
Sultan Khan d939b2ec9b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan f8e05fc447 regiter 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
Elham Rababah 9f2beceb22 First step from notifications_page 5 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 5 years ago
mosazaid d1ac4080ca working on pharmacy home page 5 years ago
Mohammad Aljmma 479aea4df8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljmma d4be20b07b add icons 5 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 5 years ago
haroon amjad 1553e71e7d New loading dialog added into appointment flow 5 years ago
Mohammad Aljmma 856ab52439 fix ui issues 5 years ago