From 93cee183003a5e0ced3deac5e19779ba4ba251fd Mon Sep 17 00:00:00 2001 From: "Qian (Keven) Li" Date: Tue, 12 Dec 2023 15:08:39 +0800 Subject: [PATCH 1/5] ci: add .dockerignore to exclude env files --- .dockerignore | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..60da41dd8 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,8 @@ +# local env files +.env*.local + +# docker-compose env files +.env + +*.key +*.key.pub \ No newline at end of file From bcb520ed3be42c26035dd6ccc53942fe360275b2 Mon Sep 17 00:00:00 2001 From: Yifei Zhang Date: Fri, 15 Dec 2023 15:18:02 +0800 Subject: [PATCH 2/5] Update emoji.tsx --- app/components/emoji.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index 03aac05f2..616e80ed3 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -10,7 +10,7 @@ import BotIcon from "../icons/bot.svg"; import BlackBotIcon from "../icons/black-bot.svg"; export function getEmojiUrl(unified: string, style: EmojiStyle) { - return `https://cdn.staticfile.org/emoji-datasource-apple/14.0.0/img/${style}/64/${unified}.png`; + return `https://cdn.staticfile.org/emoji-datasource-apple/15.0.1/img/${style}/64/${unified}.png`; } export function AvatarPicker(props: { From d676f88fed2f70ac4f3a2f9f7e19e9cd4725b533 Mon Sep 17 00:00:00 2001 From: Yifei Zhang Date: Fri, 15 Dec 2023 17:47:36 +0800 Subject: [PATCH 3/5] Update README_CN.md --- README_CN.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index d73479658..08b385573 100644 --- a/README_CN.md +++ b/README_CN.md @@ -205,7 +205,6 @@ bash <(curl -s https://raw.githubusercontent.com/Yidadaa/ChatGPT-Next-Web/main/s [见项目贡献者列表](https://github.com/Yidadaa/ChatGPT-Next-Web/graphs/contributors) ### 相关项目 - - [one-api](https://github.com/songquanpeng/one-api): 一站式大模型额度管理平台，支持市面上所有主流大语言模型 ## 开源协议 From 0b731edd21c92a110ac0a904827067f2f2abbbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=8C=E5=B9=B3peaceful?= <102772286+MCheping8108@users.noreply.github.com> Date: Fri, 15 Dec 2023 21:24:37 +0800 Subject: [PATCH 4/5] fix sync.yml --- .github/workflows/sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index ebf5587d0..e04e30adb 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -24,7 +24,7 @@ jobs: id: sync uses: aormsby/Fork-Sync-With-Upstream-action@v3.4 with: - upstream_sync_repo: Yidadaa/ChatGPT-Next-Web + upstream_sync_repo: ChatGPTNextWeb/ChatGPT-Next-Web upstream_sync_branch: main target_sync_branch: main target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set From 2c63dde6c50280c7db416d48e1716f4ed47737b8 Mon Sep 17 00:00:00 2001 From: Fei Date: Sun, 17 Dec 2023 21:24:36 -0600 Subject: [PATCH 5/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7c7a6f243..52ed68c0f 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ One-Click to get well-designed cross-platform ChatGPT web UI. - **Deploy for free with one-click** on Vercel in under 1 minute - Compact client (~5MB) on Linux/Windows/MacOS, [download it now](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) -- Fully compatible with self-deployed llms, recommended for use with [RWKV-Runner](https://github.com/josStorer/RWKV-Runner) or [LocalAI](https://github.com/go-skynet/LocalAI) -- Privacy first, all data stored locally in the browser +- Fully compatible with self-deployed LLMs, recommended for use with [RWKV-Runner](https://github.com/josStorer/RWKV-Runner) or [LocalAI](https://github.com/go-skynet/LocalAI) +- Privacy first, all data is stored locally in the browser - Markdown support: LaTex, mermaid, code highlight, etc. - Responsive design, dark mode and PWA - Fast first screen loading speed (~100kb), support streaming response