Commit Graph

103 Commits (187d2bcd8b6e61a6febf185fc3d7fe46a66c8a9a)

Author SHA1 Message Date
Zohaib Kambrani 53775d113d commented code offers and packages 5 years ago
Zohaib Kambrani 9947b30d3f fix merge conflict 5 years ago
Zohaib Kambrani 9ea779e48a no message 5 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 5 years ago
Mohammad Aljammal 9dfd8a71dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
 Conflicts:
	lib/locator.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/login/confirm-login.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/widgets/bottom_navigation/bottom_nav_bar.dart
	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal 935e72975c add new privilege 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 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
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
mosazaid 35d0d3e441 finsi lakum points task 5 years ago
Mohammad Aljammal dc898a799d Add Privileges 5 years ago
Zohaib Kambrani 1155466d19 Packages and Offer Slider at home 5 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
5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
Elham Rababah 7aa7af6de7 finish CMC module 5 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah a87855f445 Fix issues on hhc module 5 years ago
Sultan Khan 603833db37 login changes 5 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 5 years ago
Mohammad Aljammal fa01d132c7 merger DQ live and fix some issues on Child Vaccines 5 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
5 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 5 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 5 years ago
haroon amjad 21c7c94ef2 updates & fixes 5 years ago
Mohammad Aljammal f70ca95a38 fix merge issues 5 years ago
Mohammad Aljammal 939840bbe7 fix master 5 years ago
Sultan Khan fdef34a394 viral sign issue 5 years ago
Sultan Khan 1eb6516ea6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljmma 741126102d fix issue #11 5 years ago
Mohammad Aljmma bfaacb2719 fix issue#3 5 years ago
Sultan Khan 283473a06a theme changes 5 years ago
Zohaib Kambrani 0c71fbad5f no message 5 years ago
Fatimah Alshammari ddf032bb47 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari f137bd44c0 created order and order details UI pages 5 years ago
haroon amjad 9868a43e7b Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 5 years ago
Mohammad Aljmma 570aa514cd fix user authentication data 5 years ago
hussam al-habibeh 6162833bba offers products page 5 years ago
hussam al-habibeh 7815005e21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
hussam al-habibeh 69a6bc2812 offers page 5 years ago
mosazaid 11ff27bae3 Merge branch 'master' 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/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 5 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 5 years ago
hussam al-habibeh e74e168e88 Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
5 years ago
hussam al-habibeh f7cee8f484 pharmacy module app && category home page 5 years ago
mosazaid d1ac4080ca working on pharmacy home page 5 years ago