Merge branch 'master' into dependabot/github_actions/actions-b033b81e51

Author: ar2rsawseen

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 25.03.15
+Enterprise Fixes:
+- [cohorts] Unescape segmentation properties options to prevent duplicated values
+- [ldap] Connection timeout values are added to LDAP config
+
 ## Version 25.03.14
 
 Fixes:
@@ -11,7 +16,7 @@ Dependencies:
 - Bump eslint-plugin-vue from 10.3.0 to 10.4.0
 - Bump fs-extra from 11.3.0 to 11.3.1
 - Bump lint-staged from 16.1.2 to 16.1.4
-- Bump puppeteer from 24.15.0 to 24.16.0
+- Bump puppeteer from 24.15.0 to 24.16.1
 - Bump sass from 1.89.2 to 1.90.0
 - Bump typescript from 5.8.3 to 5.9.2
 

frontend/express/public/javascripts/countly/vue/components/input.js

@@ -540,8 +540,8 @@
                                 <div\
                                     class="text-medium cly-vue-listbox__item"\
                                     :style="[option.disabled ? {\'pointer-events\' : \'none\'} : {\'pointer-events\': \'all\'}]"\
-                                    :key="option.value"\
-                                    v-for="option in searchedOptions">\
+                                    :key="option.value + \'-\' + index"\
+                                    v-for="(option, index) in searchedOptions">\
                                     <div v-if="sortable" class="drag-handler"><img src="images/icons/drag-icon.svg" /></div>\
                                     <el-checkbox :test-id="testId + \'-\' + (option.label ? option.label.replaceAll(\' \', \'-\').toLowerCase() : \'el-checkbox\')" :label="option.value" v-tooltip="option.label" :key="option.value" :disabled="(disableNonSelected && !innerValue.includes(option.value)) || option.disabled">{{option.label}}</el-checkbox>\
                                 </div>\