Commit Graph

276 Commits (c050c3f18939e5081af494b96aff7d99f6208906)

Author SHA1 Message Date
Sultan Khan c050c3f189 voice command updated 4 years ago
Sultan Khan f083912d43 voice command updated 4 years ago
Sultan Khan af1c59394c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 496163a61a voice command updated 4 years ago
hussam al-habibeh a1906a4072 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
4 years ago
umasoodch b5413d1749 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 92b0b6d6ea Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan a3e01ff938 flutter tts 4 years ago
Sultan Khan 321d31b3bd voice search page updated 4 years ago
hussam al-habibeh 64cbae3602 Search 4 years ago
mosazaid 35d0d3e441 finsi lakum points task 4 years ago
Sultan Khan 98f84c2161 voice search in progress 4 years ago
Elham Rababah ea195ea9bf Finish translate CMC HHC 4 years ago
mosazaid 98f660e29b Merge branch 'pharmacy' 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/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 4 years ago
umasoodch 0431eb1ac8 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
4 years ago
Sultan Khan 8de838a6dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 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
4 years ago
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 4 years ago
Mohammad Aljammal 2185f5ce11 Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!138
4 years ago
Elham Rababah 05deaa6322 Address Added Successfully 4 years ago
Sultan Khan 078183c1fb not authenticated page updated 4 years ago
Sultan Khan de2a5e55eb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 4 years ago
Sultan Khan 648d9d245d health weather indicator 4 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 4 years ago
haroon amjad 97b8aeeff5 Version Control finished 4 years ago
Sultan Khan e7c862c801 health weather indicator 4 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Sultan Khan 603833db37 login changes 4 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 4 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
4 years ago
haroon amjad ebb8a8fa2c Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 4 years ago
haroon amjad c74ac3b7ca Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 85062859c8 updates 4 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 4 years ago
Sultan Khan 6bbdf05f90 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 857fc813cd button feedback 4 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 4 years ago
Sultan Khan 8d499704dc family file changes 4 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
4 years ago
Sultan Khan 18a2393d92 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 6e152951b4 notification count 4 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
4 years ago
Sultan Khan d2f391ab7f setting page inprogress 4 years ago
Sultan Khan 0ed29be214 launch 4 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 91be66ecdd family file changes 4 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 4 years ago