Skip to content

Commit f6255a6

Browse files
authored
Merge branch 'master' into ar2rsawseen/feature/tracking
2 parents 1bdf939 + b8253f0 commit f6255a6

File tree

7 files changed

+74
-50
lines changed

7 files changed

+74
-50
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
# Initializes the CodeQL tools for scanning.
4343
- name: Initialize CodeQL
44-
uses: github/codeql-action/init@v3
44+
uses: github/codeql-action/init@v4
4545
with:
4646
languages: ${{ matrix.language }}
4747
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
5252
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5353
# If this step fails, then you should remove it and run the build manually (see below)
5454
- name: Autobuild
55-
uses: github/codeql-action/autobuild@v3
55+
uses: github/codeql-action/autobuild@v4
5656

5757
# ℹ️ Command-line programs to run using the OS shell.
5858
# 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
6666
# make release
6767

6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@v3
69+
uses: github/codeql-action/analyze@v4

CHANGELOG.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
1-
## Version 25.03.xx
1+
## Version 25.03.XX
2+
Enterprise Fixes:
3+
- [data-manager] Fixed segment data deletion
4+
- [users] Fix add/remove user to profile group
5+
- [users] Remove link to profile group page after removing user from group
6+
7+
Dependencies
8+
- Bump lint-staged from 16.2.3 to 16.2.4
9+
- Bump @faker-js/faker from 10.0.0 to 10.1.0 in /ui-tests
10+
- Bump puppeteer from 24.23.0 to 24.24.1
11+
- Bump countly-sdk-nodejs from 24.10.2 to 24.10.3
12+
13+
## Version 25.03.23
214
Fixes:
15+
- [events] Entries in the event list are now sorted alphabetically
316
- [mail] Add smtp debug option for mail module
417

518
Enterprise Fixes:
6-
- [users] Fixed uploading user profile pictures
7-
- [funnels] Show notification if funnel results are from cache/task manager
819
- [block] Fixed filter for consent events
920
- [drill] [survey] Fix survey answer in drill
21+
- [funnels] Show notification if funnel results are from cache/task manager
22+
- [revenue] Card in revenue page are now correctly indentified
1023
- [users] Add survey section to user feedback page
24+
- [users] Fixed uploading user profile pictures
1125

1226

1327
## Version 25.03.22

package-lock.json

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

ui-tests/cypress/e2e/onboarding/onboarding.cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ describe('Complete Onboarding', () => {
298298
navigationHelpers.isNavigatedToDashboard();
299299
});
300300

301-
it('should be complete onboarding flow with creating mobile type demo application and verify home page with Finance data', function() {
301+
it('should be complete onboarding flow with creating mobile type demo application and verify all pages with Finance data', function() {
302302
setupHelpers.verifyDefaultPageElements();
303303
setupHelpers.completeOnboardingSetup({
304304
fullName: user.username,

ui-tests/cypress/lib/dashboard/analytics/events/events.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ const verifyFullDataPageElements = () => {
194194

195195
cy.scrollPageToTop();
196196

197-
cy.clickElement(eventStatsListBoxElements('Bill Payment').LIST_BOX_ITEM);
197+
cy.clickElement(eventStatsListBoxElements('Bill Payment').LIST_BOX_ITEM, true);
198198

199199
verifyStaticElementsOfEventStatsPage();
200200

ui-tests/cypress/lib/dashboard/manage/sdk/stats.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ const verifyStaticElementsOfPage = () => {
1212
labelText: "SDK stats",
1313
});
1414

15+
cy.checkPaceRunning();
16+
cy.checkPaceActive();
1517
cy.scrollPageToTop();
1618

1719
cy.verifyElement({
@@ -469,4 +471,4 @@ module.exports = {
469471
verifySdkStatsEChart,
470472
verifySDKsDataFromTable,
471473
verifySDKVersionsDataFromTable
472-
};
474+
};

ui-tests/package-lock.json

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

0 commit comments

Comments
 (0)