Commit Graph

774 Commits (f083912d4398735e7c7bbae56670218c7d7408db)
 

Author SHA1 Message Date
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
Sultan Khan 83ac5b7031 voice command updated 4 years ago
Mohammad Aljammal 133450e503 Merge branch 'pharmacy-hussam' into 'master'
Pharmacy hussam

See merge request Cloud_Solution/diplomatic-quarter!149
4 years ago
hussam al-habibeh 5dc3c53550 mousa and hussam branch 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
hussam al-habibeh 800565407d 12/6 4 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 4 years ago
haroon amjad 257dc3d76d Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
create terms-condition in pharmacy order page

See merge request Cloud_Solution/diplomatic-quarter!154
4 years ago
mosazaid 7ee7ef58c4 working on dynamic title on pharmacy 4 years ago
umasoodch 1f9d592268 removed access key code in pubspec 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
umasoodch 9f0fd8f144 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy 4 years ago
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 4 years ago
haroon amjad a85ef855f5 Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
commit

See merge request Cloud_Solution/diplomatic-quarter!153
4 years ago
mosazaid 2a91ae787f commit 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
hussam al-habibeh 8b8207cb0d search 4 years ago
Sultan Khan 4669252d1f flutter tts 4 years ago
Sultan Khan a3e01ff938 flutter tts 4 years ago
Sultan Khan e3e868e47c flutter tts updated 4 years ago
Sultan Khan 8c5746f7b1 bug fixes 4 years ago
Sultan Khan 8d7cc20b70 localized value updated 4 years ago
Sultan Khan 321d31b3bd voice search page updated 4 years ago
hussam al-habibeh 64cbae3602 Search 4 years ago
Mohammad Aljammal 1394ceed3c Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
Pharmacy module feature home page

See merge request Cloud_Solution/diplomatic-quarter!147
4 years ago
Sultan Khan 36b9d5cf7c robot pages added 4 years ago
mosazaid 35d0d3e441 finsi lakum points task 4 years ago
Sultan Khan 3ab513d9d0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Mohammad Aljammal dbca686adf Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!142
4 years ago
Sultan Khan 98f84c2161 voice search in progress 4 years ago
Elham Rababah d9ffc5d3da remove duplicated package 4 years ago
Elham Rababah 713e44cf8b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah ea195ea9bf Finish translate CMC HHC 4 years ago
Sultan Khan 12d5ef69a9 voice search in progress 4 years ago
Mohammad Aljammal bda6f58aa3 Merge branch 'Haroon' into 'master'
working on ereferral

See merge request Cloud_Solution/diplomatic-quarter!141
4 years ago
haroon amjad 4f1f7dcefd ereferral implementation completed 4 years ago
haroon amjad 65fbd7af8e referral finalised 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 951c77feb5 working on lakum account 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
Elham Rababah 5bf63174c9 First step from translations 4 years ago
haroon amjad 82e23efd32 working on ereferral 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
Sultan Khan 2fb0ccfdbd Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Mohammad Aljammal 4b435199fc Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!139
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