Commit Graph

1880 Commits (e48d4e5eb258ea1fba7b0aab74d66d15e836dfd0)
 

Author SHA1 Message Date
Fatimah Alshammari ed68eed9df added links for profile 5 years ago
Mohammad Aljammal 03a81c7832 Merge branch 'merge_diplomatic_quarter_live_to_master' into 'master'
Merge diplomatic quarter live to master

See merge request Cloud_Solution/diplomatic-quarter!161
5 years ago
Mohammad Aljammal 2e2a29145c fix merge issues 5 years ago
Mohammad Aljammal 459ba828d9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/vital_sign/vital_sign_item.dart
	lib/routes.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 5f12eab870 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
added countdown timer in my appointments

See merge request Cloud_Solution/diplomatic-quarter!159
5 years ago
haroon amjad 59aba6608d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad a1f91d99b3 added countdown timer in my appointments 5 years ago
Fatimah Alshammari 706980248a Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal c65477f7d9 Merge branch 'revert-133450e5' into 'master'
Revert "Merge branch 'pharmacy-hussam' into 'master'"

See merge request Cloud_Solution/diplomatic-quarter!158
5 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
5 years ago
Fatimah Alshammari 9b8103bfd6 fixe order and order details 5 years ago
Sultan Khan af1c59394c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 496163a61a voice command updated 5 years ago
Sultan Khan 83ac5b7031 voice command updated 5 years ago
Mohammad Aljammal 133450e503 Merge branch 'pharmacy-hussam' into 'master'
Pharmacy hussam

See merge request Cloud_Solution/diplomatic-quarter!149
5 years ago
Mohammad Aljammal 092f415457 Merge branch 'fix_issues' into 'diplomatic-quarter-live'
add missing translation

See merge request Cloud_Solution/diplomatic-quarter!157
5 years ago
Mohammad Aljammal 47e4b99f11 fix issues 5 years ago
Mohammad Aljammal 9e8def6584 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 7f23f356f1 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!151
5 years ago
Mohammad Aljammal 0bf47dcc76 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app

See merge request Cloud_Solution/diplomatic-quarter!156
5 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 5 years ago
haroon amjad 9575a236d4 Merge branch 'pharmacy-hussam' into 'pharmacy'
Pharmacy hussam

See merge request Cloud_Solution/diplomatic-quarter!155
5 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 5 years ago
hussam al-habibeh 5dc3c53550 mousa and hussam branch 5 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
5 years ago
hussam al-habibeh 800565407d 12/6 5 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 5 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
5 years ago
mosazaid 7ee7ef58c4 working on dynamic title on pharmacy 5 years ago
umasoodch 1f9d592268 removed access key code in pubspec 5 years ago
umasoodch b5413d1749 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
umasoodch 9f0fd8f144 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy 5 years ago
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 5 years ago
haroon amjad a85ef855f5 Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
commit

See merge request Cloud_Solution/diplomatic-quarter!153
5 years ago
mosazaid 2a91ae787f commit 5 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
5 years ago
hussam al-habibeh 8b8207cb0d search 5 years ago
Sultan Khan 68d88acd64 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan e34a5c3c13 multiple login calls fixed 5 years ago
Mohammad Aljammal 23d458f035 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!150
5 years ago
Sultan Khan f5b7d35f23 bug fixes 5 years ago
Sultan Khan ec3e8bf7d9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 4669252d1f flutter tts 5 years ago
Sultan Khan a3e01ff938 flutter tts 5 years ago
Sultan Khan e3e868e47c flutter tts updated 5 years ago
Sultan Khan 8c5746f7b1 bug fixes 5 years ago
Sultan Khan 8d7cc20b70 localized value updated 5 years ago
Sultan Khan 321d31b3bd voice search page updated 5 years ago
Sultan Khan d69b3676a4 weather indicator in progress 5 years ago
hussam al-habibeh 64cbae3602 Search 5 years ago