Skip to content

Commit e003b9c

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/mongodb-6.18.0
2 parents 1b90fc6 + 0c88ff3 commit e003b9c

File tree

4 files changed

+34
-20
lines changed

4 files changed

+34
-20
lines changed

CHANGELOG.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
1-
## Version 25.03.XX
1+
## Version 25.03.11
22
Fixes:
3-
- [core] Fix user analytics widget chart
43
- [core] Fix mongo connection url parsing
4+
- [core] Fix user analytics widget chart
55
- [crashes] Fix free session and free user calculation
66
- [dashboards] Delete associated widgets and reports when a dashboard is removed
77
- [star-rating] Fix widget close post message
8+
- [core] Adjust level and update content of app version log
9+
- [populator] Update getVersion to generate valid semantic version
810

911
Enterprise Fixes:
1012
- [crash_symbolication] Remove auto symbolication setting
11-
- [surveys] Fix widget close post message
1213
- [drill] Fix drill meta get filter
13-
- [flows] Nullchecks on $size when calculating flows.
14+
- [flows] Null checks on $size when calculating flows.
15+
- [surveys] Fix widget close post message
1416

17+
Dependencies:
18+
- Bump eslint-plugin-vue from 10.2.0 to 10.3.0
19+
- Bump form-data from 4.0.0 to 4.0.4 in /plugins/hooks
20+
- Bump nodemailer from 7.0.3 to 7.0.5
21+
- Bump on-headers and express-session
22+
- Bump puppeteer from 24.10.1 to 24.14.0
23+
- Bump sharp from 0.34.2 to 0.34.3
24+
- Bump supertest from 7.1.1 to 7.1.3
1525

1626
## Version 25.03.10
1727
Enterprise Fixes:

api/parts/data/usage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ plugins.register("/sdk/user_properties", async function(ob) {
11211121
userProps.av_build = versionComponents.build;
11221122
}
11231123
else {
1124-
log.w("Invalid app version format: %s", params.qstring.metrics._app_version);
1124+
log.d("App version %s is not a valid semantic version. It cannot be separated into semantic version parts", params.qstring.metrics._app_version);
11251125
userProps.av_major = null;
11261126
userProps.av_minor = null;
11271127
userProps.av_patch = null;

package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/populator/frontend/public/javascripts/countly.models.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,13 @@
337337
d = moment(seed);
338338
}
339339
}
340-
var year = trimYear ? d.format('YY')[1] : d.format('YY');
340+
341+
var year = d.format('YY');
342+
if (trimYear || year[0] === '0') {
343+
year = d.format('YY')[1];
344+
}
341345
var day = parseInt(d.format('DD')[0], 10) === 3 ? 2 : d.format('DD')[0];
342-
return year + "." + d.format('MM') + "." + day;
346+
return year + '.' + d.format('M') + '.' + day;
343347
}
344348
/**
345349
*
@@ -2944,4 +2948,4 @@
29442948
};
29452949

29462950
countlyPopulator.defaultTemplates = defaultTemplates;
2947-
}(window.countlyPopulator = window.countlyPopulator || {}));
2951+
}(window.countlyPopulator = window.countlyPopulator || {}));

0 commit comments

Comments
 (0)