Commit Graph

1267 Commits (6a692ebd08ef0cf4ed7978f80b5fb6e3e60f7f2e)

Author SHA1 Message Date
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 97d7f9225e package name changed 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 90db04cee1 Jira Fixes 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 4 years ago
hussam al-habibeh 02df6f4d85 PAP-664 4 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
4 years ago
hussam al-habibeh 352fd912de PAP-664 4 years ago
hussam al-habibeh 29249dc9a9 PAP-664 4 years ago
Sultan Khan e5fb16ad69 langauge issue 4 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 7c398ba40d bug fix 4 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 4 years ago
hussam al-habibeh 6ea06ce442 PAP-729 4 years ago
Elham Rababh 8b8e239d3f fix button 4 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 4 years ago
Elham Rababh b01961e45f fix translate issues 4 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan d6fd03b571 CONFIG 4 years ago
Sultan khan 772dcba287 Merge branch 'Aug_fixes' into 'development'
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.

See merge request Cloud_Solution/diplomatic-quarter!338
4 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
4 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 4 years ago
Sultan Khan 6534ca8349 Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan khan 54e1d51f18 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!337
4 years ago
Zohaib Iqbal Kambrani 5f1d753895 no message 4 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Elham Rababh 7ad4e03c1a PAP-715 : Y –axis and X –axis values should be display in the yearly graph details. 4 years ago
Sultan Khan 23ca95b9b6 bug fixes 4 years ago
Mohammad Aljammal 9b3a679948 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!336
4 years ago
Mohammad Aljammal b34402ffa8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!335
4 years ago
Mohammad Aljammal ed5079e3a0 Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!334
4 years ago
mosazaid e9dbc4be7a fix bugs 4 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
4 years ago
hussam al-habibeh 50d3a42743 fixing dashboard issue 4 years ago
hussam al-habibeh 1ed76e91aa fixing dashboard issue 4 years ago
Sultan Khan 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
4 years ago
Sultan Khan 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
hussam al-habibeh d5c76b5400 jira bugs 4 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
4 years ago
hussam al-habibeh 981e78936e jira bugs 4 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
4 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 4 years ago
Mohammad Aljammal 4ac6bf628b Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!331
4 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
4 years ago
mosazaid 2e33c2b240 fix bugs 4 years ago
Sultan Khan 446f86dbcf Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 4 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 9acb5b087d bug fixes 4 years ago
Elham Rababh 86414b46fd PAP-304 : show CBC details 4 years ago
Elham Rababh 52816a9cfe PAP-723 : system should display the empty graph in the blood pressure screen. 4 years ago
Elham Rababh f824063e82 PAP-726 : fix show Arabic values for the select Arm 4 years ago
Elham Rababh f92567f877 PAP-718 : fix show data after save 4 years ago
Elham Rababh f830bfdb19 PAP-722 : fix send email 4 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

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

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

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

See merge request Cloud_Solution/diplomatic-quarter!322
4 years ago
hussam al-habibeh fefde8f575 jira bugs 4 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
haroon amjad bcb4f48785 build fix 4 years ago
Sultan khan f048f5229b Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!321
4 years ago
Sultan khan 924f9bedc0 Merge branch 'bug_fixing' into 'development'
Bug fixing

See merge request Cloud_Solution/diplomatic-quarter!319
4 years ago
Sultan khan 10f8ee5e81 Merge branch 'bug_fix_mirza' into 'development'
Bug Fix: 873, 878 to 881

See merge request Cloud_Solution/diplomatic-quarter!320
4 years ago
Sultan Khan 33465b04e5 permission 4 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 4 years ago
Sultan Khan d5d48703f9 camera permission fixed 4 years ago
Sultan Khan 85e803651c permission issue fixed 4 years ago
Sikander Saleem 38f134b6ff Bug PAP-884 fixed, email was not updating. 4 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
hussam al-habibeh 446021eb90 adding doctor list to health calculator 4 years ago
hussam al-habibeh 854352d9ce jira bugs 4 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 4 years ago