Commit Graph

218 Commits (eefdb1fa3ec2ec1194b2ed92a263ebf691fd366d)

Author SHA1 Message Date
Sultan khan 9683b3f42f Dubai Reminder fixed. 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 4 years ago
Zohaib Iqbal Kambrani 8bd5a71318 Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Timezone fixes & Activate/Deactivate file changes
  Updates
  Timezone Updates
  CMC Updates
  updates
  Updates
  Laser Male back image added
  Updates & fixes
  E-Cens sign off
  Analtyics at registration and liveacare payment fail
  analytics events update
  Analytics
  no message
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
  Analytics statements align to bottom of block
  Analytics for login registration
  updates

# Conflicts: Fixed
#	lib/analytics/flows/appointments.dart
4 years ago
haroon amjad 2ba744c3a6 Timezone fixes & Activate/Deactivate file changes 4 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
haroon amjad 7018696328 E-Cens sign off 4 years ago
haroon amjad 4cbccd8efb analytics events update 4 years ago
Zohaib Iqbal Kambrani a01b8b82da no message 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad 72e5d0a2be Pharma LiveCare 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
haroon amjad 40cbca565a fixes 4 years ago
haroon amjad 58c78656bf Rating dialog updates 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
Sikander Saleem 1346eab593 h2o today page, prescription & schedule appointment improvements. 4 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Sikander Saleem b4031e973e chevron icon to arrow forward 4 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 4 years ago
haroon amjad 89e1aa70c0 updates 4 years ago
Sultan Khan 5fe0214e04 bug fixes 4 years ago
Sultan Khan 5b988dff4f BUG FIXES 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
haroon amjad 19e6954bc8 updates 4 years ago
haroon amjad 5c64ce4795 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/MyAppointments/SchedulePage.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan c54146b3ba sechedule fix 4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
haroon amjad 92bfe27a6e updates & fixes 4 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 4 years ago
haroon amjad eeb20073cb Medicine prescriptions fixes from appointment details page 4 years ago
haroon amjad b1128be94f Updates & fixes 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 4 years ago
Mirza.Shafique 3af1676730 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/insurance/insurance_card_screen.dart
#	lib/pages/medical/balance/advance_payment_page.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
haroon amjad 8e7786cb96 updates & fixes 4 years ago
Sikander Saleem 62ca009404 improvement. 5 years ago
Sultan Khan ad7527ee65 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sultan Khan 233a273316 shcedule page 5 years ago
Mirza.Shafique 590ea48ea9 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/MyAppointments/SchedulePage.dart
5 years ago
Mirza.Shafique e1e3741abf Event Reminder 5 years ago
Sultan Khan abcd207554 schedule page fix 5 years ago
haroon amjad 3abd7227ec fixes 5 years ago
haroon amjad 9cf9e297cf Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
5 years ago
haroon amjad 4560037f97 updates 5 years ago
Sikander Saleem 402cf5936a improvement. 5 years ago
Sikander Saleem 1a0e1f47a6 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mirza.Shafique ebf293736d Booking appointment Marge 5 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 5 years ago
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 5 years ago
Sikander Saleem ca363adee2 merge & improvements 5 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
5 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 5 years ago
Sultan Khan 1a501a3b2a calendar events changes 5 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 5 years ago
Sikander Saleem 4152eafa17 Merge branch 'development_new_design_2.0' into new_design_sikander 5 years ago
Sikander Saleem 2ba91e54ab merge-changes 5 years ago
Sikander Saleem 970887b0c5 changes 5 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Sikander Saleem bb18645d85 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem e9db30d3da otp clear when wrong code entered. 5 years ago
Sultan Khan 301728ed3d family file fix 5 years ago
Sultan Khan 59892870e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9e31a3c560 bug fixes 5 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 5 years ago
haroon amjad 3f29bbd6b3 Updates & fixes 5 years ago
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
5 years ago
Elham Rababh 1fefbfb76e return bottom sheet inside appointments list 5 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 11ffed2ae3 bug fixes 5 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 5 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 5 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
5 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 5 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 5 years ago
haroon amjad a32501f3dc My invoices implementation continued 5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
haroon amjad 5007064105 Jira fixes 5 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
mosazaid 116a4af845 fix-design 5 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago