322 Commits

Author SHA1 Message Date
kuaifan
f073e61965 merge optimization 2023-09-01 00:47:54 +09:00
weifashi
aa03c00dd5 feat:会议分享添加姓名验证 2023-08-31 09:47:49 +08:00
weifashi
1a3c4640ec feat: 会议邀请改为由机器人发送 2023-08-30 21:58:46 +08:00
weifashi
0c4abb5db3 feat:添加会议分享功能 - 100% 2023-08-30 18:21:37 +08:00
weifashi
146fb3321a Merge branch 'pro' into okr
# Conflicts:
#	app/Http/Controllers/Api/DialogController.php
#	app/Models/User.php
#	docker-compose.yml
#	docker/nginx/default.conf
#	language/original-web.txt
#	language/translate.json
#	public/docs/assets/main.bundle.js
#	public/docs/index.html
#	resources/assets/js/pages/manage.vue
#	resources/assets/js/pages/manage/components/ChatInput/index.vue
#	resources/assets/sass/pages/_.scss
2023-08-17 09:28:38 +08:00
Pang
b5d63dfd12 Merge Optimization 2023-08-11 09:13:19 +08:00
weifashi
3ae3acf705 feat:1.会话列表右键添加标记颜色的选项 2023-08-10 22:14:47 +08:00
weifashi
9944dc4693 fix:1. 修改消息时@成员不会拉进群 2. @的时候,会话以外成员排序更改为前5名为最近联系的人 3. 审批中心时间后面加周几 4.审批拒绝不能输入表情的bug修复 2023-08-09 18:33:00 +08:00
weifashi
b8aa32dcaa fix:修复可见性任务,子任务不显示的bug 2023-08-08 15:53:50 +08:00
weifashi
40474319e3 feat:聊天列表头部添加代办标签 2023-08-06 23:47:36 +08:00
kuaifan
b7d9ac7436 Merge commit 'a951a719d1518883474f36579b63bb8f9c4f0494' into pro 2023-08-05 18:52:52 +08:00
kuaifan
7e5bbb4bb7 perf: 工作流支持关联任务列表自动移动 2023-08-05 16:54:34 +08:00
kuaifan
fcecccc9b8 perf: 支持手动打卡 2023-08-05 15:35:33 +08:00
zzw
bc5046c04d feat:添加通义千问机器人 2023-08-04 18:14:02 +08:00
ganzizi
7a1c2c7f2d feat: 新增适用OKR评论不在成员列表内也能显示聊天记录 2023-08-04 16:47:49 +08:00
weifashi
e26d75c894 fiex:1. 加强发送消息接口的逻辑 , 2.解决在网页图片上直接右键复制图片(非jpg的)后,粘贴到消息框,发送后出现错误 2023-08-03 18:09:11 +08:00
weifashi
d728e2d7c0 feat:添加文心一眼机器人配置 2023-08-01 18:35:17 +08:00
kuaifan
25c2a0d90e no message 2023-07-28 15:30:01 +08:00
kuaifan
34745fb3e5 perf: 管理员可以修改系统机器人基本资料 2023-07-28 14:31:54 +08:00
kuaifan
569145196e perf: 添加ChatGPT、Claude智能机器人 2023-07-27 18:42:30 +08:00
kuaifan
e6be45516d Merge commit '2b5b522f3ec7c0bb8c2c82fbe754b194df550305' into pro
# Conflicts:
#	public/site/zh/index.html
2023-07-27 11:56:05 +08:00
kuaifan
395ccaad22 no message 2023-07-26 18:31:16 +08:00
ganzizi
af5db70c07 feat: 新增OKR信息推送 2023-07-19 18:26:12 +08:00
kuaifan
4703b03b82 perf: 添加任务支持自定义协助人 2023-07-11 13:39:38 +08:00
kuaifan
0adbdbdf1b fix: 全员群禁言仅管理员可发言无效的问题 2023-07-07 11:59:00 +08:00
weifashi
5142497c7a fix:修复任务列表查询不出数据的问题 2023-07-01 23:28:29 +08:00
kuaifan
a35f1505e3 整理代码 2023-06-30 17:24:06 +08:00
weifashi
287e3e378d style:调整代码格式,未修改代码逻辑 2023-06-30 16:15:05 +08:00
weifashi
36499a36b1 feat:调整可见性 2023-06-29 23:18:36 +08:00
weifashi
ff2f311d43 feat:更改可见性样式 2023-06-29 19:15:07 +08:00
Meng
99403fad7d perf(任务可见性):修改可见性推送优化 2023-06-29 10:54:17 +08:00
weifashi
29a651b261 fix:去除无用代码 2023-06-29 01:28:29 +08:00
Meng
5d57666cd4 feat(子任务可见性):优化子任务可见性 2023-06-28 20:45:52 +08:00
kuaifan
ee3c3a0497 Merge branch 'hitosea-pro' into pro
# Conflicts:
#	public/manifest.json
#	resources/assets/js/components/UserInput.vue
#	resources/assets/js/pages/manage/components/TaskDetail.vue
2023-06-27 18:49:07 +08:00
Meng
7393fdf6cf perf(消息推送):代码优化 2023-06-20 17:07:56 +08:00
Meng
f077b41ffc feat(任务可见性功能):负责人、协助人更改可见性推送收回 2023-06-20 13:12:13 +08:00
Meng
ad5cb79d40 feat(任务可见性功能、子任务优化):新增任务可见性操作模块、任务详情子任务样式优化 2023-06-20 12:00:34 +08:00
kuaifan
19815415d0 fix: 修复已知bug 2023-06-17 06:01:27 +08:00
kuaifan
29bbbd804a perf: 优化图片压缩 2023-06-15 17:25:25 +08:00
kuaifan
4845e2e6a6 fix: 子任务通知无法打开 2023-06-14 17:19:34 +08:00
gwok
20aa89dd6a
Merge branch 'pro' into pro 2023-06-10 09:47:06 +08:00
weifashi
8d4511e2b1 fix: 更换图片为png 2023-06-09 19:31:25 +08:00
weifashi
95ec53381b fix: 分享接口修改 2023-06-09 15:27:39 +08:00
weifashi
8c6f1120e4 fix: 修改分享逻辑 2023-06-09 15:05:09 +08:00
kuaifan
73cb7e9397 Merge pull request #161 from hitosea/pro
默认审核图片显示
2023-06-06 23:45:31 +08:00
weifashi
40d5c1f11e perf:代码整理 2023-06-06 19:42:48 +08:00
kuaifan
ef88924f36 build 2023-05-31 09:15:38 +08:00
gwokwong
cde96cb8b4 Merge branch 'pro' into pro-doo
* pro:
  fix: 更改审批流数据表名
2023-05-30 19:12:15 +08:00
weifashi
ffbd9b1f26 fix: 更改审批流数据表名 2023-05-30 18:38:39 +08:00
gwokwong
18280b4ff9 工作流合并 2023-05-26 14:19:36 +08:00