diff --git a/README.md b/README.md index e45b60b83..dc55c99da 100644 --- a/README.md +++ b/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! advin logo trieve logo blacksmith logo +latitude logo ## Github Sponsors ($40+) SerpAPI diff --git a/bootstrap/helpers/constants.php b/bootstrap/helpers/constants.php index e0272fa4c..24e596a0f 100644 --- a/bootstrap/helpers/constants.php +++ b/bootstrap/helpers/constants.php @@ -40,6 +40,7 @@ const SUPPORTED_OS = [ 'ubuntu debian raspbian', 'centos fedora rhel ol rocky amzn almalinux', 'sles opensuse-leap opensuse-tumbleweed', + 'arch', ]; const SHARED_VARIABLE_TYPES = ['team', 'project', 'environment']; diff --git a/composer.json b/composer.json index 87ea72472..a3189d341 100644 --- a/composer.json +++ b/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 -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index 38ceda00f..367dda58d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c7c9cc002a9765c2395717c69ba8bfc6", + "content-hash": "cb17445966de6094aef5a92ee59d1d77", "packages": [ { "name": "amphp/amp", @@ -7129,6 +7129,132 @@ ], "time": "2024-07-01T14:24:45+00:00" }, + { + "name": "resend/resend-laravel", + "version": "v0.13.0", + "source": { + "type": "git", + "url": "https://github.com/resend/resend-laravel.git", + "reference": "23aed22df0d0b23c2952da2aaed6a8b88d301a8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/resend/resend-laravel/zipball/23aed22df0d0b23c2952da2aaed6a8b88d301a8a", + "reference": "23aed22df0d0b23c2952da2aaed6a8b88d301a8a", + "shasum": "" + }, + "require": { + "illuminate/http": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0", + "php": "^8.1", + "resend/resend-php": "^0.12.0", + "symfony/mailer": "^6.2|^7.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.14", + "mockery/mockery": "^1.5", + "orchestra/testbench": "^8.17|^9.0", + "pestphp/pest": "^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + }, + "laravel": { + "providers": [ + "Resend\\Laravel\\ResendServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Resend\\Laravel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Resend and contributors", + "homepage": "https://github.com/resend/resend-laravel/contributors" + } + ], + "description": "Resend for Laravel", + "homepage": "https://resend.com/", + "keywords": [ + "api", + "client", + "laravel", + "php", + "resend", + "sdk" + ], + "support": { + "issues": "https://github.com/resend/resend-laravel/issues", + "source": "https://github.com/resend/resend-laravel/tree/v0.13.0" + }, + "time": "2024-07-08T18:51:42+00:00" + }, + { + "name": "resend/resend-php", + "version": "v0.12.0", + "source": { + "type": "git", + "url": "https://github.com/resend/resend-php.git", + "reference": "37fb79bb8160ce2de521bf37484ba59e89236521" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/resend/resend-php/zipball/37fb79bb8160ce2de521bf37484ba59e89236521", + "reference": "37fb79bb8160ce2de521bf37484ba59e89236521", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^7.5", + "php": "^8.1.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.13", + "mockery/mockery": "^1.6", + "pestphp/pest": "^2.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/Resend.php" + ], + "psr-4": { + "Resend\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Resend and contributors", + "homepage": "https://github.com/resend/resend-php/contributors" + } + ], + "description": "Resend PHP library.", + "homepage": "https://resend.com/", + "keywords": [ + "api", + "client", + "php", + "resend", + "sdk" + ], + "support": { + "issues": "https://github.com/resend/resend-php/issues", + "source": "https://github.com/resend/resend-php/tree/v0.12.0" + }, + "time": "2024-03-04T03:16:28+00:00" + }, { "name": "revolt/event-loop", "version": "v1.0.6", diff --git a/config/sentry.php b/config/sentry.php index df4aa6283..46bfddd6f 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // 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'), diff --git a/config/version.php b/config/version.php index 3f8d8e2ff..4ef54517c 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/templates/compose/twenty.yaml b/templates/compose/twenty.yaml index aa340f669..f643b9623 100644 --- a/templates/compose/twenty.yaml +++ b/templates/compose/twenty.yaml @@ -12,13 +12,15 @@ 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 @@ -26,6 +28,26 @@ services: - 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 diff --git a/versions.json b/versions.json index 64ce34840..752faf982 100644 --- a/versions.json +++ b/versions.json @@ -1,7 +1,7 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.309" + "version": "4.0.0-beta.310" } } -} \ No newline at end of file +}