Merge branch 'master' into dependabot/github_actions/actions/checkout-4

.github/file-filters.yml

@@ -2,6 +2,7 @@ backend: &backend
   - '.github/workflows/test-backend.yml'
   - 'backend/**/*'
   - 'neo4j/**/*'
+  - 'package.json'
 
 docker: &docker
   - 'docker-compose.*'
@@ -9,3 +10,4 @@ docker: &docker
 webapp: &webapp
   - '.github/workflows/test-webapp.yml'
   - 'webapp/**/*'
+  - 'package.json'

CHANGELOG.md

@@ -4,8 +4,11 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [3.0.4](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.0.3...3.0.4)
+#### [3.1.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.0.3...3.1.0)
 
+- chore(other): use dkim values in helm script of backend [`#6731`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6731)
+- fix(other): add global package.json to workflow file filters [`#6706`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6706)
+- chore(other): release v3.0.4 – fix group link on map, embed backend shot down and bug on post language detect [`#6725`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6725)
 - fix(other): fix backup script for neo4j v4 [`#6662`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6662)
 - fix(other): fix workflow cache cleanup fail [`#6722`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6722)
 - fix(backend): fix post language detection [`#6720`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6720)

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",

deployment/src/kubernetes/templates/backend/ConfigMap.yml

@@ -21,6 +21,9 @@ data:
   SMTP_PORT: "{{ .Values.BACKEND.SMTP_PORT }}"
   SMTP_IGNORE_TLS: "{{ .Values.BACKEND.SMTP_IGNORE_TLS }}"
   SMTP_SECURE: "{{ .Values.BACKEND.SMTP_SECURE }}"
+  SMTP_DKIM_DOMAINNAME: "{{ .Values.BACKEND.SMTP_DKIM_DOMAINNAME }}"
+  SMTP_DKIM_KEYSELECTOR: "{{ .Values.BACKEND.SMTP_DKIM_KEYSELECTOR }}"
+  SMTP_DKIM_PRIVATKEY: "{{ .Values.BACKEND.SMTP_DKIM_PRIVATKEY }}"
   GRAPHQL_URI: "http://{{ .Release.Name }}-backend:4000"
   NEO4J_URI: "bolt://{{ .Release.Name }}-neo4j:7687"
   #REDIS_DOMAIN: ---toBeSet(IP)---

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "description": "Free and open source software program code available to run social networks.",
   "author": "ocelot.social Community",
   "license": "MIT",

webapp/maintenance/source/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocelot-social/maintenance",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "description": "Maintenance page for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",

webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-webapp",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",