Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
37,308 Commits 2 Branches 292 Tags
7e1a3564d150f0d260dbfbd2e7782ffdbcafd441
Commit Graph
468 Commits
Author SHA1 Message Date
王怡栋 4b8ed58692 Merge branch 'sprint/fixbug_hufangzhou_doclibaction' into 'master' 
* Fix the bug of doc lib related actions don't show.

See merge request easycorp/zentaopms!2755
 2022-04-07 08:21:03 +00:00
tianshujie 0530b892e4 * Fix bug #18710. 2022-04-06 15:22:15 +08:00
hufangzhou 87a515c803 * Fix the bug of doc lib related actions don't show. 2022-04-06 09:53:13 +08:00
Wenrui LI c96c0140a5 * add comment. 2022-04-01 08:59:44 +08:00
Wenrui LI 0a843861bf * fix case. 2022-04-01 08:58:35 +08:00
Chenjianyu dfc34f44bc * Fix bug #18041, discard xuanxuan login actions from getDynamic. 2022-03-29 14:53:51 +08:00
tanghucheng 7b09af074b * Fix bug #21008. 2022-03-28 14:37:44 +08:00
tianshujie 67efa0838e * Modify the code judgment logic. 2022-03-25 10:58:04 +08:00
tianshujie e36fdcb004 * Fix bug #18719. 2022-03-25 10:39:09 +08:00
tianshujie a66d11f667 * Modify the code judgment logic. 2022-03-23 11:30:14 +08:00
tianshujie 890c669631 * Modify the code judgment logic. 2022-03-23 11:23:45 +08:00
tianshujie 6dfcd7f992 * Fix bug #20919. 2022-03-23 08:53:50 +08:00
zhouxin 8d17a390c0 * Fix bug #15517. 2022-03-22 09:23:21 +00:00
王怡栋 2684fd08fe * code for task #51330. 2022-03-22 16:27:54 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
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
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +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