Commit Graph

113 Commits (a59c60f79a2ed5d0bbf3c1a238697940530ce771)

Author SHA1 Message Date
Sultan Khan 496c6ce32e registration done 3 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 3 years ago
haroon amjad 07a98d75c6 My tracker fixes 3 years ago
haroon amjad 40cbca565a fixes 3 years ago
haroon amjad 58c78656bf Rating dialog updates 3 years ago
Sultan Khan 5c8b809e39 family file fixes 3 years ago
Haroon Amjad 1fa6a4409b Family files fixes 3 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
haroon amjad 2c4ff16f0c updates & fixes 3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 3 years ago
haroon amjad fa8c739b2c updates & fixes 3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 3 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 3 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
3 years ago
Mohammad Aljammal 8abbb04f02 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!373
3 years ago
haroon amjad e9c26ee85f Dental procedures implemented 3 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 3 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 3 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 5647ab75e5 improvements. 3 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
3 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 3 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari 34ccb132dc fixed issues 3 years ago
Fatimah Alshammari 74d0826342 fixed issues 3 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 3 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
3 years ago
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
3 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 3 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 3 years ago
haroon amjad a32501f3dc My invoices implementation continued 3 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Sultan Khan 57864f949d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
Sultan Khan bd85854fa4 changes 3 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
3 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 3 years ago
Haroon Amjad 213d104d57 Covid test procedure selection implemented 3 years ago
Sultan Khan 14ef096c32 changes and fixes 3 years ago
Sultan Khan 3d6858d0ec bug fixes 4 years ago
Sultan Khan 66acce3b40 ancillary order pages added 4 years ago
Sultan Khan b891c1bd80 theme issue 4 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 4 years ago
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
4 years ago