194 Commits

Author	SHA1	Message	Date
sijinhui	1626bd3e4e	fix tiktoken	2024-08-13 18:58:13 +08:00
sijinhui	5f5c2164f8	Merge remote-tracking branch 'upstream/main' into dev ... # Conflicts: # app/api/alibaba.ts # app/api/anthropic.ts # app/api/azure.ts # app/api/baidu.ts # app/api/bytedance.ts # app/api/openai.ts # yarn.lock	2024-08-05 14:44:13 +08:00
lloydzhou	1610675c8f	remove hash.js	2024-08-05 11:36:35 +08:00
sijinhui	c60fa3cda6	Merge remote-tracking branch 'upstream/main' into dev ... # Conflicts: # package.json # yarn.lock	2024-08-03 17:55:28 +08:00
Lloyd Zhou	a8c65e3d27	Merge pull request #5126 from DDDDD12138/fix-watch-mask ... fix: replace '&' with concurrently for cross-platform compatibility	2024-08-02 19:22:57 +08:00
sijinhui	8a0f998f69	Merge remote-tracking branch 'upstream/main' into dev ... # Conflicts: # app/components/settings.tsx # app/config/server.ts # app/constant.ts # package.json # yarn.lock	2024-08-02 17:14:45 +08:00
lloydzhou	feaa6f9bf0	Merge remote-tracking branch 'connectai/feature/tencent' into feature/tencent	2024-08-02 15:56:25 +08:00
lloydzhou	753bf3b924	hotfix for cf deploy error #5168	2024-08-02 15:55:26 +08:00
Dogtiti	a17df037af	feat: add lodash-es	2024-08-01 23:54:14 +08:00
lloydzhou	a024980c03	revert package.json	2024-08-01 13:21:36 +08:00
wuzhiqing	04a4e1b39a	fix: replace '&' with concurrently for cross-platform compatibility ... - Used `concurrently` to run parallel commands in package.json scripts - Added `concurrently` as a devDependency in package.json	2024-08-01 10:05:21 +08:00
sijinhui	c91ee5694c	微调	2024-07-21 08:52:02 +08:00
sijinhui	794c675b66	修复eslint错误	2024-07-21 08:38:03 +08:00
sijinhui	e94e2b7c96	fix merge bug	2024-07-16 18:42:04 +08:00
sijinhui	043c6d7efc	更新配置文件自动更新功能	2024-07-12 13:49:35 +08:00
sijinhui	6e4d2c76d8	更新包	2024-07-12 11:58:41 +08:00
sijinhui	44353c2f8b	更新包	2024-07-12 11:53:01 +08:00
sijinhui	ce01618dd5	修复包版本过低，提示会有问题的bug	2024-07-12 11:44:17 +08:00
sijinhui	af741e4dbf	merge	2024-07-11 13:09:18 +08:00
sijinhui	a70f984b0f	Merge remote-tracking branch 'upstream/main' ... # Conflicts: # app/api/auth.ts # app/api/common.ts # app/azure.ts # app/client/api.ts # app/client/platforms/openai.ts # app/components/chat.tsx # app/components/settings.tsx # app/constant.ts # app/layout.tsx # app/masks/index.ts # app/store/chat.ts # app/store/config.ts # app/utils/hooks.ts # app/utils/model.ts # package.json # yarn.lock	2024-07-11 10:58:00 +08:00
Dogtiti	d726c71141	wip: tencent	2024-07-07 14:43:28 +08:00
lloydzhou	88c74ae18d	feat: using fetch to get buildin masks	2024-07-03 14:09:55 +08:00
sijinhui	70969844d7	不用sharp包了	2024-07-02 00:23:56 +08:00
sijinhui	34be0f3b30	优化容器大小	2024-07-01 23:59:11 +08:00
DeanYao	d89a12aa05	Revert "Chat gpt"	2024-05-20 19:02:46 +08:00
sijinhui	1b1ad3201a	修改环境变量加载方式	2024-05-17 11:37:31 +08:00
sijinhui	aac77eb980	Merge remote-tracking branch 'upstream/main' into dev ... # Conflicts: # app/store/config.ts # app/utils.ts # yarn.lock	2024-05-17 09:59:38 +08:00
Kivi1998	7f3516f44f	Merge branch 'main' into chatGPT	2024-05-16 15:14:43 +08:00
Hao Jia	01c9dbc1fd	Merge remote-tracking branch 'origin/main' into gpt-4o ... # Conflicts: # public/apple-touch-icon.png	2024-05-16 14:43:10 +08:00
sijinhui	e098bd6f6a	优化模型选择ui	2024-05-15 15:23:48 +08:00
Dean-YZG	fffbee80e8	Merge remote-tracking branch 'origin/main' into chore-fix	2024-05-13 17:58:28 +08:00
Dean-YZG	c10447df79	feat: 1)upload image with type 'heic' 2)change the empty message to ';' for models 3)	2024-05-13 16:24:15 +08:00
sijinhui	88f1fa17d6	优化打包	2024-05-12 09:14:54 +08:00
dependabot[bot]	cd48f7eff4	chore(deps): bump next from 13.4.9 to 14.1.1 ... Bumps [next](https://github.com/vercel/next.js) from 13.4.9 to 14.1.1. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v13.4.9...v14.1.1) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-10 00:27:02 +00:00
sijinhui	dd1777ad36	package	2024-05-07 17:26:26 +08:00
sijinhui	3dce5e2b89	test pack	2024-05-04 19:01:22 +08:00
sijinhui	14faccb1a6	test pack	2024-05-04 12:39:19 +08:00
sijinhui	6a004421fc	test pack	2024-05-04 11:48:16 +08:00
sijinhui	8496085003	fix pack	2024-05-03 17:13:57 +08:00
sijinhui	6406ffe9a3	optimize	2024-04-13 20:09:08 +08:00
sijinhui	3b36628bc1	update package	2024-04-13 11:38:38 +08:00
sijinhui	7185111cb5	fix pack	2024-04-12 16:41:10 +08:00
sijinhui	847bf8928f	修复地图加载报错问题，优化一点布局	2024-04-03 14:22:47 +08:00
sijinhui	f5874a4d3d	优化认证	2024-04-01 22:30:35 +08:00
sijinhui	23eeff047a	update a pack	2024-03-28 23:05:24 +08:00
sijinhui	8513c459b1	增加语音功能	2024-03-28 00:51:45 +08:00
sijinhui	ab42aaa563	merge	2024-03-27 11:21:44 +08:00
sijinhui	0b24508e3e	Merge remote-tracking branch 'upstream/main' ... # Conflicts: # .dockerignore # package.json # yarn.lock	2024-03-27 11:08:52 +08:00
DeanYao	711bf190d4	Merge pull request #4264 from ChatGPTNextWeb/dependabot/npm_and_yarn/tauri-apps/cli-1.5.11 ... chore(deps-dev): bump @tauri-apps/cli from 1.5.7 to 1.5.11	2024-03-26 17:32:01 +08:00
DeanYao	1049006cf9	Merge pull request #4366 from Essmatiko123/dependabot/npm_and_yarn/eslint-plugin-prettier-5.1.3 ... chore(deps-dev): bump eslint-plugin-prettier from 4.2.1 to 5.1.3	2024-03-26 13:57:50 +08:00