Commit Graph

818 Commits (1dc9400ffcda5dd3781dbace8341d4ea9208488b)
 

Author SHA1 Message Date
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 5 years ago
Zohaib Kambrani 78928335ef Geofences Login check (unregister/register geozones on logout/logout) 5 years ago
Zohaib Kambrani 6f6ab8d987 no message 5 years ago
Zohaib Kambrani 53775d113d commented code offers and packages 5 years ago
Zohaib Kambrani 9947b30d3f fix merge conflict 5 years ago
Zohaib Kambrani c534061c4f no message 5 years ago
Zohaib Kambrani 9ea779e48a no message 5 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 5 years ago
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 5 years ago
Zohaib Kambrani 8457972fda no message 5 years ago
Zohaib Kambrani 92ba977fca no message 5 years ago
Zohaib Kambrani c10d024700 no message 5 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 5 years ago
Mohammad Aljammal f7ee16f115 Merge branch 'privileges' into 'master'
Privileges

See merge request Cloud_Solution/diplomatic-quarter!167
5 years ago
Mohammad Aljammal a1e92e1fdd fix merge issue 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 9b8599a2cf remove load user from SplashScreen 5 years ago
Mohammad Aljammal 935e72975c add new privilege 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 a1f91d99b3 added countdown timer in my appointments 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
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 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