Commit Graph

1547 Commits (9c6f83600bd2b717552d795752a275eff4b0084f)
 

Author SHA1 Message Date
hussam al-habibeh 9c6f83600b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
4 years ago
Sultan khan 3c2a89cd8e Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and  sugar blood

See merge request Cloud_Solution/diplomatic-quarter!354
4 years ago
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
4 years ago
Sultan khan 8eb67791ca Merge branch 'fatima-new' into 'development'
Fatima new

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

See merge request Cloud_Solution/diplomatic-quarter!348
4 years ago
Elham Rababh 8629b62fcb fix issue 4 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 4 years ago
hussam al-habibeh 8f5fef87e9 add blood pressure translation issue 4 years ago
hussam al-habibeh a33a6b0b2f push request after conflict resolve 4 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
4 years ago
hussam al-habibeh 352cda4c70 hide Covid19-driveThrow for patient out of KSA 4 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
4 years ago
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad a3984a7c1a Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!351
4 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 4 years ago
Zohaib Iqbal Kambrani c215b22cf7 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fixes
  registration
4 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 4 years ago
Sultan khan 91a363a1ef Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!350
4 years ago
Sultan Khan 1586f02542 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 6b7eaaafb9 fixes 4 years ago
Fatimah Alshammari bbb8e04066 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Sultan khan ce867b85f2 Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!347
4 years ago
haroon amjad a32501f3dc My invoices implementation continued 4 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 4 years ago
Fatimah Alshammari e86dfd1a34 Merge branch 'development' into fatima-new 4 years ago
Fatimah Alshammari 86d67247be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 4 years ago
Fatimah Alshammari 0d3f6237ce fixed issues 4 years ago
Sultan Khan b1453b52e3 registration 4 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
4 years ago
hussam al-habibeh d3868844de Medication availability 4 years ago
Sultan Khan 57864f949d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 4 years ago
Sultan Khan bd85854fa4 changes 4 years ago
Zohaib Iqbal Kambrani 10a147860c no message 4 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 4 years ago
Sultan khan 1f52794185 Merge branch 'sultan-patientapp' into 'development'
package name changed

See merge request Cloud_Solution/diplomatic-quarter!345
4 years ago
Sultan Khan 97d7f9225e package name changed 4 years ago
haroon amjad b5f180f16c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!344
4 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
4 years ago
haroon amjad cf32d9f0ff Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 4 years ago
haroon amjad 90db04cee1 Jira Fixes 4 years ago
Sultan khan 69e957929d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!343
4 years ago
Fatimah Alshammari b8ba80b361 Merge branch 'fatima-new' into development 4 years ago
Fatimah Alshammari 39ba2cfde7 fixed issues. 4 years ago
haroon amjad 5007064105 Jira fixes 5 years ago
hussam al-habibeh 02df6f4d85 PAP-664 5 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
hussam al-habibeh 352fd912de PAP-664 5 years ago
hussam al-habibeh 29249dc9a9 PAP-664 5 years ago
Sultan khan b2349394ff Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!342
5 years ago
Sultan Khan e1750ce24c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago