Skip to content

Commit d22ce06

Browse files
committed
Merge branch 'next' into release.24.12
2 parents 3ab5f39 + 10a5053 commit d22ce06

File tree

4 files changed

+34
-1
lines changed

4 files changed

+34
-1
lines changed

CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,27 @@ Enterprise Features:
132132
- [users] UI improvements
133133
- [views] Added a quick transition to drill
134134

135+
## Version 24.05.20
136+
Fixes:
137+
- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time
138+
- [push] Fixed bug where it crashes in connection pool growth because of a type mismatch in an if condition
139+
140+
Security:
141+
- [cohorts] Prevent query injection on cohort creation
142+
143+
Dependencies:
144+
- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
145+
- Bump countly-sdk-web from 24.4.1 to 24.11.0
146+
- Bump express from 4.21.1 to 4.21.2
147+
- Bump form-data from 4.0.0 to 4.0.1
148+
- Bump jimp from 0.22.12 to 1.6.0
149+
- Bump jsdoc from 4.0.3 to 4.0.4
150+
- Bump mocha from 10.2.0 to 10.8.2
151+
- Bump mongodb from 4.9.1 to 4.17.2
152+
- Bump nodemailer from 6.9.15 to 6.9.16
153+
- Bump puppeteer from 23.8.0 to 23.9.0
154+
- Bump tslib from 2.7.0 to 2.8.1
155+
135156
## Version 24.05.19
136157
Fixes:
137158
- [dashboards] Fixing issue where dashboard widgets go into single column

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

+4
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,10 @@
428428
return !!this.value;
429429
}
430430

431+
if (this.type === COUNTLY_CONTENT_SIDEBAR_INPUT_COMPONENT_BY_TYPE_INPUT) {
432+
return countlyCommon.unescapeHtml(this.value) || '';
433+
}
434+
431435
return this.value || null;
432436
},
433437
set(newValue) {

plugins/compliance-hub/frontend/public/templates/exportHistory.html

+2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@
2929
<div :data-test-id="'datatable-export-purge-history-user-' + scope.$index">
3030
{{scope.row.u}}
3131
</div>
32+
</template>
3233
</el-table-column>
3334
<el-table-column sortable="custom" prop="ip" label="IP ADDRESS">
3435
<template slot-scope="scope">
3536
<div :data-test-id="'datatable-export-purge-history-ip-address-' + scope.$index">
3637
{{scope.row.ip}}
3738
</div>
39+
</template>
3840
</el-table-column>
3941
<el-table-column width="400" sortable="custom" label="ACTION">
4042
<template v-slot="rowScope">

plugins/star-rating/api/api.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -722,9 +722,15 @@ function uploadFile(myfile, id, callback) {
722722
if (!changes.targeting) {
723723
changes.targeting = {};
724724
}
725+
if (!changes.targeting.user_segmentation) {
726+
changes.targeting.user_segmentation = '{"query":{},"queryText":""}';
727+
}
728+
if (!changes.targeting.steps) {
729+
changes.targeting.steps = '[]';
730+
}
725731
changes.targeting.app_id = params.app_id + "";//has to be string
726732
// eslint-disable-next-line
727-
createCohort(params, type, widgetId, changes.targeting, function(cohortId) { //create cohort using this
733+
createCohort(params, type, widgetId, changes.targeting, function(cohortId) { //create cohort using this
728734
if (cohortId) {
729735
//update widget record to have this cohortId
730736
common.db.collection("feedback_widgets").findAndModify({ "_id": widgetId }, {}, { $set: { "cohortID": cohortId } }, function(/*err, widget*/) {

0 commit comments

Comments
 (0)