From 692047e4c81d2072e2b88d407d5f801e66934df3 Mon Sep 17 00:00:00 2001 From: Ibrahim H Date: Thu, 2 May 2024 19:11:46 +0100 Subject: [PATCH 1/6] fixt: env file --- .gitpod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 228f1b94c..6fd6797b5 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -3,7 +3,7 @@ tasks: # Fix because of https://github.com/gitpod-io/gitpod/issues/16614 before: sudo curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-$(uname -m) init: | - cp .env.example .env && + cp .env.development.example .env && sed -i "s#APP_URL=http://localhost#APP_URL=$(gp url 8000)#g" .env sed -i "s#USERID=#USERID=33333#g" .env sed -i "s#GROUPID=#GROUPID=33333#g" .env @@ -20,7 +20,7 @@ tasks: echo "Waiting for Sail environment to boot up." gp sync-await spin-is-ready ./vendor/bin/spin exec vite npm install - ./vendor/bin/spin exec vite npm run dev + ./vendor/bin/spin exec vite npm run dev -- --host - name: Laravel Queue Worker, listening to code changes command: | From c901ace21ae4fad0b6e70b8206ac40fe6ff232f0 Mon Sep 17 00:00:00 2001 From: Luciano Laratelli Date: Fri, 3 May 2024 09:31:05 -0400 Subject: [PATCH 2/6] don't append '.git' for sr.ht repositories --- app/Livewire/Project/New/PublicGitRepository.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php index c6c699acf..b71a0b670 100644 --- a/app/Livewire/Project/New/PublicGitRepository.php +++ b/app/Livewire/Project/New/PublicGitRepository.php @@ -98,7 +98,8 @@ class PublicGitRepository extends Component (str($this->repository_url)->startsWith('https://') || str($this->repository_url)->startsWith('http://')) && !str($this->repository_url)->endsWith('.git') && - !str($this->repository_url)->contains('github.com') + (!str($this->repository_url)->contains('github.com') || + !str($this->repository_url)->contains('git.sr.ht')) ) { $this->repository_url = $this->repository_url . '.git'; } From d71682a3f7bad7af4811213f8448ec752d9d7ab0 Mon Sep 17 00:00:00 2001 From: Chiko <53100578+chikof@users.noreply.github.com> Date: Fri, 3 May 2024 15:06:06 +0100 Subject: [PATCH 3/6] Change of wording --- resources/views/livewire/settings/configuration.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php index a7292f624..dbcf79552 100644 --- a/resources/views/livewire/settings/configuration.blade.php +++ b/resources/views/livewire/settings/configuration.blade.php @@ -38,7 +38,7 @@ id="next_channel" label="Enable pre-release (early) updates" /> @else @endif From be4386658a7f1dd072a6b4dbf237865a71fac206 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Sat, 4 May 2024 01:23:31 +0900 Subject: [PATCH 4/6] fix: typo in tags.blade.php seperated -> separated --- resources/views/livewire/project/shared/tags.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/project/shared/tags.blade.php b/resources/views/livewire/project/shared/tags.blade.php index 2d4240dfa..0de2540fd 100644 --- a/resources/views/livewire/project/shared/tags.blade.php +++ b/resources/views/livewire/project/shared/tags.blade.php @@ -21,7 +21,7 @@
Add From efa5091b9826216df0459346e9deccb82ee9de01 Mon Sep 17 00:00:00 2001 From: "sipc.ink" Date: Sun, 5 May 2024 21:07:49 +0800 Subject: [PATCH 5/6] Create zh-cn.json --- lang/zh-cn.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 lang/zh-cn.json diff --git a/lang/zh-cn.json b/lang/zh-cn.json new file mode 100644 index 000000000..70c457fa8 --- /dev/null +++ b/lang/zh-cn.json @@ -0,0 +1,30 @@ +{ + "auth.login": "登录", + "auth.login.azure": "使用 Microsoft 登录", + "auth.login.bitbucket": "使用 Bitbucket 登录", + "auth.login.github": "使用 GitHub 登录", + "auth.login.gitlab": "使用 Gitlab 登录", + "auth.login.google": "使用 Google 登录", + "auth.already_registered": "已经注册？", + "auth.confirm_password": "确认密码", + "auth.forgot_password": "忘记密码", + "auth.forgot_password_send_email": "发送密码重置邮件", + "auth.register_now": "注册", + "auth.logout": "退出登录", + "auth.register": "注册", + "auth.registration_disabled": "注册已禁用，请联系管理员", + "auth.reset_password": "重置密码", + "auth.failed": "这些凭据与我们的记录不符", + "auth.failed.callback": "处理第三方登录的回调时出错", + "auth.failed.password": "密码错误", + "auth.failed.email": "该账户未注册", + "auth.throttle": "登录次数过多，请在 :seconds 秒后重试", + "input.name": "用户名", + "input.email": "邮箱", + "input.password": "密码", + "input.password.again": "确认密码", + "input.code": "验证码", + "input.recovery_code": "恢复码", + "button.save": "保存", + "repository.url": "示例
对于公共代码仓库，请使用 https://...。
对于私有代码仓库，请使用 git@...。

https://github.com/coollabsio/coolify-examples main 分支将被选择
https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify nodejs-fastify 分支将被选择。
https://gitea.com/sedlav/expressjs.git main 分支将被选择。
https://gitlab.com/andrasbacsai/nodejs-example.git main 分支将被选择" +} From 1a5fec39c07d0d0e24fa98f619a862a2e7be5193 Mon Sep 17 00:00:00 2001 From: "sipc.ink" Date: Sun, 5 May 2024 21:11:44 +0800 Subject: [PATCH 6/6] fix: install.sh error --- scripts/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/install.sh b/scripts/install.sh index f377c85bc..588afc243 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -73,6 +73,9 @@ centos | fedora | rhel | ol | rocky | almalinux | amzn) if [ "$OS_TYPE" = "amzn" ]; then dnf install -y wget git jq >/dev/null 2>&1 else + if ! command -v dnf >/dev/null 2>&1; then + yum install -y dnf >/dev/null 2>&1 + fi dnf install -y curl wget git jq >/dev/null 2>&1 fi ;;