Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,286 Commits 2 Branches 292 Tags
089eb573e1ff712600f4ce71bb2d4e19caaa888d
Commit Graph
488 Commits
Author SHA1 Message Date
李玉春 579391bd84 Merge branch 'sprint/191_liumengyi_54350' into 'master' 
* Finish task #54350.

See merge request easycorp/zentaopms!3506
 2022-05-19 03:18:38 +00:00
liumengyi d2f30493a3 * Code format for task#54350. 2022-05-19 11:17:15 +08:00
liumengyi ff4e5ba635 * Fix bug for task#54350. 2022-05-19 10:24:14 +08:00
tianshujie 45e4fcdfab * Fix bug #22636. 2022-05-18 16:51:09 +08:00
liumengyi b8c091aa27 * Finish task #54350. 2022-05-18 15:17:51 +08:00
hufangzhou 7cc75bf80a * Fix bug #22250. 2022-05-16 13:43:36 +08:00
hufangzhou 3680af6833 * Finish task #53673. 2022-05-11 10:05:09 +08:00
zhouxudong 8ac71d35c5 * Fix bug #22032. 2022-04-28 09:25:28 +00:00
zhouxudong aa0e8579cf * Fix bug #22032. 2022-04-28 09:21:47 +00:00
zhouxudong 2dd822a1f7 * Fix bug #22032. 2022-04-28 07:42:14 +00:00
zhouxudong b8880f493e * Fix bug #22023. 2022-04-28 07:02:37 +00:00
zhouxudong a2d0d3d6cd * Fix bug #22023. 2022-04-28 07:01:02 +00:00
zhouxudong 3ca8412a84 * Fix bug #22032. 2022-04-28 06:50:09 +00:00
liumengyi 0c3aa457ce * Fix bug #3079. 2022-04-22 13:12:02 +08:00
王怡栋 eec155064a * fix bug #20933. 2022-04-20 11:26:32 +08:00
zhouxudong 36946a8fb1 * Fix bug #20178. 2022-04-18 14:47:04 +08:00
zhouxudong c449b53e4b * Fix bug #20178. 2022-04-18 13:59:09 +08:00
zhouxudong 532920579e * Fix bug #20178. 2022-04-18 13:20:44 +08:00
xieqiyu f5b55eecfe * Fix bug#20006. 2022-04-13 15:03:57 +08:00
hufangzhou 18293e3e0d * Fix bug #15656. 2022-04-13 11:19:20 +08:00
王怡栋 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