Commit Graph
98926 Commits
Author SHA1 Message Date
刘刚 7bf813b6c4 Merge branch dev/bug-62798 of zentao/zentaopms (#8905) 2025-05-27 11:23:35 +08:00
李阳 98a7405e32 * [pipeline] fix ext branch for unittest check. 2025-05-27 11:18:59 +08:00
李阳 142c3b21e3 * [pipeline] fix pipeline. 2025-05-27 10:56:09 +08:00
李阳 e7aa379c03 * [pipeline] fix bug for pipeline. 2025-05-27 10:55:18 +08:00
李阳 644533f371 * [pipeline] fix unittest check pipeline. 2025-05-27 10:51:53 +08:00
李阳 3fa63438b0 * [pipeline] fix targer branch. 2025-05-27 10:28:16 +08:00
刘刚 095274d07e Merge branch ztflow-sunhao-release/21.7.1#sunhao of zentao/zentaopms (#8903) 2025-05-27 10:10:27 +08:00
刘刚 83db355104 Merge branch ztflow-xieqiyu-dev/bug-62798#xieqiyu of zentao/zentaopms (#8900) 2025-05-27 10:10:09 +08:00
sunhao 23c1205977 * [misc] update zui3 lib. 2025-05-27 10:06:38 +08:00
sunhao 9f689b3d2f * [misc] update zui3 lib. 2025-05-27 10:06:03 +08:00
李阳 431ac74e3d * [pipeline] fix lint pipeline. 2025-05-27 09:23:17 +08:00
xieqiyu a4c2093dbf * [bug#62798] Filter templates for articles and chapters. 2025-05-27 09:10:44 +08:00
刘刚 6e6ff13d66 Merge branch ztflow-liugang-release/21.7.1#liugang of zentao/zentaopms (#8899) 2025-05-26 17:45:01 +08:00
liugang fc89846014 * [refac] remove boolean value from the condition. 2025-05-26 17:42:15 +08:00
liugang 573bcba9d5 - [refac] remove unused code. 2025-05-26 17:38:35 +08:00
liugang f504b38037 * [refac] replace "join" with "implode". 2025-05-26 17:37:30 +08:00
liugang 4753fd38eb * [refac] use dbh::$queries instead of dao::$querys. 2025-05-26 17:33:42 +08:00
liugang 9d07dce9c2 * [refac] save queries when instantiate an object of the dbh class. 2025-05-26 17:31:41 +08:00
刘刚 de7f4d8933 Merge branch ztflow-liugang-release/21.7.1#liugang of zentao/zentaopms (#8897) 2025-05-26 17:30:39 +08:00
liugang d162ccdd28 + [refac] add variable to save all queries. 2025-05-26 17:30:24 +08:00
刘刚 bc4a641c51 Merge branch ztflow-sunhao-release/21.7.1#sunhao of zentao/zentaopms (#8896) 2025-05-26 17:27:09 +08:00
sunhao b33d40311b * [misc] update zui3 lib. 2025-05-26 17:24:57 +08:00
刘刚 5e00ad9936 Merge branch ztflow-sunhao-release/21.7.1#sunhao of zentao/zentaopms (#8895) 2025-05-26 17:24:13 +08:00
sunhao 25a3fe1c19 * [bug #62854] fix local pager in zentao list not work as expected. 2025-05-26 17:12:17 +08:00
刘刚 d9dfba97f1 Merge branch ztflow-liugang-release/21.7.1#liugang of zentao/zentaopms (#8892) 2025-05-26 16:50:22 +08:00
刘刚 e075922f63 Merge branch dev/task-143659 of zentao/zentaopms (#8891) 2025-05-26 16:49:58 +08:00
liugang 972d1338f1 * [refac] refactor the getChildExecutions method. 2025-05-26 16:15:25 +08:00
刘刚 62185e9d1b Merge branch ztflow-sunguangming-dev/task-143659#sunguangming of zentao/zentaopms (#8890) 2025-05-26 16:07:38 +08:00
sunguangming 8098023ac0 * [task#143659,done,1h] add sql. 2025-05-26 07:49:57 +00:00
刘刚 70f18302c7 Merge branch dev/bug-62796 of zentao/zentaopms (#8886) 2025-05-26 14:16:39 +08:00
刘刚 63b1dc6e8c Merge branch dev/task-142989 of zentao/zentaopms (#8884) 2025-05-26 14:15:56 +08:00
刘刚 9a13b56a09 Merge branch dev/bug-62813 of zentao/zentaopms (#8882) 2025-05-26 14:15:44 +08:00
wangyidong 2bd0bde218 * [refac bug #62796] Adjust demo sql for oceanbase. 2025-05-26 14:00:47 +08:00
liumengyi b28de5bde6 * [task#142989,done,1h] get product bugs when click. 2025-05-26 13:56:51 +08:00
liumengyi 2e5922b979 * [bug#62813,done,1h] add custom-project to priv setting. 2025-05-26 13:40:49 +08:00
刘刚 2a6251630e Merge branch ztflow-sunguangming-release/21.7.1#sunguangming of zentao/zentaopms (#8881) 2025-05-26 13:29:01 +08:00
sunguangming 07f383e49c * [misc] modify privs order. 2025-05-26 05:21:51 +00:00
刘刚 a8f4836e16 Merge branch ztflow-sunguangming-release/21.7.1#sunguangming of zentao/zentaopms (#8880) 2025-05-26 13:10:37 +08:00
sunguangming f5d1c4d2b9 * [bug#62662,dong,0.2h] fix bug. 2025-05-26 05:06:10 +00:00
刘刚 54824daedd * [refac] remove unused parameter. 2025-05-26 11:08:08 +08:00
刘刚 5e0c0e5fcd Merge branch dev/bug-62731 of zentao/zentaopms (#8879) 2025-05-26 09:32:12 +08:00
sunguangming afe1f18c77 * [bug#62731,done,0.5h] move code to open. 2025-05-26 01:29:41 +00:00
刘刚 20998b1e57 Merge branch dev/bug-62741 of zentao/zentaopms (#8873) 2025-05-26 09:04:46 +08:00
刘刚 013de52d26 Merge branch dev/bug-62823 of zentao/zentaopms (#8874) 2025-05-26 08:37:23 +08:00
刘刚 e971d43e2f Merge branch dev/bug-62821 of zentao/zentaopms (#8872) 2025-05-26 08:36:43 +08:00
sunguangming 6f353403e7 * [bug#62823,done,0.2h] fix bug. 2025-05-26 00:31:53 +00:00
wangyidong 51fe5aa1d3 * [refac bug #62821] Use post parent task data first. 2025-05-23 17:34:49 +08:00
刘刚 5c33adba66 Merge branch ztflow-liyang-release/21.7.1#liyang of zentao/zentaopms (#8871) 2025-05-23 17:16:06 +08:00
liyang 36a9acf539 * [task#143866] adjust node error. 2025-05-23 17:12:42 +08:00
wangyidong e663174ecf * [refac bug #62819] Fix for task storyVersion for batch edit task. 2025-05-23 17:12:05 +08:00