caoyanyi
|
f4f64a2ad0
|
* Adjust code.
|
2022-03-14 16:30:40 +08:00 |
|
caoyanyi
|
1c14ab9738
|
* Modify dynamic datas.
|
2022-03-14 16:17:43 +08:00 |
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
hufangzhou
|
9640120b43
|
* Can not use vision field of zt_action table when upgrade.
|
2022-02-25 15:28:15 +08:00 |
|
tianshujie
|
34752d2c04
|
* Modify version judgment logic.
|
2022-02-24 16:49:56 +08:00 |
|
tianshujie
|
b7c3e92e95
|
* Modify version judgment logic.
|
2022-02-24 16:17:26 +08:00 |
|
zenggang
|
438641dee0
|
* Adjust code
|
2022-02-22 08:03:31 +00:00 |
|
zenggang
|
894689a7e3
|
* Fix bug#19819
|
2022-02-22 07:31:02 +00:00 |
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
tanghucheng
|
1506fe5e4c
|
* fix bug #19025.
|
2022-01-28 13:15:02 +08:00 |
|
tanghucheng
|
14d12d41fd
|
*fix bug #19071.
|
2022-01-27 13:04:12 +08:00 |
|
Wenrui LI
|
ca32fb848f
|
* filter trash by vision, task #47935.
|
2022-01-25 14:18:56 +08:00 |
|
孙广明
|
72de0a1b9c
|
Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
# db/update16.2.sql
# module/group/lang/resource.php
# module/kanban/js/view.js
# module/kanban/model.php
|
2022-01-24 07:28:48 +00:00 |
|
xieqiyu
|
8959feba2a
|
* Optimize the code.
|
2022-01-24 12:07:16 +08:00 |
|
tanghucheng
|
0b41fc7fc6
|
* Fix bug #18851.
|
2022-01-24 09:59:01 +08:00 |
|
xieqiyu
|
1f79e9e7dd
|
* Code for task#47995.
|
2022-01-22 22:24:49 +08:00 |
|
liumengyi
|
d0739e40e3
|
* Fix bug for task #47976.
|
2022-01-21 12:16:16 +08:00 |
|
tanghucheng
|
565ade2d53
|
* adjust for dynamic.
|
2022-01-21 11:06:22 +08:00 |
|
朱金勇
|
5e285ba992
|
Merge branch 'sprint/zhouxudong_fixbug_13636' into 'master'
*Fix bug #13636.
See merge request easycorp/zentaopms!1384
|
2022-01-18 05:06:01 +00:00 |
|
liumengyi
|
a0921f1c7d
|
* Fix bug #18638, #18644.
|
2022-01-18 10:49:53 +08:00 |
|
zhouxudong
|
ac318de175
|
*Fix bug #13636.
|
2022-01-17 13:12:02 +08:00 |
|
孙广明
|
b01b6a90eb
|
Merge branch 'kanban'
|
2022-01-17 10:34:08 +08:00 |
|
王怡栋
|
dda972beee
|
* adjust for get trashes.
|
2022-01-14 09:50:09 +08:00 |
|
zhouxudong
|
a73e08d4cb
|
*Fix bug #13636.
|
2022-01-14 08:46:14 +08:00 |
|
liumengyi
|
92c3693650
|
* Fix bug #18419, #18414, #18411.
|
2022-01-13 17:20:21 +08:00 |
|
zhouxudong
|
6eed68f446
|
*Fix bug #13636.
|
2022-01-13 15:17:54 +08:00 |
|
liumengyi
|
0aba204fbf
|
* Fix bug for kanban execution.
|
2022-01-13 11:58:28 +08:00 |
|
tianshujie
|
8b22fdcabc
|
* Finish task #47336,47344,47345.
|
2022-01-12 16:28:16 +08:00 |
|
songchenxuan
|
bb13431274
|
*Fix bug 18074.
|
2022-01-11 08:34:55 +08:00 |
|
tianshujie
|
411d284d43
|
* Fix bug #18095.
|
2022-01-06 14:19:05 +08:00 |
|
tianshujie
|
127b69d4c7
|
* Fix bug #18095.
|
2022-01-06 13:47:18 +08:00 |
|
xieqiyu
|
f78a39f5a1
|
* Fix bug#18250.
|
2022-01-06 11:21:43 +08:00 |
|
孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
孙广明
|
ad25920cf0
|
* Refactor code.
|
2021-12-31 11:06:46 +08:00 |
|
liumengyi
|
3dd747f40a
|
* Modify judgment for split chid plan.
|
2021-12-31 10:59:37 +08:00 |
|
liumengyi
|
53aa300744
|
* Add dynamic for parent plan status flow.
|
2021-12-30 11:25:57 +08:00 |
|
xieqiyu
|
2b7249da7a
|
* Code for task#46521.
|
2021-12-30 08:47:06 +08:00 |
|
zhouxin
|
32bb53370c
|
Fix bug #17711.
|
2021-12-22 06:01:35 +00:00 |
|
hufangzhou
|
5b0923a7a3
|
* Resolve the issue of merge branch.
|
2021-12-22 10:07:18 +08:00 |
|
hufangzhou
|
9743ebbb92
|
* Finish task #46388.
|
2021-12-21 22:26:07 +08:00 |
|
zhujinyong
|
42fc345e2a
|
Merge branch 'sprint/176_xieqiyu_mergeBranch'
|
2021-12-21 16:12:48 +08:00 |
|
hufangzhou
|
872a8b2bbd
|
* Finish task #46096.
|
2021-12-21 14:30:38 +08:00 |
|
孙广明
|
3db6c1bf1e
|
* Code for trashes.
|
2021-12-20 15:40:02 +08:00 |
|
孙广明
|
84fae4bc7d
|
Merge branch 'kanban'
|
2021-12-20 10:59:07 +08:00 |
|
zhujinyong
|
72b41be5b0
|
- Remove die() of action module.
|
2021-12-20 09:05:16 +08:00 |
|
liumengyi
|
23bec4a9ed
|
* Modify code format.
|
2021-12-20 08:43:34 +08:00 |
|
liumengyi
|
79c523399b
|
* Modify kanban judgment in recycle bin.
|
2021-12-20 08:28:18 +08:00 |
|
liumengyi
|
7d3ad08bc6
|
* Finish task #46158, and fix bug #17657,#17655.
|
2021-12-17 15:39:41 +08:00 |
|
xieqiyu
|
fde47bebb6
|
* Fix bug#17516.
|
2021-12-14 16:56:59 +08:00 |
|
tianshujie
|
cc414d4e14
|
* Fix Kanban dynamic issue.
|
2021-12-13 17:45:42 +08:00 |
|