Commit Graph

1801 Commits (f33272f8d9d3fbf9f92a7fdcd554c4d613b61bdc)
 

Author SHA1 Message Date
Sultan khan cd56881d7a Merge branch 'pharmacy-bugs' into 'development'
hide Covid19-driveThrow for patient out of KSA

See merge request Cloud_Solution/diplomatic-quarter!353
3 years ago
Sultan khan 8eb67791ca Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!349
3 years ago
Sultan khan d321f07e82 Merge branch 'medication_availability' into 'development'
Medication availability

See merge request Cloud_Solution/diplomatic-quarter!348
3 years ago
Elham Rababh 8629b62fcb fix issue 3 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 3 years ago
Sikander Saleem 6ee56cba0d Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/new_design/doctor_header.dart
3 years ago
Sikander Saleem bb20d65b40 lab result detail screen. 3 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 3 years ago
hussam al-habibeh 8f5fef87e9 add blood pressure translation issue 3 years ago
Mirza.Shafique 26c30038c9 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 3 years ago
Sikander Saleem 35b5d38b82 Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 3a1af590ff lab result detail screen (cont.) 3 years ago
hussam al-habibeh a33a6b0b2f push request after conflict resolve 3 years ago
hussam al-habibeh 0a3c44b5e8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
3 years ago
hussam al-habibeh 352cda4c70 hide Covid19-driveThrow for patient out of KSA 3 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 3 years ago
mosazaid b59ca8dedd Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-bugs 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 a3984a7c1a Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!351
3 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 3 years ago
Zohaib Iqbal Kambrani c215b22cf7 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fixes
  registration
3 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 3 years ago
Mirza.Shafique 876463c945 Home Page Font weight 3 years ago
Sikander Saleem d1b45c8bcc Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Mirza.Shafique 85c759a4a5 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 3 years ago
Sultan khan 91a363a1ef Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!350
3 years ago
Sultan Khan 1586f02542 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 6b7eaaafb9 fixes 3 years ago
Mirza.Shafique a699740897 Medical File Fonts Implementation 3 years ago
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 3 years ago
Fatimah Alshammari bbb8e04066 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Sultan khan ce867b85f2 Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!347
3 years ago
haroon amjad a32501f3dc My invoices implementation continued 3 years ago
Sikander Saleem ff55ae1908 improvements 3 years ago
Sikander Saleem bb3d11ccf8 remove spaces. 3 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Sikander Saleem bb9d1bfcd5 improvements 3 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 3 years ago
Fatimah Alshammari e86dfd1a34 Merge branch 'development' into fatima-new 3 years ago
Fatimah Alshammari 86d67247be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
Fatimah Alshammari 0d3f6237ce fixed issues 3 years ago
Sikander Saleem 80c50e29bf Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
3 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 3 years ago
Sultan Khan b1453b52e3 registration 3 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 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
hussam al-habibeh d3868844de Medication availability 3 years ago