Merge pull request #3457 from fosrl/dev

1.21.0
Merge pull request #3453 from fosrl/dev
2026-07-18 19:46:39 +02:00 · 2026-07-17 17:17:35 -04:00 · 2026-07-16 21:39:00 -04:00 · 2026-07-15 20:55:40 -04:00 · 2026-07-09 21:33:17 -04:00 · 2026-07-09 10:40:35 -04:00
3 changed files with 13 additions and 15 deletions
@@ -41,7 +41,7 @@ services:
      - 80:80 # Port for traefik because of the network_mode

  traefik:
-    image: traefik:v3.6
+    image: traefik:v3.7
    container_name: traefik
    restart: unless-stopped
    network_mode: service:gerbil # Ports appear on the gerbil service
@@ -50,7 +50,7 @@ services:
      - 80:80{{end}}

  traefik:
-    image: docker.io/traefik:v3.6
+    image: docker.io/traefik:v3.7
    container_name: traefik
    restart: unless-stopped
    {{if .InstallGerbil}}network_mode: service:gerbil # Ports appear on the gerbil service{{end}}{{if not .InstallGerbil}}
@@ -30,14 +30,14 @@ export const NotifyTrialExpiring = ({
    const isLastDay = daysRemaining === 1;

    const previewText = hasEnded
-        ? `Your cloud trial for ${orgName} has ended.`
+        ? `Your trial for ${orgName} has ended.`
        : isLastDay
-          ? `Your cloud trial for ${orgName} ends tomorrow.`
-          : `Your cloud trial for ${orgName} ends in ${daysRemaining} days.`;
+          ? `Your trial for ${orgName} ends tomorrow.`
+          : `Your trial for ${orgName} ends in ${daysRemaining} days.`;

    const heading = hasEnded
-        ? "Your Cloud Trial Ended"
-        : "Your Cloud Trial is Ending Soon";
+        ? "Your Trial Ended"
+        : "Your Trial is Ending Soon";

    return (
        <Html>
@@ -55,7 +55,7 @@ export const NotifyTrialExpiring = ({
                        {hasEnded ? (
                            <>
                                <EmailText>
-                                    Your cloud free trial for{" "}
+                                    Your free trial for{" "}
                                    <strong>{orgName}</strong> ended on{" "}
                                    <strong>{trialEndsAt}</strong>. Your account
                                    has been moved to the free plan, which
@@ -64,11 +64,10 @@ export const NotifyTrialExpiring = ({

                                <EmailText>
                                    Some features and resources may now be
-                                    restricted. To restore full access and
-                                    continue using all the features you had
-                                    during your trial, please upgrade to a paid
-                                    plan. This does not effect any self hosted
-                                    licenses.
+                                    restricted. To restore full
+                                    access and continue using all the features
+                                    you had during your trial, please upgrade to
+                                    a paid plan.
                                </EmailText>

                                <EmailText>
@@ -94,8 +93,7 @@ export const NotifyTrialExpiring = ({
                                <EmailText>
                                    After your trial ends, your account will be
                                    moved to the free plan and some
-                                    functionality may be restricted. This does
-                                    not effect any self hosted licenses.
+                                    functionality may be restricted.
                                </EmailText>

                                <EmailText>
Author	SHA1	Message	Date
Milo Schwartz	c30fe5b574	Merge pull request #3457 from fosrl/dev 1.21.0	2026-07-17 17:17:35 -04:00
Owen Schwartz	113b7a0b84	Merge pull request #3453 from fosrl/dev 1.20.0-s.3	2026-07-16 21:39:00 -04:00
Owen Schwartz	5d20956a0e	Merge pull request #3450 from fosrl/dev 1.20.0-s.2	2026-07-15 20:55:40 -04:00
Milo Schwartz	e5398d441e	Merge pull request #3425 from fosrl/dev Dev	2026-07-09 21:33:17 -04:00
Milo Schwartz	d4138e2141	Merge pull request #3421 from fosrl/dev 1.20.0	2026-07-09 10:40:35 -04:00
Milo Schwartz	09d5d9082e	Merge pull request #3413 from fosrl/dev 1.20.0	2026-07-08 15:30:03 -04:00
Owen Schwartz	5cb316f4e9	Merge pull request #3404 from fosrl/dev Add ? to support undefined	2026-07-07 10:59:56 -04:00
Owen Schwartz	6b6c9cf4d8	Merge pull request #3403 from fosrl/dev Move jit mode to a config param	2026-07-07 10:41:59 -04:00
Owen Schwartz	05617c63c0	Merge pull request #3402 from fosrl/dev 1.19.4-s.5	2026-07-07 10:21:57 -04:00
Owen Schwartz	d4c52bbf2f	Merge pull request #3396 from fosrl/dev 1.19.4-s.5	2026-07-03 16:15:18 -04:00
Owen Schwartz	87f50bf0cc	Merge pull request #3389 from fosrl/dev 1.19.4-s.3	2026-07-03 10:29:15 -04:00
Owen Schwartz	2c66da1b19	Merge pull request #3386 from v1rusnl/main Upgrade Traefik image to version 3.7	2026-07-03 10:18:44 -04:00
v1rusnl	ab19955502	Upgrade Traefik image to version 3.7	2026-07-03 08:22:13 +02:00
v1rusnl	1db9dcec81	Update Traefik image version to v3.7	2026-07-03 08:21:12 +02:00
Owen Schwartz	49c2d3163e	Merge pull request #3381 from fosrl/dev dev	2026-07-02 10:56:39 -04:00
Owen Schwartz	45b9e13a13	Merge pull request #3378 from fosrl/dev 1.19.4-s.1	2026-07-01 21:48:01 -04:00