Commit Graph

704 Commits (709ba2ce97ebe368c90a14b48191311aff26713e)
 

Author SHA1 Message Date
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 4 years ago
mosazaid 2a91ae787f commit 4 years ago
mosazaid 35d0d3e441 finsi lakum points task 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
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
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
Mohammad Aljammal 2185f5ce11 Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!138
4 years ago
Elham Rababah 1e1677a365 naming issue fix 4 years ago
Elham Rababah 05deaa6322 Address Added Successfully 4 years ago
Elham Rababah 68e4b92717 Address Added Successfully 4 years ago
Elham Rababah ed56476d81 second step from location fixes 4 years ago
Mohammad Aljammal 1df9ed4a09 Merge branch 'child_vaccines' into 'master'
done child Vaccination

See merge request Cloud_Solution/diplomatic-quarter!136
4 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 4 years ago
haroon amjad 97b8aeeff5 Version Control finished 4 years ago
Elham Rababah 7aa7af6de7 finish CMC module 4 years ago
Elham Rababah fd80afeb5a finish hhc module 4 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababah a87855f445 Fix issues on hhc module 4 years ago
Mohammad Aljammal 3c54ed00f9 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!134
4 years ago
Mohammad Aljammal 49974f81db add translations to child Vaccination 4 years ago
Mohammad Aljammal fa01d132c7 merger DQ live and fix some issues on Child Vaccines 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
Mohammad Aljammal 47c980a412 Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
add Radiology translations and colors

See merge request Cloud_Solution/diplomatic-quarter!131
4 years ago
Mohammad Aljammal 482ec536de Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad Aljammal b6d2878cf1 add Radiology translations and colors 4 years ago
Mohammad Aljammal 6cb3224226 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!129
4 years ago
haroon amjad 8400254020 Merge branch 'pharmacy-Fatima' into 'pharmacy'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!130
4 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 4 years ago
Sultan Khan 22676fcbd1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 5bb780c4ac push 4 years ago
Mohammad Aljammal d0891ba16b Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix lab result translations and colors

See merge request Cloud_Solution/diplomatic-quarter!128
4 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 4 years ago
Mohammad Aljammal 2731c5b1d4 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!127
4 years ago
Sultan Khan d6a0188c76 fingerprint 4 years ago
Sultan Khan 7c33c06c0c fingerprint 4 years ago
Sultan Khan 1b678e0aca fingerprint 4 years ago
Sultan Khan 6a14214a0f no message 4 years ago
Mohammad Aljammal 92b18bce07 Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix vital Sign

See merge request Cloud_Solution/diplomatic-quarter!126
4 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 4 years ago
Mohammad Aljammal caf930050f Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!125
4 years ago
haroon amjad 10025103ac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 21c7c94ef2 updates & fixes 4 years ago
Mohammad Aljammal 9fcf87126a Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!124
4 years ago
Sultan Khan b61e734f80 feedback permission 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