Merge branch 'master' into chat-message-notification-e2e-tests

CHANGELOG.md

@@ -4,8 +4,22 @@ 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.5.2](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.5.1...3.5.2)
+
+- fix emails2 [`#8497`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8497)
+
+#### [3.5.1](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.5.0...3.5.1)
+
+> 6 May 2025
+
+- v3.5.1 [`#8496`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8496)
+- fix emails in production [`#8493`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8493)
+
 #### [3.5.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.4.0...3.5.0)
 
+> 6 May 2025
+
+- v3.5.0 [`#8492`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8492)
 - feat(webapp): user teaser popover [`#8450`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8450)
 - feat(backend): signup email localized [`#8459`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8459)
 - lint json [`#8472`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8472)

backend/package.json

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

backend/scripts/build.copy.files.sh

@@ -3,15 +3,12 @@
 # public
 cp -r public/ build/public/
 
-# html files
-mkdir -p build/src/middleware/helpers/email/templates/
-cp -r src/middleware/helpers/email/templates/*.html build/src/middleware/helpers/email/templates/
+# email files
+mkdir -p build/src/emails/templates/
+cp -r src/emails/templates/ build/src/emails/
 
-mkdir -p build/src/middleware/helpers/email/templates/en/
-cp -r src/middleware/helpers/email/templates/en/*.html build/src/middleware/helpers/email/templates/en/
-
-mkdir -p build/src/middleware/helpers/email/templates/de/
-cp -r src/middleware/helpers/email/templates/de/*.html build/src/middleware/helpers/email/templates/de/
+mkdir -p build/src/emails/locales/
+cp -r src/emails/locales/ build/src/emails/
 
 # gql files
 mkdir -p build/src/graphql/types/

deployment/helm/charts/ocelot-neo4j/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.5.0"
+appVersion: "3.5.2"

deployment/helm/charts/ocelot-social/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.5.0"
+appVersion: "3.5.2"

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ocelot-social-frontend",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ocelot-social-frontend",
-      "version": "3.5.0",
+      "version": "3.5.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@intlify/unplugin-vue-i18n": "^2.0.0",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-frontend",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "description": "ocelot.social new Frontend (in development and not fully implemented) by IT4C Boilerplate for frontends",
   "main": "build/index.js",
   "type": "module",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "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.5.0",
+  "version": "3.5.2",
   "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.5.0",
+  "version": "3.5.2",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",