Commit Graph

42 Commits (ee231ed981b8a692fc07a5f8392ee0b45ca9bb56)

Author SHA1 Message Date
haroon amjad 6945230965 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/medical/smart_watch_health_data/health_data_list.dart
#	lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
Zohaib Iqbal Kambrani dc83b476d6 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts:
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
#	ios/Flutter/.last_build_id
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal 72290f041f fix design 5 years ago
Zohaib Kambrani f03adb37ce no message 5 years ago
Zohaib Kambrani 57925e3b02 Geofence fixes by JobScheduler 5 years ago
Zohaib Kambrani 3392a2431b Added Location Provider Changed Receiver to Reregister the geofences 5 years ago
Zohaib Kambrani 187d2bcd8b Geofence error logging in shared_preferences 5 years ago
Zohaib Kambrani a11d93332d Wifi check network available - android
tweaking at geofence code
5 years ago
Zohaib Kambrani 4c00f9b3f2 Merge branch 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ZohaibIqbalKambrani
* 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  geofencing login check fix
5 years ago
Zohaib Kambrani 7b4a2b9e64 no message 5 years ago
Zohaib Kambrani 508bc191be geofencing login check fix 5 years ago
Zohaib Kambrani d8996cf879 Geofence Android Finished 5 years ago
Zohaib Kambrani 0f64c45e67 no message 5 years ago
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 5 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 5 years ago
haroon amjad e495d3e5ad Health Data integration implementing 5 years ago
Zohaib Kambrani 55ad82147f Wifi internet 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad a03d5c6d57 App initial release to stores 5 years ago
Zohaib Kambrani c2be303418 Move code from java to kotlin package 5 years ago
Zohaib Kambrani 3264b82118 Complete Native Wifi connection and LoadingView Android 5 years ago
Zohaib Kambrani 8fcf1b6708 Swipe the Native loading « arguments 5 years ago
Zohaib Kambrani 8e554970f3 Wifi Connectivity and loading View 5 years ago
Zohaib Kambrani 69d1e4bb0b no message 5 years ago
haroon amjad 22ef24c4ff Merge branch 'master' into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
5 years ago
jammal 9328f942ba done ER service 5 years ago
jammal bd2254491c done ER service 5 years ago
Mohammad Aljammal 1ce55e687f Ambulance Service second step 5 years ago
haroon amjad 6c0bb12c84 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/ContactUs/findus/pharmacies_page.dart
5 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 5 years ago
Mohammad Aljammal ea02622977 fix merge issues 5 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 4c1a8dc38f new changes 5 years ago
haroon amjad 750746aabe updates & fixes 6 years ago
Mohammad Aljammal 22de043892 fix merge issues 6 years ago
haroon amjad 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
6 years ago
Mohammad Aljammal 4d28209b07 add permission android 6 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 6 years ago
Sultan Khan 76aeeffad7 login page changes 6 years ago
Sultan Khan 5a08cb720c login changes 6 years ago
Sultan Khan f8d8e1c685 new pages added 6 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 6 years ago