Skip to content

Commit 1020983

Browse files
authored
Merge branch 'master' into dependabot/github_actions/actions-64de86c0d2
2 parents 0408ba9 + 8ddb85a commit 1020983

9 files changed

Lines changed: 644 additions & 126 deletions

File tree

api/utils/countly-request/package-lock.json

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

api/utils/countly-request/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"hpagent": "^1.2.0"
1919
},
2020
"devDependencies": {
21-
"mocha": "^10.8.2",
21+
"mocha": "^11.1.0",
2222
"should": "^13.2.3"
2323
}
2424
}

bin/scripts/timezones/package-lock.json

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

bin/scripts/timezones/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"homepage": "https://count.ly/",
2424
"dependencies": {
2525
"moment-timezone": "0.5.48",
26-
"node-fetch": "2.6.7"
26+
"node-fetch": "3.3.2"
2727
}
2828
}

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/star-rating/frontend/public/localization/star-rating.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ feedback.where-to-collect-feedback = Where to collect ratings?
113113
feedback.all-pages = On all pages
114114
feedback.selected-pages = On selected pages
115115
feedback.internalName = Internal Name
116-
feedback.internalName.placeholder = Enter a internal Name
116+
feedback.internalName.placeholder = Enter an Internal Name
117117
feedback.internalName.description = This name is internal and will not be shown to your end user.
118118
feedback.consent = Add user consent
119119
feedback.question = Question

ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ const verifySettingsPageElements = ({
8080
labelText: "Internal Name",
8181
element: feedbackRatingWidgetsPageElements.WIDGET_NAME_INPUT,
8282
value: widgetName,
83-
elementPlaceHolder: "Widget Name"
83+
elementPlaceHolder: "Enter an Internal Name"
8484
});
8585
cy.verifyElement({
8686
labelElement: feedbackRatingWidgetsPageElements.WIDGET_NAME_DESC,
87-
labelText: "Name survey for internal purposes. It is not going to be shown on survey.",
87+
labelText: "This name is internal and will not be shown to your end user.",
8888
});
8989
cy.verifyElement({
9090
labelElement: feedbackRatingWidgetsPageElements.QUESTION_LABEL,

ui-tests/package-lock.json

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

ui-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"license": "ISC",
1111
"dependencies": {
12-
"@faker-js/faker": "^8.2.0",
12+
"@faker-js/faker": "^9.7.0",
1313
"base-64": "^1.0.0",
1414
"chai": "^5.1.1",
1515
"cypress-file-upload": "^5.0.8",

0 commit comments

Comments
 (0)