kuaifan
|
04533e17ec
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# app/Models/ProjectTask.php
# public/css/app.css
# public/js/app.js
# public/js/build/361.js
# public/js/build/412.js
# public/js/build/499.js.LICENSE.txt
# public/js/build/659.js
# public/js/build/659.js.LICENSE.txt
# public/js/build/726.js.LICENSE.txt
# public/js/build/747.js
|
2022-02-23 23:18:50 +08:00 |
|
kuaifan
|
7b1b7d1372
|
perf: 创建者及协助人可以修改任务但不能修改任务状态
|
2022-02-23 16:00:54 +08:00 |
|
韦荣超
|
76ab47c82e
|
perf: 任务创建人和协助人可修改任务内容和详情，但不可修改任务状态
|
2022-02-23 11:09:12 +08:00 |
|
kuaifan
|
10ff02b8a0
|
perf: 修改任务时间日志
|
2022-02-23 09:58:55 +08:00 |
|
韦荣超
|
69d6417985
|
feat: 项目列表添加置顶功能
|
2022-02-22 16:49:53 +08:00 |
|
kuaifan
|
ff14cbc752
|
feat: 支持文本、图表、思维导图下载上传
|
2022-02-22 12:24:16 +08:00 |
|
kuaifan
|
7a267cc07b
|
整理代码
|
2022-02-19 11:44:03 +08:00 |
|
kuaifan
|
f4f351cf9d
|
Merge branch 'develop' of ssh://git.gezi.vip:6006/gx/dootask
# Conflicts:
# public/css/app.css
# public/js/app.js
# public/js/build/208.js
# public/js/build/389.js
# public/js/build/406.js
# public/js/build/406.js.LICENSE.txt
# public/js/build/423.js
# public/js/build/459.js
# public/js/build/459.js.LICENSE.txt
# public/js/build/688.js
# public/js/build/688.js.LICENSE.txt
# public/js/build/726.js
# public/js/build/755.js
# public/js/build/93.js
# public/js/build/954.js
|
2022-02-19 09:30:13 +08:00 |
|
韦荣超
|
2bd666efe7
|
perf: 消息列表需支持多个置顶
|
2022-02-18 10:10:17 +08:00 |
|
kuaifan
|
54e4ed27ae
|
perf: 优化修改任务时间记录
|
2022-02-17 19:11:23 +08:00 |
|
韦荣超
|
4f74a0440c
|
perf: 【注册】校验参数是否合法顺序优化
|
2022-02-17 14:41:49 +08:00 |
|
韦荣超
|
04c59041e0
|
feat: 【消息】列表增加点击右键置顶该聊天功能
|
2022-02-17 09:17:19 +08:00 |
|
kuaifan
|
4b0ad22f8d
|
fix: 取消（完成状态）变为待测试（改变状态），如果有状态负责人应该把状态负责人加上
|
2022-02-15 15:30:35 +08:00 |
|
kuaifan
|
789558da6c
|
perf: 未完成状态禁止归档
|
2022-02-15 15:21:11 +08:00 |
|
kuaifan
|
ce70c1ca3a
|
perf: 单条消息最长2000个字符，超过自动分割发送，总最长20000
|
2022-02-12 17:01:12 +08:00 |
|
kuaifan
|
f7cd4f34d3
|
fix: 已存在的任务新添加负责人不出现在任务群聊里
|
2022-02-10 17:09:44 +08:00 |
|
kuaifan
|
848359bf7b
|
feat: 添加项目支持默认工作流
|
2022-02-09 16:05:25 +08:00 |
|
kuaifan
|
9999548bc2
|
perf: 优化撤回消息
|
2022-01-29 13:39:16 +08:00 |
|
kuaifan
|
21e618cca2
|
优化了一些代码
|
2022-01-28 18:27:47 +08:00 |
|
kuaifan
|
02eb386155
|
撤回消息优化
|
2022-01-28 15:09:57 +08:00 |
|
kuaifan
|
35bd038802
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# app/Http/Controllers/Api/DialogController.php
# app/Http/Controllers/Api/ProjectController.php
# electron/package.json
# package.json
# public/css/app.css
# public/docs/assets/main.bundle.js
# public/js/app.js
# public/js/build/146.js.LICENSE.txt
# public/js/build/161.js
# public/js/build/199.js
# public/js/build/199.js.LICENSE.txt
# public/js/build/218.js
# public/js/build/218.js.LICENSE.txt
# public/js/build/244.js
# public/js/build/244.js.LICENSE.txt
# public/js/build/309.js
# public/js/build/423.js
# public/js/build/43.js
# public/js/build/693.js
# public/js/build/717.js
# public/js/build/717.js.LICENSE.txt
# public/js/build/79.js.LICENSE.txt
# resources/assets/js/pages/manage/components/TaskAdd.vue
|
2022-01-28 14:39:43 +08:00 |
|
kuaifan
|
60e47e85a3
|
perf: 添加任务时如果自己不是任务负责人可选择加入协助人员列表
|
2022-01-26 01:12:00 +08:00 |
|
kuaifan
|
22c06fee5e
|
剔除模式代码优化
|
2022-01-26 00:02:15 +08:00 |
|
kuaifan
|
4a42ce87a2
|
feat: 工作流程负责人新增剔除模式（改变任务负责人并保留操作状态的人员）
|
2022-01-25 23:46:47 +08:00 |
|
kuaifan
|
8f0b5dc049
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# app/Http/Controllers/Api/DialogController.php
# electron/package.json
# package.json
# public/css/app.css
# public/js/app.js
# public/js/build/146.js
# public/js/build/146.js.LICENSE.txt
# public/js/build/178.js
# public/js/build/178.js.LICENSE.txt
# public/js/build/199.js
# public/js/build/199.js.LICENSE.txt
# public/js/build/309.js
# public/js/build/328.js.LICENSE.txt
# public/js/build/388.js
# public/js/build/43.js
# public/js/build/46.js.LICENSE.txt
# public/js/build/857.js
# public/js/build/857.js.LICENSE.txt
# public/js/build/893.js
|
2022-01-25 16:12:53 +08:00 |
|
kuaifan
|
b05db6d458
|
fix: 主任务负责人无法修改子任务负责人的问题
|
2022-01-25 15:49:22 +08:00 |
|
kuaifan
|
ea87092d73
|
fix: 设置主任务时间跟子任务没有交集时子任务时间改为跟主任务一致
|
2022-01-25 15:28:42 +08:00 |
|
kuaifan
|
0f8d9e64ef
|
no message
|
2022-01-25 01:30:55 +08:00 |
|
kuaifan
|
d1f5096a16
|
删除luckysheet
|
2022-01-25 00:32:51 +08:00 |
|
kuaifan
|
003de399dc
|
支持在线编辑代码
|
2022-01-25 00:24:47 +08:00 |
|
kuaifan
|
870276fa48
|
feat: 支持文件下载
|
2022-01-24 14:42:29 +08:00 |
|
韦荣超
|
11d1f26724
|
feat: 加入【项目管理】任务列表流程筛选被回滚功能
|
2022-01-24 10:20:59 +08:00 |
|
Mr.Huan
|
f643911014
|
feat: 聊天消息撤回-后端实现
|
2022-01-24 09:30:10 +08:00 |
|
kuaifan
|
8bacc3b6ba
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# electron/package.json
# package.json
# public/js/app.js
# public/js/build/161.js
# public/js/build/400.js
# public/js/build/616.js
# public/js/build/845.js
|
2022-01-24 01:45:08 +08:00 |
|
kuaifan
|
a825657516
|
fix: 修改主任务时间时未设置时间的子任务没有同步修改
|
2022-01-24 00:10:47 +08:00 |
|
kuaifan
|
d9f4adbe26
|
支持查看归档任务
|
2022-01-23 17:43:15 +08:00 |
|
kuaifan
|
1777153411
|
perf: 支持查看已归档任务详情
|
2022-01-23 17:36:19 +08:00 |
|
kuaifan
|
9b0ca581f1
|
perf: 消息列表显示任务基本状态
|
2022-01-23 16:17:11 +08:00 |
|
Mr.Huan
|
3ba6ea9c7e
|
perf: 调整周报签名的生成方法
|
2022-01-22 15:07:37 +08:00 |
|
kuaifan
|
3201d90a53
|
格式化代码
|
2022-01-21 14:07:02 +08:00 |
|
kuaifan
|
cd9c1d9660
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
|
2022-01-21 13:54:58 +08:00 |
|
kuaifan
|
18bc75242b
|
fix: 项目负责人还原已经回档的自己不是任务负责人的任务时，无法还原，且会提示错误
|
2022-01-21 11:10:29 +08:00 |
|
kuaifan
|
3b38c8b408
|
perf: 共享文件删除、移动改为仅限所有者或创建者操作
|
2022-01-21 10:00:31 +08:00 |
|
韦荣超
|
d48ed18102
|
feat: 【工作报告】功能
|
2022-01-14 15:55:26 +08:00 |
|
kuaifan
|
ac26713f86
|
优化查询代码
|
2022-01-14 12:19:50 +08:00 |
|
kuaifan
|
ac6b90c986
|
fix: 任务流转会出错
|
2022-01-13 18:39:57 +08:00 |
|
kuaifan
|
d951da2c02
|
fix: 修复客户端旧版本更新任务出现已完成列表中有状态为“进行中”的情况
|
2022-01-13 11:48:33 +08:00 |
|
kuaifan
|
75a12fc6f5
|
优化日志
|
2022-01-13 09:00:39 +08:00 |
|
kuaifan
|
a3e0d89eb0
|
修改任务状态判断是否项目负责人直接查表
|
2022-01-13 00:32:35 +08:00 |
|
kuaifan
|
87cdee4fe8
|
pref: 优化任务日志的显示
|
2022-01-13 00:30:36 +08:00 |
|