Skip to content

Commit 35d28ec

Browse files
committed
Merge branch 'master' into release.24.10
# Conflicts: # CHANGELOG.md # package-lock.json # package.json
2 parents 24f755a + 4f6156d commit 35d28ec

File tree

6 files changed

+54
-275
lines changed

6 files changed

+54
-275
lines changed

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## Version xx.xx.xx
2+
3+
Dependencies:
4+
- Bump sass from 1.81.0 to 1.83.1
5+
- Bump countly-sdk-nodejs from 24.10.0 to 24.10.1
6+
- Bump express-rate-limit from 7.4.1 to 7.5.0
7+
- Bump puppeteer from 23.10.4 to 23.11.1
8+
19
## Version 24.10.4
210
Fixes:
311
- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time

api/utils/common.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,13 @@ common.getDate = function(timestamp, timezone) {
693693
* @returns {number} current day of the year
694694
*/
695695
common.getDOY = function(timestamp, timezone) {
696-
var endDate = (timestamp) ? moment.unix(timestamp * 1000) : moment();
696+
var endDate;
697+
if (timestamp && timestamp.toString().length === 13) {
698+
endDate = (timestamp) ? moment.unix(timestamp / 1000) : moment();
699+
}
700+
else {
701+
endDate = (timestamp) ? moment.unix(timestamp) : moment();
702+
}
697703

698704
if (timezone) {
699705
endDate.tz(timezone);

package-lock.json

+9-264
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"ejs": "3.1.10",
4949
"errorhandler": "1.5.1",
5050
"express": "4.21.2",
51-
"express-rate-limit": "7.4.1",
51+
"express-rate-limit": "7.5.0",
5252
"express-session": "1.18.1",
5353
"form-data": "^4.0.0",
5454
"formidable": "2.1.1",
@@ -81,7 +81,7 @@
8181
"offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
8282
"properties-parser": "0.6.0",
8383
"puppeteer": "^23.8.0",
84-
"sass": "1.81.0",
84+
"sass": "1.83.1",
8585
"sqlite3": "^5.1.7",
8686
"tslib": "^2.6.3",
8787
"uglify-js": "3.19.3",

0 commit comments

Comments
 (0)