Commit Graph

1278 Commits (bc91b9ad88c462099f279c59880477d5789968ff)

Author SHA1 Message Date
Sultan Khan 9e31a3c560 bug fixes 3 years ago
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
3 years ago
Elham Rababh 1fefbfb76e return bottom sheet inside appointments list 3 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 11ffed2ae3 bug fixes 3 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 3 years ago
haroon amjad cbbca5ce86 Merge branch 'development' into Haroon 3 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 3 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 3 years ago
Mohammad Aljammal b98a84bcac Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!361
3 years ago
Mohammad Aljammal 41f1704790 Merge branch 'blood_pressure' into 'development'
Blood pressure

See merge request Cloud_Solution/diplomatic-quarter!362
3 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 3 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
3 years ago
Elham Rababh d028ce22dc remove unused code 3 years ago
hussam al-habibeh fe83b91602 body fat texfield fix 3 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 3 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 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
Mohammad Aljammal d9fabbab17 Fix feedback 3 years ago
Fatimah Alshammari 74d0826342 fixed issues 3 years ago
Sultan khan 04a68c5bd3 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!358
3 years ago
Sultan khan b8d75b5604 Merge branch 'blood_pressure' into 'development'
add blood pressure translation issue

See merge request Cloud_Solution/diplomatic-quarter!356
3 years ago
Sultan khan 6a0acd8afb Merge branch 'fix-bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!355
3 years ago
Sultan Khan 5b656b0b51 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 9610ff640e feedback changes 3 years ago
haroon amjad cbbef80bd5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad eadba3f767 Working on livecare appointment booking page 3 years ago
hussam al-habibeh b9d4195e20 Blood pressure translation issue 3 years ago
mosazaid 3077624c58 fix bugs 3 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
3 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
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
Elham Rababh 8629b62fcb fix issue 3 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 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
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
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
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 0d3f6237ce fixed issues 3 years ago
Sultan Khan b1453b52e3 registration 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
Zohaib Iqbal Kambrani 10a147860c no message 3 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 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
haroon amjad 5007064105 Jira fixes 3 years ago
hussam al-habibeh 02df6f4d85 PAP-664 3 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
3 years ago
hussam al-habibeh 352fd912de PAP-664 3 years ago
hussam al-habibeh 29249dc9a9 PAP-664 3 years ago
Sultan Khan e5fb16ad69 langauge issue 3 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 7c398ba40d bug fix 3 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 3 years ago
hussam al-habibeh 6ea06ce442 PAP-729 3 years ago
Elham Rababh 8b8e239d3f fix button 3 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 3 years ago
Elham Rababh b01961e45f fix translate issues 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 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
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 6534ca8349 Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan khan 54e1d51f18 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

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

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

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

See merge request Cloud_Solution/diplomatic-quarter!334
3 years ago
mosazaid e9dbc4be7a fix bugs 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
hussam al-habibeh 50d3a42743 fixing dashboard issue 3 years ago
hussam al-habibeh 1ed76e91aa fixing dashboard issue 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 d5c76b5400 jira bugs 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 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
3 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 3 years ago
Mohammad Aljammal 4ac6bf628b Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!331
3 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
3 years ago
mosazaid 2e33c2b240 fix bugs 3 years ago
Sultan Khan 446f86dbcf Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 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
Elham Rababh 52816a9cfe PAP-723 : system should display the empty graph in the blood pressure screen. 3 years ago
Elham Rababh f824063e82 PAP-726 : fix show Arabic values for the select Arm 3 years ago
Elham Rababh f92567f877 PAP-718 : fix show data after save 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
Zohaib Iqbal Kambrani dbf525c484 no message 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 0d2a91c124 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
hussam al-habibeh 8d8fbc3edc jira bugs 3 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
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
Sultan khan f048f5229b Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

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

See merge request Cloud_Solution/diplomatic-quarter!319
3 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
3 years ago
Sultan Khan 33465b04e5 permission 3 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 3 years ago
Sultan Khan d5d48703f9 camera permission fixed 3 years ago
Sultan Khan 85e803651c permission issue fixed 3 years ago
Sikander Saleem 38f134b6ff Bug PAP-884 fixed, email was not updating. 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 446021eb90 adding doctor list to health calculator 3 years ago
hussam al-habibeh 854352d9ce jira bugs 3 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 3 years ago
Sikander Saleem b2e9060c3f Bug PAP-877 fixed, blood tracker exception. 3 years ago
Elham Rababh 2e1c9780d7 PAP-610: prevent show send email button if user have no vaccine 3 years ago
Elham Rababh c6a68083a4 PAP-667: fix blood type 3 years ago
Elham Rababh c14adccb49 PAP-667: add unit to home page 3 years ago
Elham Rababh dd1dff01d6 PAP-790: fix Alignment of mobile number 3 years ago
Elham Rababh 4217fc0826 PAP-685: fix issue 3 years ago
Sikander Saleem b7fbee3252 improvements 3 years ago
Sikander Saleem d6566d4abf PAP-678 fixed, month & days in axis are aligned now. 3 years ago
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 3 years ago
Sikander Saleem 7771b8f320 PAP-886 fixed, Insurance image button added. 3 years ago
Sultan Khan da2df9b348 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan bcabd81f88 BUG FIXES 3 years ago
Mohammad Aljammal 234e69c02d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!315
4 years ago
hussam al-habibeh bb6e7e931b pharmacy-bugs 4 years ago
Mohammad Aljammal b37dd57804 Merge branch 'pharmacy-Fatima' into 'development'
fixed prescription issue

See merge request Cloud_Solution/diplomatic-quarter!313
4 years ago
Mohammad Aljammal 25d5105caf Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue

See merge request Cloud_Solution/diplomatic-quarter!312
4 years ago
Fatimah Alshammari b98d8b3a46 fixed prescription issue 4 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 4 years ago
Mohammad Aljammal 268f0c8fa4 Merge branch 'fix-bugs' into 'development'
fix-design

See merge request Cloud_Solution/diplomatic-quarter!311
4 years ago
Mohammad Aljammal bd451f1283 Merge branch 'Apr-fixes' into 'development'
Apr fixes

See merge request Cloud_Solution/diplomatic-quarter!310
4 years ago
mosazaid 116a4af845 fix-design 4 years ago
Elham Rababah 36d422c7aa PAP-563: fix pickup location from hospital 4 years ago
Elham Rababah aa1c92c142 PAP-562: fix status 4 years ago
hussam al-habibeh 14939d3513 jira bugs (Health Calculator) 4 years ago
Elham Rababah 8c5b3742b6 PAP-643: fix button 4 years ago
Elham Rababah aab33b3e03 PAP-609: fix text align 4 years ago
Fatimah Alshammari 174e0d9673 Merge branch 'development' into pharmacy-Fatima 4 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 4 years ago
Elham Rababah 1f70d086e0 PAP-634: Add search button. 4 years ago
Mohammad Aljammal f4f4a0977e Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!307
4 years ago
Fatimah Alshammari ef53338971 Merge branch 'development' into pharmacy-Fatima 4 years ago
Fatimah Alshammari faa8a13778 fixed isuue-product details 4 years ago
Sultan Khan 9adc4a974c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 8c9c309abb bug fixes 4 years ago
Mohammad Aljammal 1607aecb4a Merge branch 'pharmacy-Fatima' into 'development'
fixed an issue in recommended page

See merge request Cloud_Solution/diplomatic-quarter!304
4 years ago
Sultan Khan 3a8b889b74 bug fixes 4 years ago
Sultan Khan 1cd4d93488 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan cd7845b1a4 bug fix 4 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 4 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 4 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
haroon amjad 353a5157f2 fixes 4 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
4 years ago
Sultan Khan 0245875358 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 3d6858d0ec bug fixes 4 years ago
Elham Rababah 96117fd191 PAP-625: add option “not classified”. 4 years ago
Elham Rababah 6e7f62ca21 PAP-612: show ok and cancel options 4 years ago
Mohammad Aljammal 6fa79ef8d0 Merge branch 'pharmacy-bugs' into 'development'
jira bug PAP-530

See merge request Cloud_Solution/diplomatic-quarter!300
4 years ago
Elham Rababah 66a9239698 PAP-558: Remove the choose Drop-off 4 years ago
Elham Rababah 1b393d6601 PAP-559: remove the km 4 years ago
hussam al-habibeh 1ce10f4d78 jira bug PAP-530 4 years ago
Mohammad Aljammal 0a4f17dc88 Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!298
4 years ago
Mohammad Aljammal dcc98a35ac Merge branch 'fix_advance_payment' into 'development'
fix advance payment

See merge request Cloud_Solution/diplomatic-quarter!299
4 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 4 years ago
haroon amjad a6a9a92c6f JIRA bug fixes 4 years ago
Fatimah Alshammari bb622f248c Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy_categorise.dart
4 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 4 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 4 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad 49c454b132 fixes 4 years ago
Mohammad Aljammal 008a39f043 Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!297
4 years ago
Elham Rababah 86dda2b6d6 PAP-560: fix design 4 years ago
Elham Rababah a1ecfbf16a PAP-560: fix design 4 years ago
Elham Rababah efb6ea68b8 PAP-561: fix design 4 years ago