Commit Graph

75 Commits (8d988ba994f33da2dc4a8ff618873c158ae3c467)

Author SHA1 Message Date
haroon amjad 8d988ba994 updates & fixes 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
Zohaib Iqbal Kambrani 936b7c28f9 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Covid updates & other fixes

# Conflicts: Resolved
#	lib/config/config.dart
#	lib/pages/webRTC/signaling.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad 927db41068 Covid updates & other fixes 4 years ago
Zohaib Iqbal Kambrani a398220033 no message 4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad 3eb7a4325b updates & fixes 4 years ago
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Zohaib Iqbal Kambrani a2efbf6494 no message 4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad c253ec3110 LiveCare UI revamped 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
haroon amjad f946a7be4d updates & fixes 4 years ago
haroon amjad f795ba24c5 updates & fixes 4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago
haroon amjad 4560037f97 updates 4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 4 years ago
Sikander Saleem 14561d0ac6 merge changes-1 4 years ago
Sikander Saleem 53e4815866 no auth ui modifications 4 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 4 years ago
Mirza.Shafique b31813770e Check-In NFC done 4 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
haroon amjad 69649ff7f8 added verified icon in homepage when patient is logged in 5 years ago
haroon amjad 146019432a LiveCare schedule implemented 5 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 5 years ago
haroon amjad dde10cd27b working in LiveCare Scheduling 5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
haroon amjad 53282e3ae6 ToDo back issue fixed 5 years ago
haroon amjad 8c9762c24f Fixes 5 years ago
Mohammad Aljammal a57d5eb69f hot fixes 5 years ago
Mohammad Aljammal 8329c534a3 hot fixes 5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
Haroon Amjad 3308aa47e1 fixes 5 years ago
Haroon Amjad b9269f525a hot fixes 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 951d9b553f fixes & updates 5 years ago
haroon amjad 740a294867 Translation & bug fixes 5 years ago
haroon amjad 468bb0356c updates & fixes 5 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 5 years ago