Commit Graph

181 Commits

Author SHA1 Message Date
sijinhui
5b1f0355ce Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/config/server.ts
#	app/utils/model.ts
2024-05-07 16:39:45 +08:00
butterfly
b3e856df1d feat: fix 1)the property named 'role' of the first message must be 'user' 2)if default summarize model 'gpt-3.5-turbo' is blocked, use currentModel instead 3)if apiurl&apikey set by location, useCustomConfig would be opened 2024-05-06 19:26:39 +08:00
sijinhui
a82a32163c debug log 2024-05-03 16:42:37 +08:00
sijinhui
2843e3fab1 opt user table 2024-05-01 17:19:26 +08:00
sijinhui
852401d556 fix little bug 2024-04-29 23:11:16 +08:00
sijinhui
a64f52ecbb update user admin 2024-04-29 23:04:59 +08:00
sijinhui
de704b2d40 opt admin man 2024-04-29 13:21:06 +08:00
sijinhui
81eb6a25bb fix chart bug 2024-04-29 13:05:09 +08:00
sijinhui
0b713200fd 123 2024-04-26 22:52:35 +08:00
sijinhui
84638d9364 fix log 2024-04-26 18:12:07 +08:00
sijinhui
2100f681df debug log 2024-04-26 18:00:03 +08:00
sijinhui
f07a3729b9 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/chat.tsx
#	app/constant.ts
#	app/store/access.ts
#	app/utils/hooks.ts
2024-04-26 14:02:16 +08:00
sijinhui
19d7ac5862 test loading 2024-04-26 11:03:13 +08:00
sijinhui
a9bab9f93a 增加系统设置表 2024-04-25 00:51:05 +08:00
sijinhui
8c5bbf1cf0 暂存-设置项管理 2024-04-24 18:28:38 +08:00
sijinhui
ba2fc27928 暂存 2024-04-22 16:13:54 +08:00
Wayland Zhan
c96e4b7966 feat: Support a way to define default model by adding DEFAULT_MODEL env. 2024-04-19 06:57:15 +00:00
sijinhui
ef5638e427 update login 2024-04-18 16:56:09 +08:00
sijinhui
714ad21b74 merge 2024-04-18 10:04:10 +08:00
sijinhui
869d3ab27b 完成管理员面用户密码修改 2024-04-17 21:55:51 +08:00
sijinhui
1ac9325f31 Merge remote-tracking branch 'upstream/main' into dev 2024-04-13 00:09:48 +08:00
butterfly
b72d7fbeda feat: fix webdav 逻辑2 2024-04-12 13:46:37 +08:00
butterfly
ee15c14049 feat: fix webdav 逻辑 2024-04-12 13:40:37 +08:00
sijinhui
4e4aeb5d02 Merge remote-tracking branch 'upstream/main' into dev 2024-04-10 08:44:52 +08:00
butterfly
df3313971d feat: Optimize code 2024-04-09 18:24:22 +08:00
butterfly
b175132854 feat: Optimize var names 2024-04-09 18:23:52 +08:00
butterfly
8b191bd2f7 feat: white webdav server domain 2024-04-09 18:05:56 +08:00
sijinhui
f80d19e305 fix midjouney to 100% error 2024-04-09 16:56:50 +08:00
sijinhui
9d306118b3 merge upstream 2024-04-09 12:52:27 +08:00
sijinhui
a83d79a9f4 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/auth.ts
#	app/client/platforms/openai.ts
#	app/components/settings.tsx
#	app/config/server.ts
#	app/constant.ts
#	app/locales/pt.ts
#	app/locales/sk.ts
#	app/locales/tw.ts
#	app/store/chat.ts
2024-04-09 10:39:16 +08:00
butterfly
5446d8d4a2 feat: fix illegal exports in app/api/anthropic/[...path]/route.ts 2024-04-08 13:59:55 +08:00
butterfly
3cb4315193 feat: clean codes 2024-04-07 11:50:25 +08:00
butterfly
69b079c86e feat: dev done 2024-04-07 11:32:57 +08:00
sijinhui
66c5852dbf fix log 2024-04-03 00:08:35 +08:00
sijinhui
5b2367bede 某个没用的log 2024-04-02 11:53:58 +08:00
sijinhui
ea652d5f33 fix auth 2024-04-02 00:12:39 +08:00
sijinhui
20871f7e50 整体优化认证 2024-04-02 00:00:51 +08:00
sijinhui
f686fe09ce 认证中间状态 2024-04-01 23:29:41 +08:00
sijinhui
95fc45486b 增加清理用户功能 2024-03-31 14:47:14 +08:00
sijinhui
013bb7ca01 进一步优化认证流程 2024-03-31 01:18:47 +08:00
sijinhui
cea656ec9a '修复命名错误' 2024-03-30 23:59:41 +08:00
sijinhui
8debb785fb 初次优化认证-查询已存在用户时逻辑问题 2024-03-30 22:49:01 +08:00
sijinhui
20b35078f0 初次优化认证 2024-03-30 22:41:41 +08:00
sijinhui
e6912f5be8 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/api/common.ts
2024-03-28 16:07:23 +08:00
sijinhui
f2fe5ad4c1 修复语音的token获取问题 2024-03-28 15:27:32 +08:00
sijinhui
eb7a09c6f0 修复语音的token获取问题 2024-03-28 15:14:10 +08:00
DeanYao
8ef77f50c3
Merge branch 'main' into serverrside 2024-03-28 11:20:52 +08:00
sijinhui
45fa760db1 用户管理表初步成型 2024-03-26 23:23:03 +08:00
sijinhui
bf6528ce30
Merge branch 'ChatGPTNextWeb:main' into main 2024-03-24 17:30:40 +08:00
fred-bf
e8d76a513d
patch: disable webdav redirect 2024-03-24 14:15:04 +08:00