Commit Graph

587 Commits (3077624c583e7dab977c00dc3f2ed36a1113da1a)

Author SHA1 Message Date
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 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
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
haroon amjad a32501f3dc My invoices implementation continued 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
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 3 years ago
Sultan Khan 97d7f9225e package name changed 3 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
3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 years ago
Sultan Khan 7c398ba40d bug fix 3 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 3 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan d6fd03b571 CONFIG 3 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
3 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 3 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 23ca95b9b6 bug fixes 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
Sultan Khan 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
3 years ago
Sultan Khan 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
3 years ago
hussam al-habibeh 981e78936e jira bugs 3 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 3 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 9acb5b087d bug fixes 3 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

See merge request Cloud_Solution/diplomatic-quarter!329
3 years ago
Sultan khan f54b9a63aa Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!328
3 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 3 years ago
Haroon Amjad 213d104d57 Covid test procedure selection implemented 3 years ago
Sultan khan 487d63ec7f Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC

See merge request Cloud_Solution/diplomatic-quarter!326
3 years ago
Sikander Saleem eb9005510d bug fixes and insurance approvals improvements. 3 years ago
Sultan Khan 3c2539d5b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 14ef096c32 changes and fixes 3 years ago
Mirza.Shafique b31813770e Check-In NFC done 3 years ago
Haroon Amjad fde658fd5d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
3 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 3 years ago
Mirza.Shafique e934e7cd2c Merge Fix 3 years ago
haroon amjad 4504b4bf75 config 3 years ago
haroon amjad f310f9d0ab config 3 years ago
haroon amjad 0d2a91c124 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
hussam al-habibeh fefde8f575 jira bugs 3 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
haroon amjad bcb4f48785 build fix 3 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
hussam al-habibeh 854352d9ce jira bugs 3 years ago