Commit Graph

1148 Commits (2ec9331d2f27e829f5c84e90a2ba2fef2b03f7bb)
 

Author SHA1 Message Date
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
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
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 d69b3676a4 weather indicator in progress 5 years ago
hussam al-habibeh 64cbae3602 Search 5 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
5 years ago
Mohammad Aljammal b8df3ef9e3 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!148
5 years ago
Sultan Khan 81c8239412 bug fixes 5 years ago
Sultan Khan fc0117754d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal efae246566 Merge branch 'images_info' into 'diplomatic-quarter-live'
Added info images description

See merge request Cloud_Solution/diplomatic-quarter!145
5 years ago
Mohammad Aljammal 1c23e28081 fix merge issues 5 years ago
Mohammad Aljammal ced86de9fe Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 269f682bd5 Added info images description 5 years ago
Mohammad Aljammal 76a9b7b9e2 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!144
5 years ago
mosazaid 35d0d3e441 finsi lakum points task 5 years ago
haroon amjad f1a8e09a59 Added info images description 5 years ago
haroon amjad 47b030eb82 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	ios/Flutter/.last_build_id
#	lib/config/config.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 5 years ago
Sultan Khan 3a055aa02b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 79c17de0de ltr issue fixed 5 years ago
Mohammad Aljammal 5d72ff7670 Merge branch 'images_info' into 'diplomatic-quarter-live'
add images info

See merge request Cloud_Solution/diplomatic-quarter!143
5 years ago
Mohammad Aljammal 3daef6e53f add images info 5 years ago
Mohammad Aljammal dc898a799d Add Privileges 5 years ago
Mohammad Aljammal dbca686adf Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!142
5 years ago