Merge branch 'master' into next

# Conflicts:
#	CHANGELOG.md

Author: ar2rsawseen

.github/workflows/deploy.yml

@@ -54,7 +54,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
           push: true
           file: ./Dockerfile-core

.github/workflows/docker-image.yml

@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
           context: .
           push: true
@@ -63,7 +63,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
           push: true
           file: ./Dockerfile-api
@@ -94,7 +94,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
           push: true
           file: ./Dockerfile-frontend
@@ -125,7 +125,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
           push: true
           file: ./Dockerfile-core

.github/workflows/main.yml

@@ -243,7 +243,7 @@ jobs:
           node bin/scripts/test.connection.js
           npx grunt mochaTest       
   ui-test-dashboard:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04-4core
 
     services:
       mongodb:
@@ -331,7 +331,7 @@ jobs:
           curl -o /tmp/uploader.log -u "${{ secrets.BOX_UPLOAD_AUTH }}" ${{ secrets.BOX_UPLOAD_PATH }} -T "$ARTIFACT_ARCHIVE_NAME"
 
   ui-test-onboarding:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04-4core
 
     services:
       mongodb:

CHANGELOG.md

@@ -1,17 +1,38 @@
-## Version 25.03.x
+## Version 25.03.6
+Enterprise Features:
+- [journey_engine] Publish toggle is converted into button and rearranged
+- [journey_engine] Record Event block added
+- [llm interaction] Add LLM interaction event
+- [oidc] PKCE Flow support added
+
+Fixes:
+- [core] Fix auto refresh frontend component
+- [core] Unifying alphabetical order for dropdowns with dashboard apps
+- [formulas] Fix loading state when selecting event count
+- [hooks] Added null check for incoming data
+- [push] Fix external drawer initialization
+- [times-of-day] Fix chart component
 Enterprise Fixes:
 - [content] Asset URL was wrongly constructed when user switches between apps
 - [ab-testing] Updates
     - Do not wait for result calculation when requesting experiments
     - Do not calculate result for completed experiments
+- [drill] [license] Shorten warning period from 14 days to 3 days
+- [drill] Fix query for users in drill that leads to severe server slowdown
+- [license] Fix chart legend
 
 Dependencies:
+- Bump eslint-plugin-vue from 9.33.0 to 10.1.0
 - Bump lint-staged from 15.5.2 to 16.0.0
+- Bump moment-timezone from 0.5.48 to 0.6.0
+- Bump mongodb from 6.16.0 to 6.17.0
 - Bump nodemailer from 6.10.1 to 7.0.3
-- Bump puppeteer from 24.8.0 to 24.8.2
-- Bump sass from 1.87.0 to 1.88.0
+- Bump puppeteer from 24.8.0 to 24.10.0
+- Bump sass from 1.87.0 to 1.89.0
 - Bump semver from 7.7.1 to 7.7.2
+- Bump sharp from 0.33.5 to 0.34.2
 - Bump supertest from 7.1.0 to 7.1.1
+- Bump tar-fs
 
 ## Version 25.03.5
 Fixes: