Commit Graph
98950 Commits
Author SHA1 Message Date
刘刚 c6308adfe3 Merge branch dev/bug-62923 of zentao/zentaopms (#8930) 2025-05-27 15:29:40 +08:00
刘刚 668e213590 Merge branch ztflow-sunguangming-release/21.7.1#sunguangming of zentao/zentaopms (#8929) 2025-05-27 15:16:04 +08:00
刘刚 abd3c56555 Merge branch dev/bug-62861 of zentao/zentaopms (#8928) 2025-05-27 15:15:54 +08:00
刘刚 98d6dcdc79 Merge branch ztflow-sunguangming-dev/bug-62923#sunguangming of zentao/zentaopms (#8926) 2025-05-27 15:14:51 +08:00
sunguangming fad3f35601 * [misc] modify lang. 2025-05-27 07:14:34 +00:00
刘刚 963d26bfe9 Merge branch ztflow-sunguangming-dev/bug-62861#sunguangming of zentao/zentaopms (#8925) 2025-05-27 15:10:10 +08:00
sunguangming 3478856ab7 * [bug#62923,done,0.2h] remove unused code. 2025-05-27 06:50:47 +00:00
sunguangming 8256f70c3c * [bug#62861,done,0.2h] fix bug. 2025-05-27 06:27:24 +00:00
刘刚 3595ba9bdb Merge branch ztflow-caoyanyi-release/21.7.1#caoyanyi of zentao/zentaopms (#8921) 2025-05-27 13:38:40 +08:00
刘刚 645295b66b Merge branch dev/story-74954 of zentao/zentaopms (#8920) 2025-05-27 13:38:24 +08:00
caoyanyi 56ff4d2316 * [release] update release info. 2025-05-27 13:37:16 +08:00
刘刚 13d1d49a77 Merge branch dev/bug-62902 of zentao/zentaopms (#8918) 2025-05-27 13:16:58 +08:00
刘刚 c79730e9ab Merge branch ztflow-liyang-dev/story-74954#liyang of zentao/zentaopms (#8917) 2025-05-27 13:16:50 +08:00
liyang 6c06afc357 * [story#74954] fix bug for gitlab project list. 2025-05-27 13:12:30 +08:00
刘刚 93c3620b29 Merge branch ztflow-sunguangming-release/21.7.1#sunguangming of zentao/zentaopms (#8911) 2025-05-27 11:24:25 +08:00
刘刚 fc567dfd4c Merge branch ztflow-sunguangming-dev/bug-62902#sunguangming of zentao/zentaopms (#8909) 2025-05-27 11:24:04 +08:00
刘刚 38e5e978a5 Merge branch ztflow-liyang-dev/story-74954#liyang of zentao/zentaopms (#8907) 2025-05-27 11:23:54 +08:00
刘刚 7cc8b1cb50 Merge branch dev/bug-62317 of zentao/zentaopms (#8906) 2025-05-27 11:23:46 +08:00
刘刚 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
sunguangming 4e0df27898 * [bug#62902,done,0.5h] fix bug. 2025-05-27 03:02:05 +00:00
sunguangming 3ffbe8a0e5 * [misc] code for function review. 2025-05-27 02:58:33 +00:00
sunguangming 618ac1a2ab * [misc] code for function review. 2025-05-27 02:58:33 +00: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
liyang d9deeafcd1 * [story#74954] fix bug for gitlab project. 2025-05-27 10:19:53 +08:00
刘刚 095274d07e Merge branch ztflow-sunhao-release/21.7.1#sunhao of zentao/zentaopms (#8903) 2025-05-27 10:10:27 +08:00
刘刚 11b0c24d0c Merge branch ztflow-sunguangming-dev/bug-62317#sunguangming of zentao/zentaopms (#8901) 2025-05-27 10:10:19 +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
sunguangming 4fd31f733d * [bug#62317,done,0.2h] fix bug. 2025-05-27 01:59:30 +00: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