github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,824 Commits 6 Branches 268 Tags
Commit Graph

443 Commits

Author SHA1 Message Date
weifashi
9eec44249c Merge branch 'okr' of github.com:hitosea/dootask into okr 2023-08-17 09:30:02 +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
ganzizi
05fcb5cb0c fix: OKR组新增/删除人员传输格式兼容 2023-08-17 09:12:00 +08:00
Pang
b5d63dfd12 Merge Optimization 2023-08-11 09:13:19 +08:00
weifashi
0e12a08076 fix：任务列表接口 - 消息数量错误修复 2023-08-10 22:43:51 +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
fcecccc9b8 perf: 支持手动打卡 2023-08-05 15:35:33 +08:00
zzw
bc5046c04d feat：添加通义千问机器人 2023-08-04 18:14:02 +08:00
ganzizi
e3079ce6e0 feat: 新增适用默认部门下第1级负责人才能添加部门OKR 2023-08-04 10:57:35 +08:00
weifashi
e26d75c894 fiex：1. 加强发送消息接口的逻辑 , 2.解决在网页图片上直接右键复制图片（非jpg的）后，粘贴到消息框，发送后出现错误 2023-08-03 18:09:11 +08:00
weifashi
7147db0ef2 feat：发送文本消息接口 - 添加群发字段 2023-08-03 17:16:44 +08:00
weifashi
6870a29ec9 init：分享列表的接口 - 添加分享文本的功能 2023-08-03 16:12:17 +08:00
kuaifan
3b2460c5d1 Merge commit 'a8a2badc99e318319e93ad77aa92d1b3531da391' into pro 2023-08-02 10:58:19 +08:00
weifashi
d728e2d7c0 feat：添加文心一眼机器人配置 2023-08-01 18:35:17 +08:00
kuaifan
dd4d8d8880 build 2023-07-28 21:30:10 +08:00
kuaifan
34745fb3e5 perf: 管理员可以修改系统机器人基本资料 2023-07-28 14:31:54 +08:00
Pang
fe4ab6e9d5 no message 2023-07-28 08:37:47 +08:00
kuaifan
569145196e perf: 添加ChatGPT、Claude智能机器人 2023-07-27 18:42:30 +08:00
ganzizi
7bae000a28 feat: 新增多部门用户查询 2023-07-27 18:18:05 +08:00
kuaifan
5d52cb823f Merge commit 'c5114203b27d2ff530897843e0816a3c97990bfe' into tmp 
# Conflicts:
#	public/site/css/log.css
#	public/site/en/about.html
#	public/site/en/download.html
#	public/site/en/help.html
#	public/site/en/index.html
#	public/site/en/log.html
#	public/site/en/price.html
#	public/site/en/product.html
#	public/site/en/solutions.html
#	public/site/zh/about.html
#	public/site/zh/download.html
#	public/site/zh/help.html
#	public/site/zh/index.html
#	public/site/zh/log.html
#	public/site/zh/price.html
#	public/site/zh/product.html
#	public/site/zh/solutions.html
 2023-07-26 19:14:51 +08:00
kuaifan
5a18eccad5 build 2023-07-26 18:56:53 +08:00
kuaifan
395ccaad22 no message 2023-07-26 18:31:16 +08:00
kuaifan
39211297e2 perf: 优化任务默认时间 2023-07-25 17:11:28 +08:00
ganzizi
75242f8844 feat: 新增创建聊天关联id 2023-07-24 16:50:50 +08:00
ganzizi
d423c2bd05 feat: 新增创建聊天关联id 2023-07-24 16:49:07 +08:00
weifashi
42f805d7cc fix：1.仪表盘显示可见性有我，但不是我负责的任务的bug ，2.审批评论间距样式调整与可评论emoj表情加评论通知 ，3,添加任务判断是否存在交集时间内任务调整 ，4. 审批流程撤回后显示错误修复, 5. 审批添加评论后自动滚动到下方 2023-07-21 20:59:08 +08:00
ganzizi
69fd97485d fix: 去掉test信息 2023-07-21 18:32:32 +08:00
kuaifan
026dca2d84 Merge commit 'f73ee2c13bd3eff393a768ecd2e83a213a75b678' into pro 
# Conflicts:
#	public/site/css/help.css
#	public/site/en/help.html
 2023-07-20 16:58:34 +08:00
ganzizi
af5db70c07 feat: 新增OKR信息推送 2023-07-19 18:26:12 +08:00
weifashi
f8e70bd7f7 feat：添加任务 - 提示功能 - 60% 2023-07-18 19:03:09 +08:00
weifashi
77ecb89533 style：整理代码格式 2023-07-17 11:46:37 +08:00
weifashi
02bd1deb2c style：整理代码格式 2023-07-17 11:44:30 +08:00
weifashi
8476ed2e51 feat：简单任务列表 - 过滤掉已完成任务 2023-07-17 11:28:18 +08:00
weifashi
a3e32f88b0 fix：修复时间范围的查询 2023-07-17 10:55:59 +08:00
weifashi
92f9240da7 feat：添加简单的任务列表 2023-07-17 10:41:30 +08:00
kuaifan
97ce98177f site 2023-07-15 12:15:14 +08:00
gwok
a6d9617e7f feat: 增加获取更新日志接口，更改前端页面默认请求地址 2023-07-14 21:46:57 +08:00
weifashi
9ceb00bf54 feat：会议模块换成原生 - web端配合修改 2023-07-05 18:36:06 +08:00
ganzizi
560562755b fix: 1.修复审核导出缺少 2.修复审核导出小时计算误差 2023-07-05 17:54:42 +08:00
ganzizi
aebd47e535 fix: 请假表格导出sheeft里名称显示人名 2023-07-04 18:23:08 +08:00
weifashi
31f051a39e feat：优化任务列表 查询速度 2023-07-04 00:33:21 +08:00
weifashi
5869c8b6bc fix：修复添加子任务时推送的bug 2023-07-02 16:28:52 +08:00
weifashi
5142497c7a fix：修复任务列表查询不出数据的问题 2023-07-01 23:28:29 +08:00
weifashi
9adb825a88 fix：1.修复任务列表查询不出数据的问题 ，2.项目任务表添加项目id的索引 2, 修复任务详情-前端事件 2023-07-01 22:37:55 +08:00
kuaifan
a35f1505e3 整理代码 2023-06-30 17:24:06 +08:00
weifashi
36499a36b1 feat：调整可见性 2023-06-29 23:18:36 +08:00