Merge pull request coollabsio#2805 from coollabsio/next

v4.0.0-beta.310

Author: andrasbacsai

README.md

@@ -2,8 +2,6 @@
 )
 
 [![Bounty Issues](https://img.shields.io/static/v1?labelColor=grey&color=6366f1&label=Algora&message=%F0%9F%92%8E+Bounty+issues&style=for-the-badge)](https://console.algora.io/org/coollabsio/bounties/new)
-[![Open Bounties](https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Fcoollabsio%2Fbounties%3Fstatus%3Dopen&style=for-the-badge)](https://console.algora.io/org/coollabsio/bounties?status=open)
-[![Rewarded Bounties](https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Fcoollabsio%2Fbounties%3Fstatus%3Dcompleted&style=for-the-badge)](https://console.algora.io/org/coollabsio/bounties?status=completed)
 
 # About the Project
 
@@ -49,6 +47,7 @@ Special thanks to our biggest sponsors!
 <a href="https://coolify.ad.vin/?ref=coolify.io" target="_blank"><img src="./other/logos/advin.png" alt="advin logo" width="250"/></a>
 <a href="https://trieve.ai/?ref=coolify.io" target="_blank"><img src="./other/logos/trieve_bg.png" alt="trieve logo" width="180"/></a>
 <a href="https://blacksmith.sh/?ref=coolify.io" target="_blank"><img src="./other/logos/blacksmith.svg" alt="blacksmith logo" width="200"/></a>
+<a href="https://latitude.sh/?ref=coolify.io" target="_blank"><img src="./other/logos/latitude.svg" alt="latitude logo" width="200"/></a>
 
 ## Github Sponsors ($40+)
 <a href="https://serpapi.com/?ref=coolify.io"><img width="60px" alt="SerpAPI" src="https://github.com/serpapi.png"/></a>

bootstrap/helpers/constants.php

@@ -40,6 +40,7 @@
     'ubuntu debian raspbian',
     'centos fedora rhel ol rocky amzn almalinux',
     'sles opensuse-leap opensuse-tumbleweed',
+    'arch',
 ];
 
 const SHARED_VARIABLE_TYPES = ['team', 'project', 'environment'];

composer.json

@@ -32,6 +32,7 @@
         "poliander/cron": "^3.0",
         "purplepixie/phpdns": "^2.1",
         "pusher/pusher-php-server": "^7.2",
+        "resend/resend-laravel": "^0.13.0",
         "sentry/sentry-laravel": "^4.6",
         "socialiteproviders/microsoft-azure": "^5.1",
         "spatie/laravel-activitylog": "^4.7.3",
@@ -106,4 +107,4 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true
-}
+}

composer.lock

@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.309',
+    'release' => '4.0.0-beta.310',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/sentry.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.309';
+return '4.0.0-beta.310';

config/version.php

@@ -12,20 +12,42 @@ services:
       - SERVER_URL=$SERVICE_FQDN_TWENTY
       - FRONT_BASE_URL=$SERVICE_FQDN_TWENTY
       - ENABLE_DB_MIGRATIONS=true
-      - SIGN_IN_PREFILLED=false
+      - CACHE_STORAGE_TYPE=${CACHE_STORAGE_TYPE:-redis}
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
 
-      - STORAGE_TYPE=${STORAGE_TYPE:-local}
-      - STORAGE_S3_REGION=$STORAGE_S3_REGION
-      - STORAGE_S3_NAME=$STORAGE_S3_NAME
-      - STORAGE_S3_ENDPOINT=$STORAGE_S3_ENDPOINT
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#security
+      - API_RATE_LIMITING_TTL=${API_RATE_LIMITING_TTL:-100}
+      - API_RATE_LIMITING_LIMIT=${API_RATE_LIMITING_LIMIT:-100}
 
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#tokens
       - ACCESS_TOKEN_SECRET=$SERVICE_BASE64_32_ACCESS
       - LOGIN_TOKEN_SECRET=$SERVICE_BASE64_32_LOGIN
       - REFRESH_TOKEN_SECRET=$SERVICE_BASE64_32_REFRESH
       - FILE_TOKEN_SECRET=$SERVICE_BASE64_32_FILE
       - POSTGRES_ADMIN_PASSWORD=$SERVICE_PASSWORD_POSTGRES
       - PG_DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@postgres:5432/default
 
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#auth
+      - IS_SIGN_UP_DISABLED=${IS_SIGN_UP_DISABLED:-false}
+      - PASSWORD_RESET_TOKEN_EXPIRES_IN=${PASSWORD_RESET_TOKEN_EXPIRES_IN:-5m}
+
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#workspace-cleaning
+      - WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION=$WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION
+      - WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION=$WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION
+
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#captcha
+      - STORAGE_TYPE=${STORAGE_TYPE:-local}
+      - STORAGE_S3_REGION=$STORAGE_S3_REGION
+      - STORAGE_S3_NAME=$STORAGE_S3_NAME
+      - STORAGE_S3_ENDPOINT=$STORAGE_S3_ENDPOINT
+      - STORAGE_S3_ACCESS_KEY_ID=$STORAGE_S3_ACCESS_KEY_ID
+      - STORAGE_S3_SECRET_ACCESS_KEY=$STORAGE_S3_SECRET_ACCESS_KEY
+
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#message-queue
+      - MESSAGE_QUEUE_TYPE=$MESSAGE_QUEUE_TYPE
+
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#email
       - EMAIL_FROM_ADDRESS=$EMAIL_FROM_ADDRESS
       - EMAIL_FROM_NAME=$EMAIL_FROM_NAME
       - EMAIL_SYSTEM_ADDRESS=$EMAIL_SYSTEM_ADDRESS
@@ -35,10 +57,12 @@ services:
       - EMAIL_SMTP_USER=$EMAIL_SMTP_USER
       - EMAIL_SMTP_PASSWORD=$EMAIL_SMTP_PASSWORD
 
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#debug-/-development
+      - SIGN_IN_PREFILLED=false
+      - DEBUG_MODE=${DEBUG_MODE:-false}
+
+      # https://twenty.com/developers/section/self-hosting/self-hosting-var#telemetry
       - TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-false}
-      - CACHE_STORAGE_TYPE=${CACHE_STORAGE_TYPE:-redis}
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
     depends_on:
       postgres:
         condition: service_healthy

other/logos/latitude.svg

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.309"
+            "version": "4.0.0-beta.310"
         }
     }
-}
+}